X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=03e21bdf3d8c7323045c18e19d7a5f80dca6e2e7;hb=8237564b4784c69ab50a9291d503850cb6018f67;hp=b6a7a9392fb43c8a039bac6fe9425fa8a0a20bca;hpb=3db93a6ab5801ad8f8b67c54cdc8942e08a540aa;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index b6a7a939..03e21bdf 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -39,8 +39,9 @@ static guint kgrabs = 0;
 static guint pgrabs = 0;
 /*! The time at which the last grab was made */
 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 ||
@@ -57,17 +58,17 @@ 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;
 }
 
-gboolean grab_keyboard(gboolean grab)
+gboolean grab_keyboard_full(gboolean grab)
 {
     gboolean ret = FALSE;
 
@@ -78,8 +79,10 @@ gboolean grab_keyboard(gboolean grab)
                                 event_curtime) == Success;
             if (!ret)
                 --kgrabs;
-            else
+            else {
+                passive_count = 0;
                 grab_time = event_curtime;
+            }
         } else
             ret = TRUE;
     } else if (kgrabs > 0) {
@@ -92,7 +95,8 @@ gboolean grab_keyboard(gboolean grab)
     return ret;
 }
 
-gboolean grab_pointer(gboolean grab, gboolean owner_events, ObCursor cur)
+gboolean grab_pointer_full(gboolean grab, gboolean owner_events,
+                           gboolean confine, ObCursor cur)
 {
     gboolean ret = FALSE;
 
@@ -100,7 +104,9 @@ gboolean grab_pointer(gboolean grab, gboolean owner_events, ObCursor cur)
         if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, screen_support_win, owner_events,
                                GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, None,
+                               GrabModeAsync, GrabModeAsync,
+                               (confine ? RootWindow(ob_display, ob_screen) :
+                                None),
                                ob_cursor(cur), event_curtime) == Success;
             if (!ret)
                 --pgrabs;
@@ -158,8 +164,8 @@ void grab_shutdown(gboolean reconfig)
 {
     if (reconfig) return;
 
-    while (grab_keyboard(FALSE));
-    while (grab_pointer(FALSE, FALSE, OB_CURSOR_NONE));
+    while (ungrab_keyboard());
+    while (ungrab_pointer());
     while (grab_server(FALSE));
 }
 
@@ -175,7 +181,7 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
                     pointer_mode, GrabModeAsync, None, ob_cursor(cur));
     xerror_set_ignore(FALSE);
     if (xerror_occured)
-        ob_debug("Failed to grab button %d modifiers %d", button, state);
+        ob_debug("Failed to grab button %d modifiers %d\n", button, state);
 }
 
 void ungrab_button(guint button, guint state, Window win)
@@ -197,10 +203,27 @@ void grab_key(guint keycode, guint state, Window win, gint keyboard_mode)
                  GrabModeAsync, keyboard_mode);
     xerror_set_ignore(FALSE);
     if (xerror_occured)
-        ob_debug("Failed to grab keycode %d modifiers %d", keycode, state);
+        ob_debug("Failed to grab keycode %d modifiers %d\n", keycode, state);
 }
 
 void ungrab_all_keys(Window win)
 {
     XUngrabKey(ob_display, AnyKey, AnyModifier, win);
 }
+
+void grab_key_passive_count(int change)
+{
+    if (grab_on_keyboard()) return;
+    passive_count += change;
+    if (passive_count < 0) passive_count = 0;
+}
+
+void ungrab_passive_key(void)
+{
+    /*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/
+    if (passive_count) {
+        /* kill our passive grab */
+        XUngrabKeyboard(ob_display, event_curtime);
+        passive_count = 0;
+    }
+}