make key grabbing per window instead of always root

diff --git a/openbox/grab.c b/openbox/grab.c
index 656f6eb401d43ea0be9e5075124e540ba959a382..e934959ddf794e82c3a7b64a5d35bfd95488d29d 100644 (file)
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -119,21 +119,21 @@ void ungrab_button(guint button, guint state, Window win)
         XUngrabButton(ob_display, button, state | mask_list[i], win);
 }
 
-void grab_key(guint keycode, guint state, int keyboard_mode)
+void grab_key(guint keycode, guint state, Window win, int keyboard_mode)
 {
     guint i;
 
     xerror_set_ignore(TRUE); /* can get BadAccess' from these */
     xerror_occured = FALSE;
     for (i = 0; i < MASK_LIST_SIZE; ++i)
-        XGrabKey(ob_display, keycode, state | mask_list[i], ob_root, FALSE,
+        XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE,
                  GrabModeSync, keyboard_mode);
     xerror_set_ignore(FALSE);
     if (xerror_occured)
         g_warning("failed to grab keycode %d modifiers %d", keycode, state);
 }
 
-void ungrab_all_keys()
+void ungrab_all_keys(Window win)
 {
-    XUngrabKey(ob_display, AnyKey, AnyModifier, ob_root);
+    XUngrabKey(ob_display, AnyKey, AnyModifier, win);
 }

diff --git a/openbox/grab.h b/openbox/grab.h
index 04fa690a538fc1255112c2772e751d2ebccc1ac9..d6c149b3d702ea6d0695324ed51ec719771eb398 100644 (file)
--- a/openbox/grab.h
+++ b/openbox/grab.h
@@ -17,8 +17,8 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
                       int pointer_mode, Cursor cursor);
 void ungrab_button(guint button, guint state, Window win);
 
-void grab_key(guint keycode, guint state, int keyboard_mode);
+void grab_key(guint keycode, guint state, Window win, int keyboard_mode);
 
-void ungrab_all_keys();
+void ungrab_all_keys(Window win);
 
 #endif