clean up the module if load() fails

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index 0f21a40f5bbffef059bb1c2203c6751509593cb2..830c00022f1a026258e3348a8df6fad4a1ae0f77 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,5 +1,6 @@
 #include "openbox.h"
 #include "event.h"
+#include "xerror.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -23,7 +24,7 @@ void grab_keyboard(gboolean grab)
     } else if (kgrabs > 0) {
         if (--kgrabs == 0) {
             g_message("UNGRABBING KEYBOARD %d", kgrabs);
-            XUngrabKeyboard(ob_display, CurrentTime);
+            XUngrabKeyboard(ob_display, event_lasttime);
         } else
             g_message("NOT UNGRABBING KEYBOARD %d", kgrabs);
     }
@@ -37,7 +38,7 @@ void grab_pointer(gboolean grab, Cursor cur)
                          GrabModeAsync, FALSE, cur, event_lasttime);
     } else if (pgrabs > 0) {
         if (--pgrabs == 0)
-            XUngrabPointer(ob_display, CurrentTime);
+            XUngrabPointer(ob_display, event_lasttime);
     }
 }
 
@@ -102,9 +103,14 @@ void grab_key(guint keycode, guint state, int keyboard_mode)
 {
     guint i;
 
+    xerror_set_ignore(TRUE); /* can get BadAccess' from these */
+    xerror_occured = FALSE;
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabKey(ob_display, keycode, state | mask_list[i], ob_root, FALSE,
                  GrabModeAsync, keyboard_mode);
+    xerror_set_ignore(FALSE);
+    if (xerror_occured)
+        g_warning("failed to grab keycode %d modifiers %d", keycode, state);
 }
 
 void ungrab_all_keys()