Merge branch 'master' into chaz

[chaz/openbox] / openbox / grab.c

diff --git a/openbox/grab.c b/openbox/grab.c
index bc9d4cca6cd05444c4321d39f83ec070137cd0bd..4518c4339890dc435e744b3d8c996e842a5dce61 100644 (file)
--- 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 "screen.h"
 #include "debug.h"
 #include "obt/display.h"
+#include "obt/keyboard.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -40,10 +40,11 @@ static guint pgrabs = 0;
 /*! The time at which the last grab was made */
 static Time  grab_time = CurrentTime;
 static gint passive_count = 0;
+static ObtIC *ic = NULL;
 
 static Time ungrab_time(void)
 {
-    Time t = event_curtime;
+    Time t = event_time();
     if (grab_time == CurrentTime ||
         !(t == CurrentTime || event_time_after(t, grab_time)))
         /* When the time moves backward on the server, then we can't use
@@ -58,6 +59,11 @@ static Time ungrab_time(void)
     return t;
 }
 
+static Window grab_window(void)
+{
+    return screen_support_win;
+}
+
 gboolean grab_on_keyboard(void)
 {
     return kgrabs > 0;
@@ -68,21 +74,25 @@ gboolean grab_on_pointer(void)
     return pgrabs > 0;
 }
 
+ObtIC *grab_input_context(void)
+{
+    return ic;
+}
+
 gboolean grab_keyboard_full(gboolean grab)
 {
     gboolean ret = FALSE;
 
     if (grab) {
         if (kgrabs++ == 0) {
-            ret = XGrabKeyboard(obt_display,
-                                RootWindow(obt_display, ob_screen),
+            ret = XGrabKeyboard(obt_display, grab_window(),
                                 False, GrabModeAsync, GrabModeAsync,
-                                event_curtime) == Success;
+                                event_time()) == Success;
             if (!ret)
                 --kgrabs;
             else {
                 passive_count = 0;
-                grab_time = event_curtime;
+                grab_time = event_time();
             }
         } else
             ret = TRUE;
@@ -103,16 +113,15 @@ gboolean grab_pointer_full(gboolean grab, gboolean owner_events,
 
     if (grab) {
         if (pgrabs++ == 0) {
-            ret = XGrabPointer(obt_display, screen_support_win, owner_events,
+            ret = XGrabPointer(obt_display, grab_window(), owner_events,
                                GRAB_PTR_MASK,
                                GrabModeAsync, GrabModeAsync,
-                               (confine ? RootWindow(obt_display, ob_screen) :
-                                None),
-                               ob_cursor(cur), event_curtime) == Success;
+                               (confine ? obt_root(ob_screen) : None),
+                               ob_cursor(cur), event_time()) == Success;
             if (!ret)
                 --pgrabs;
             else
-                grab_time = event_curtime;
+                grab_time = event_time();
         } else
             ret = TRUE;
     } else if (pgrabs > 0) {
@@ -146,9 +155,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;
@@ -159,10 +168,15 @@ void grab_startup(gboolean reconfig)
     mask_list[i++] = caps | scroll;
     mask_list[i++] = num | caps | scroll;
     g_assert(i == MASK_LIST_SIZE);
+
+    ic = obt_keyboard_context_new(obt_root(ob_screen), grab_window());
 }
 
 void grab_shutdown(gboolean reconfig)
 {
+    obt_keyboard_context_unref(ic);
+    ic = NULL;
+
     if (reconfig) return;
 
     while (ungrab_keyboard());
@@ -223,8 +237,8 @@ void ungrab_passive_key(void)
 {
     /*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/
     if (passive_count) {
-        /* kill out passive grab */
-        XUngrabKeyboard(obt_display, event_curtime);
+        /* kill our passive grab */
+        XUngrabKeyboard(obt_display, event_time());
         passive_count = 0;
     }
 }