X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=b1923af3680976201d9edcb3763d9c639512f995;hb=122d55fbadea0409fbc902a1740e1c8ff3aecd88;hp=d1d93241a77e5422ace3440325179aa475f3b341;hpb=d2857b11944146e2e6973b7f7280cb57e1ee260b;p=chaz%2Fopenbox

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index d1d93241..b1923af3 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -1,12 +1,14 @@
 #include "kernel/focus.h"
+#include "kernel/frame.h"
 #include "kernel/dispatch.h"
 #include "kernel/openbox.h"
 #include "kernel/event.h"
 #include "kernel/grab.h"
+#include "kernel/client.h"
 #include "kernel/action.h"
 #include "kernel/prop.h"
-#include "kernel/parse.h"
 #include "kernel/timer.h"
+#include "parser/parse.h"
 #include "tree.h"
 #include "keyboard.h"
 #include "translate.h"
@@ -45,7 +47,7 @@ static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist)
     if (keylist) {
         nact = parse_find_node("action", node);
         while (nact) {
-            if ((action = parse_action(doc, nact))) {
+            if ((action = action_parse(doc, nact))) {
                 /* validate that its okay for a key binding */
                 if (action->func == action_moveresize &&
                     action->data.moveresize.corner !=
@@ -77,22 +79,33 @@ void plugin_setup_config()
 KeyBindingTree *firstnode = NULL;
 
 static KeyBindingTree *curpos;
-static guint reset_key, reset_state, button_return, button_escape;
+static guint reset_key, reset_state;
 static Timer *chain_timer;
 
-static void grab_keys()
+static void grab_for_window(Window win, gboolean grab)
 {
     KeyBindingTree *p;
 
-    ungrab_all_keys();
+    ungrab_all_keys(win);
 
-    p = curpos ? curpos->first_child : firstnode;
-    while (p) {
-        grab_key(p->key, p->state, GrabModeAsync);
-        p = p->next_sibling;
+    if (grab) {
+        p = curpos ? curpos->first_child : firstnode;
+        while (p) {
+            grab_key(p->key, p->state, win, GrabModeAsync);
+            p = p->next_sibling;
+        }
+        if (curpos)
+            grab_key(reset_key, reset_state, win, GrabModeAsync);
     }
-    if (curpos)
-        grab_key(reset_key, reset_state, GrabModeAsync);
+}
+
+static void grab_keys(gboolean grab)
+{
+    GList *it;
+
+    grab_for_window(focus_backup, grab);
+    for (it = client_list; it; it = g_list_next(it))
+        grab_for_window(((ObClient*)it->data)->frame->window, grab);
 }
 
 static void reset_chains()
@@ -103,7 +116,7 @@ static void reset_chains()
     }
     if (curpos) {
         curpos = NULL;
-        grab_keys();
+        grab_keys(TRUE);
     }
 }
 
@@ -150,6 +163,14 @@ static void event(ObEvent *e, void *foo)
 {
     static KeyBindingTree *grabbed_key = NULL;
 
+    if (e->type == Event_Client_Mapped) {
+        grab_for_window(e->data.c.client->window, TRUE);
+        return;
+    } else if (e->type == Event_Client_Destroy) {
+        grab_for_window(e->data.c.client->window, FALSE);
+        return;
+    }
+
     if (grabbed_key) {
         gboolean done = FALSE;
 
@@ -157,9 +178,9 @@ static void event(ObEvent *e, void *foo)
              !(grabbed_key->state & e->data.x.e->xkey.state)))
             done = TRUE;
         else if (e->type == Event_X_KeyPress) {
-            if (e->data.x.e->xkey.keycode == button_return)
+            if (e->data.x.e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
                 done = TRUE;
-            else if (e->data.x.e->xkey.keycode == button_escape) {
+            else if (e->data.x.e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
                 GSList *it;
                 for (it = grabbed_key->actions; it; it = it->next) {
                     Action *act = it->data;
@@ -204,7 +225,7 @@ static void event(ObEvent *e, void *foo)
                     chain_timer = timer_start(5000*1000, chain_timeout,
                                               NULL);
                     curpos = p;
-                    grab_keys();
+                    grab_keys(TRUE);
                 } else {
                     GSList *it;
                     for (it = p->actions; it; it = it->next) {
@@ -217,15 +238,13 @@ static void event(ObEvent *e, void *foo)
                                 act->data.cycle.cancel = FALSE;
                             }
 
-                            act->data.any.c = focus_client;
-                            act->func(&act->data);
-
                             if (act->func == action_cycle_windows &&
-                                !grabbed_key) {
+                                !grabbed_key && grab_keyboard(TRUE)) {
                                 grabbed_key = p;
-                                grab_keyboard(TRUE);
-                                break;
                             }
+
+                            act->data.any.c = focus_client;
+                            act->func(&act->data);
                         }
                     }
 
@@ -240,19 +259,16 @@ static void event(ObEvent *e, void *foo)
 
 void plugin_startup()
 {
-    guint i;
-
     curpos = NULL;
     chain_timer = NULL;
 
-    dispatch_register(Event_X_KeyPress | Event_X_KeyRelease,
+    dispatch_register(Event_Client_Mapped | Event_Client_Destroy |
+                      Event_X_KeyPress | Event_X_KeyRelease,
                       (EventHandler)event, NULL);
 
     translate_key("C-g", &reset_state, &reset_key);
-    translate_key("Escape", &i, &button_escape);
-    translate_key("Return", &i, &button_return);
 
-    grab_keys();
+    grab_keys(TRUE);
 }
 
 void plugin_shutdown()
@@ -261,6 +277,6 @@ void plugin_shutdown()
 
     tree_destroy(firstnode);
     firstnode = NULL;
-    ungrab_all_keys();
+    grab_keys(FALSE);
 }