put back map/unmap msgs

diff --git a/openbox/client.c b/openbox/client.c
index 3ebfcd6..757b118 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -234,7 +234,7 @@ void client_manage(Window window)
     /* update the list hints */
     client_set_list();
 
-/*    g_message("Managed window 0x%lx", window);*/
+    g_message("Managed window 0x%lx", window);
 }
 
 void client_unmanage_all()
@@ -249,7 +249,7 @@ void client_unmanage(Client *client)
     int j;
     GSList *it;
 
-/*    g_message("Unmanaging window: %lx", client->window);*/
+    g_message("Unmanaging window: %lx", client->window);
 
     dispatch_client(Event_Client_Destroy, client, 0, 0);
     g_assert(client != NULL);

diff --git a/openbox/grab.c b/openbox/grab.c
index 719d330..f90eb6b 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -14,12 +14,18 @@ static unsigned int mask_list[MASK_LIST_SIZE];
 void grab_keyboard(gboolean grab)
 {
     if (grab) {
-        if (kgrabs++ == 0)
+        if (kgrabs++ == 0) {
+            g_message("GRABBING KEYBOARD %d", kgrabs);
             XGrabKeyboard(ob_display, ob_root, 0, GrabModeAsync, GrabModeSync,
-                          CurrentTime);
+                          event_lasttime);
+        } else
+            g_message("NOT GRABBING KEYBOARD %d", kgrabs);
     } else if (kgrabs > 0) {
-        if (--kgrabs == 0)
-            XUngrabKeyboard(ob_display, CurrentTime);
+        if (--kgrabs == 0) {
+            g_message("UNGRABBING KEYBOARD %d", kgrabs);
+            XUngrabKeyboard(ob_display, event_lasttime);
+        } else
+            g_message("NOT UNGRABBING KEYBOARD %d", kgrabs);
     }
 }
 
@@ -28,10 +34,10 @@ void grab_pointer(gboolean grab, Cursor cur)
     if (grab) {
         if (pgrabs++ == 0)
             XGrabPointer(ob_display, ob_root, False, 0, GrabModeAsync,
-                         GrabModeAsync, FALSE, cur, CurrentTime);
+                         GrabModeAsync, FALSE, cur, event_lasttime);
     } else if (pgrabs > 0) {
         if (--pgrabs == 0)
-            XUngrabPointer(ob_display, CurrentTime);
+            XUngrabPointer(ob_display, event_lasttime);
     }
 }