1 files changed, 28 insertions, 29 deletions

diff --git a/openbox/grab.c b/openbox/grab.c
index 43e9a815..522fbf96 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -18,12 +18,12 @@
 */
 
 #include "grab.h"
-#include "modkeys.h"
 #include "openbox.h"
 #include "event.h"
-#include "xerror.h"
 #include "screen.h"
 #include "debug.h"
+#include "obt/display.h"
+#include "obt/keyboard.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -74,7 +74,7 @@ gboolean grab_keyboard_full(gboolean grab)
 
     if (grab) {
         if (kgrabs++ == 0) {
-            ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
+            ret = XGrabKeyboard(obt_display, obt_root(ob_screen),
                                 False, GrabModeAsync, GrabModeAsync,
                                 event_curtime) == Success;
             if (!ret)
@@ -87,7 +87,7 @@ gboolean grab_keyboard_full(gboolean grab)
             ret = TRUE;
     } else if (kgrabs > 0) {
         if (--kgrabs == 0) {
-            XUngrabKeyboard(ob_display, ungrab_time());
+            XUngrabKeyboard(obt_display, ungrab_time());
         }
         ret = TRUE;
     }
@@ -102,11 +102,10 @@ gboolean grab_pointer_full(gboolean grab, gboolean owner_events,
 
     if (grab) {
         if (pgrabs++ == 0) {
-            ret = XGrabPointer(ob_display, screen_support_win, owner_events,
+            ret = XGrabPointer(obt_display, screen_support_win, owner_events,
                                GRAB_PTR_MASK,
                                GrabModeAsync, GrabModeAsync,
-                               (confine ? RootWindow(ob_display, ob_screen) :
-                                None),
+                               (confine ? obt_root(ob_screen) : None),
                                ob_cursor(cur), event_curtime) == Success;
             if (!ret)
                 --pgrabs;
@@ -116,7 +115,7 @@ gboolean grab_pointer_full(gboolean grab, gboolean owner_events,
             ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0) {
-            XUngrabPointer(ob_display, ungrab_time());
+            XUngrabPointer(obt_display, ungrab_time());
         }
         ret = TRUE;
     }
@@ -128,13 +127,13 @@ gint grab_server(gboolean grab)
     static guint sgrabs = 0;
     if (grab) {
         if (sgrabs++ == 0) {
-            XGrabServer(ob_display);
-            XSync(ob_display, FALSE);
+            XGrabServer(obt_display);
+            XSync(obt_display, FALSE);
         }
     } else if (sgrabs > 0) {
         if (--sgrabs == 0) {
-            XUngrabServer(ob_display);
-            XFlush(ob_display);
+            XUngrabServer(obt_display);
+            XFlush(obt_display);
         }
     }
     return sgrabs;
@@ -145,9 +144,9 @@ void grab_startup(gboolean reconfig)
     guint i = 0;
     guint num, caps, scroll;
 
-    num = modkeys_key_to_mask(OB_MODKEY_KEY_NUMLOCK);
-    caps = modkeys_key_to_mask(OB_MODKEY_KEY_CAPSLOCK);
-    scroll = modkeys_key_to_mask(OB_MODKEY_KEY_SCROLLLOCK);
+    num = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_NUMLOCK);
+    caps = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CAPSLOCK);
+    scroll = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SCROLLLOCK);
 
     mask_list[i++] = 0;
     mask_list[i++] = num;
@@ -174,13 +173,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(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)
+        XGrabButton(obt_display, button, state | mask_list[i], win, False,
+                    mask, pointer_mode, GrabModeAsync, None, ob_cursor(cur));
+    obt_display_ignore_errors(FALSE);
+    if (obt_display_error_occured)
         ob_debug("Failed to grab button %d modifiers %d", button, state);
 }
 
@@ -189,26 +188,26 @@ void ungrab_button(guint button, guint state, Window win)
     guint i;
 
     for (i = 0; i < MASK_LIST_SIZE; ++i)
-        XUngrabButton(ob_display, button, state | mask_list[i], win);
+        XUngrabButton(obt_display, button, state | mask_list[i], win);
 }
 
 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(TRUE);
     for (i = 0; i < MASK_LIST_SIZE; ++i)
-        XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE,
+        XGrabKey(obt_display, keycode, state | mask_list[i], win, FALSE,
                  GrabModeAsync, keyboard_mode);
-    xerror_set_ignore(FALSE);
-    if (xerror_occured)
+    obt_display_ignore_errors(FALSE);
+    if (obt_display_error_occured)
         ob_debug("Failed to grab keycode %d modifiers %d", keycode, state);
 }
 
 void ungrab_all_keys(Window win)
 {
-    XUngrabKey(ob_display, AnyKey, AnyModifier, win);
+    XUngrabKey(obt_display, AnyKey, AnyModifier, win);
 }
 
 void grab_key_passive_count(int change)
@@ -223,7 +222,7 @@ void ungrab_passive_key(void)
     /*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/
     if (passive_count) {
         /* kill out passive grab */
-        XUngrabKeyboard(ob_display, event_curtime);
+        XUngrabKeyboard(obt_display, event_curtime);
         passive_count = 0;
     }
 }