add special shit for window cycling, grab the keyboard etc

[chaz/openbox] / plugins / keyboard / keyboard.c

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 22ea5556bcb4b2580a2dd739ab32f54b6e667c61..b2c5debfb05b7126fa38d36473ceb0606066bd69 100644 (file)
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -1,19 +1,22 @@
-#include "../../kernel/focus.h"
-#include "../../kernel/dispatch.h"
-#include "../../kernel/openbox.h"
-#include "../../kernel/grab.h"
-#include "../../kernel/action.h"
+#include "kernel/focus.h"
+#include "kernel/dispatch.h"
+#include "kernel/openbox.h"
+#include "kernel/event.h"
+#include "kernel/grab.h"
+#include "kernel/action.h"
+#include "kernel/parse.h"
 #include "tree.h"
 #include "keyboard.h"
-#include "keysrc.h"
+#include "keyparse.h"
 #include "translate.h"
 #include <glib.h>
 
 void plugin_setup_config()
 {
+    parse_reg_section("keyboard", keyparse, NULL);
 }
 
-KeyBindingTree *firstnode;
+KeyBindingTree *firstnode = NULL;
 
 static KeyBindingTree *curpos;
 static guint reset_key, reset_state;
@@ -40,7 +43,7 @@ static void reset_chains()
        grabbed = FALSE;
         grab_keyboard(FALSE);
     } else
-        XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
+        XAllowEvents(ob_display, AsyncKeyboard, event_lasttime);
 }
 
 gboolean kbind(GList *keylist, Action *action)
@@ -55,12 +58,12 @@ gboolean kbind(GList *keylist, Action *action)
         return FALSE;
     if ((t = tree_find(tree, &conflict)) != NULL) {
        /* already bound to something */
-       g_warning("keychain is already bound");
+       g_message("keychain is already bound");
         tree_destroy(tree);
         return FALSE;
     }
     if (conflict) {
-        g_warning("conflict with binding");
+        g_message("conflict with binding");
         tree_destroy(tree);
         return FALSE;
     }
@@ -83,8 +86,22 @@ gboolean kbind(GList *keylist, Action *action)
     return TRUE;
 }
 
-static void press(ObEvent *e, void *foo)
+static void event(ObEvent *e, void *foo)
 {
+    static KeyBindingTree *grabbed_key = NULL;
+
+    if (e->type == Event_X_KeyRelease) {
+        if (grabbed_key) {
+            if (!(grabbed_key->state & e->data.x.e->xkey.state)) {
+                grabbed_key->action->data.cycle.final = TRUE;
+                grabbed_key->action->func(&grabbed_key->action->data);
+                grab_keyboard(FALSE);
+                grabbed_key = FALSE;
+            }
+        }
+        return;
+    }
+
     if (e->data.x.e->xkey.keycode == reset_key &&
         e->data.x.e->xkey.state == reset_state) {
         reset_chains();
@@ -102,7 +119,8 @@ static void press(ObEvent *e, void *foo)
                     if (!grabbed) {
                         grab_keyboard(TRUE);
                         grabbed = TRUE;
-                        XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
+                        XAllowEvents(ob_display, AsyncKeyboard,
+                                     event_lasttime);
                     }
                     curpos = p;
                 } else {
@@ -112,7 +130,15 @@ static void press(ObEvent *e, void *foo)
                         g_assert(!(p->action->func == action_move ||
                                    p->action->func == action_resize));
 
+                        if (p->action->func == action_cycle_windows)
+                            p->action->data.cycle.final = FALSE;
+
                         p->action->func(&p->action->data);
+
+                        if (p->action->func == action_cycle_windows) {
+                            grab_keyboard(TRUE);
+                            grabbed_key = p;
+                        }
                     }
 
                     reset_chains();
@@ -126,16 +152,17 @@ static void press(ObEvent *e, void *foo)
 
 void plugin_startup()
 {
-    dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
+    curpos = NULL;
+    grabbed = FALSE;
 
-    translate_key("C-g", &reset_state, &reset_key);
+    dispatch_register(Event_X_KeyPress | Event_X_KeyRelease, (EventHandler)event, NULL);
 
-    keysrc_parse();
+    translate_key("C-g", &reset_state, &reset_key);
 }
 
 void plugin_shutdown()
 {
-    dispatch_register(0, (EventHandler)press, NULL);
+    dispatch_register(0, (EventHandler)event, NULL);
 
     grab_keys(FALSE);
     tree_destroy(firstnode);