From cc844c579472c4d0b3e98e014588d77dd5bfa532 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 26 Mar 2003 09:05:49 +0000 Subject: [PATCH] put back map/unmap msgs --- openbox/client.c | 4 ++-- openbox/grab.c | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index 3ebfcd60..757b118d 100644 --- 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 719d3301..f90eb6b5 100644 --- 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); } } -- 2.39.2