X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=e797e44ce9ad62e88ab2edc49ed128725bb72019;hb=0e3ce9e407ed8e3fb554c0b25b65c0e8146bd1c6;hp=4207b37d5aee357df270d7e5e76674f18de2b976;hpb=759e9f58a8cc02b78bc85b4454f133544e3ac36e;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index 4207b37d..e797e44c 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -74,8 +74,7 @@ gboolean grab_keyboard_full(gboolean grab)
 
     if (grab) {
         if (kgrabs++ == 0) {
-            ret = XGrabKeyboard(obt_display,
-                                RootWindow(obt_display, ob_screen),
+            ret = XGrabKeyboard(obt_display, obt_root(ob_screen),
                                 False, GrabModeAsync, GrabModeAsync,
                                 event_curtime) == Success;
             if (!ret)
@@ -106,8 +105,7 @@ gboolean grab_pointer_full(gboolean grab, gboolean owner_events,
             ret = XGrabPointer(obt_display, screen_support_win, owner_events,
                                GRAB_PTR_MASK,
                                GrabModeAsync, GrabModeAsync,
-                               (confine ? RootWindow(obt_display, ob_screen) :
-                                None),
+                               (confine ? obt_root(ob_screen) : None),
                                ob_cursor(cur), event_curtime) == Success;
             if (!ret)
                 --pgrabs;
@@ -223,7 +221,7 @@ void ungrab_passive_key(void)
 {
     /*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/
     if (passive_count) {
-        /* kill out passive grab */
+        /* kill our passive grab */
         XUngrabKeyboard(obt_display, event_curtime);
         passive_count = 0;
     }