X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreen.cc;h=2a7711dee78f09293a2f585cce55c7b95f3cb585;hb=80a42d2b0c0831e99b2b5547e8ddc0122796d78a;hp=6525150bc478e4af53ea5cc07cde2908c5f835d2;hpb=8d4fe416e5d940670df7b974a004ac041e21196f;p=chaz%2Fopenbox

diff --git a/src/screen.cc b/src/screen.cc
index 6525150b..2a7711de 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -527,7 +527,8 @@ void Screen::manageWindow(Window window)
   openbox->bindings()->fireEvent(&data);
 
 #ifdef DEBUG
-  printf("Managed window 0x%lx\n", window);
+  printf("Managed window 0x%lx frame 0x%lx\n",
+         window, client->frame->window());
 #endif
 }
 
@@ -572,6 +573,9 @@ void Screen::unmanageWindow(Client *client)
   // reparent the window out of the frame
   frame->releaseClient();
 
+#ifdef DEBUG
+  Window framewin = client->frame->window();
+#endif
   delete client->frame;
   client->frame = 0;
 
@@ -585,7 +589,7 @@ void Screen::unmanageWindow(Client *client)
   client->unfocus();
 
 #ifdef DEBUG
-  printf("Unmanaged window 0x%lx\n", client->window());
+  printf("Unmanaged window 0x%lx frame 0x%lx\n", client->window(), framewin);
 #endif
   
   delete client;
@@ -771,7 +775,13 @@ void Screen::mapRequestHandler(const XMapRequestEvent &e)
   printf("MapRequest for 0x%lx\n", e.window);
 #endif // DEBUG
 
-  manageWindow(e.window);
+  Client *c = openbox->findClient(e.window);
+  if (c) {
+#ifdef DEBUG
+    printf("DEBUG: MAP REQUEST CAUGHT IN SCREEN. IGNORED.\n");
+#endif
+  } else
+    manageWindow(e.window);
 }
 
 }