move the move/resize functionality into moveresize.c, for use with the netwm atoms...

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

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 7e2df47536109d826f068ccc15ddfdf16aadf86a..bf670c49f89ba41807925a6c1d992d39032afc7e 100644 (file)
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -1,23 +1,25 @@
-#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/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;
+static guint reset_key, reset_state, button_return, button_escape;
 static gboolean grabbed;
 
 static void grab_keys(gboolean grab)
@@ -56,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;
     }
@@ -84,8 +86,38 @@ 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 (grabbed_key) {
+        gboolean done = FALSE;
+
+        if ((e->type == Event_X_KeyRelease && 
+             !(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)
+                done = TRUE;
+            else if (e->data.x.e->xkey.keycode == button_escape) {
+                grabbed_key->action->data.cycle.cancel = TRUE;
+                done = TRUE;
+            }
+        }
+        if (done) {
+            grabbed_key->action->data.cycle.final = TRUE;
+            grabbed_key->action->func(&grabbed_key->action->data);
+            grab_keyboard(FALSE);
+            grabbed_key = NULL;
+            reset_chains();
+            return; 
+        }
+    }
+    if (e->type == Event_X_KeyRelease)
+        return;
+
+    g_assert(e->type == Event_X_KeyPress);
+
     if (e->data.x.e->xkey.keycode == reset_key &&
         e->data.x.e->xkey.state == reset_state) {
         reset_chains();
@@ -111,10 +143,18 @@ static void press(ObEvent *e, void *foo)
                     if (p->action->func != NULL) {
                         p->action->data.any.c = focus_client;
 
-                        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->data.cycle.cancel = FALSE;
+                        }
 
                         p->action->func(&p->action->data);
+
+                        if (p->action->func == action_cycle_windows &&
+                            !grabbed_key) {
+                            grab_keyboard(TRUE);
+                            grabbed_key = p;
+                        }
                     }
 
                     reset_chains();
@@ -128,16 +168,21 @@ static void press(ObEvent *e, void *foo)
 
 void plugin_startup()
 {
-    dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
+    guint i;
 
-    translate_key("C-g", &reset_state, &reset_key);
+    curpos = NULL;
+    grabbed = FALSE;
 
-    keysrc_parse();
+    dispatch_register(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);
 }
 
 void plugin_shutdown()
 {
-    dispatch_register(0, (EventHandler)press, NULL);
+    dispatch_register(0, (EventHandler)event, NULL);
 
     grab_keys(FALSE);
     tree_destroy(firstnode);