move the xerror handling into the libobt

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index 3fa45b7c3d106eb2794a7029f7a40579cd079a72..d84ef94fdb6980512f9bc302f1559b23f48ec2cd 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -21,9 +21,9 @@
 #include "modkeys.h"
 #include "openbox.h"
 #include "event.h"
-#include "xerror.h"
 #include "screen.h"
 #include "debug.h"
+#include "obt/display.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -41,7 +41,7 @@ static guint pgrabs = 0;
 static Time  grab_time = CurrentTime;
 static gint passive_count = 0;
 
-static Time ungrab_time()
+static Time ungrab_time(void)
 {
     Time t = event_curtime;
     if (grab_time == CurrentTime ||
@@ -58,12 +58,12 @@ static Time ungrab_time()
     return t;
 }
 
-gboolean grab_on_keyboard()
+gboolean grab_on_keyboard(void)
 {
     return kgrabs > 0;
 }
 
-gboolean grab_on_pointer()
+gboolean grab_on_pointer(void)
 {
     return pgrabs > 0;
 }
@@ -174,13 +174,13 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
 {
     guint i;
 
-    xerror_set_ignore(TRUE); /* can get BadAccess from these */
-    xerror_occured = FALSE;
+    /* can get BadAccess from these */
+    obt_display_ignore_errors(ob_display, TRUE);
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabButton(ob_display, button, state | mask_list[i], win, False, mask,
                     pointer_mode, GrabModeAsync, None, ob_cursor(cur));
-    xerror_set_ignore(FALSE);
-    if (xerror_occured)
+    obt_display_ignore_errors(ob_display, FALSE);
+    if (obt_display_error_occured())
         ob_debug("Failed to grab button %d modifiers %d", button, state);
 }
 
@@ -196,13 +196,13 @@ void grab_key(guint keycode, guint state, Window win, gint keyboard_mode)
 {
     guint i;
 
-    xerror_set_ignore(TRUE); /* can get BadAccess' from these */
-    xerror_occured = FALSE;
+    /* can get BadAccess' from these */
+    obt_display_ignore_errors(ob_display, TRUE);
     for (i = 0; i < MASK_LIST_SIZE; ++i)
         XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE,
                  GrabModeAsync, keyboard_mode);
-    xerror_set_ignore(FALSE);
-    if (xerror_occured)
+    obt_display_ignore_errors(ob_display, FALSE);
+    if (obt_display_error_occured())
         ob_debug("Failed to grab keycode %d modifiers %d", keycode, state);
 }
 
@@ -218,7 +218,7 @@ void grab_key_passive_count(int change)
     if (passive_count < 0) passive_count = 0;
 }
 
-void ungrab_passive_key()
+void ungrab_passive_key(void)
 {
     /*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/
     if (passive_count) {