mouse and key bindings plugins work. segfault somewhere still on shutdown

6 files changed, 65 insertions, 71 deletions

diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index 983fd39a..b5ab4151 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -7,9 +7,9 @@ CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \
 plugin_LTLIBRARIES=keyboard.la
 
 keyboard_la_LDFLAGS=-module -avoid-version
-keyboard_la_SOURCES=keyboard.c tree.c translate.c keyaction.c
+keyboard_la_SOURCES=keyboard.c tree.c translate.c
 
-noinst_HEADERS=keyboard.h tree.h translate.h keyaction.h
+noinst_HEADERS=keyboard.h tree.h translate.h
 
 MAINTAINERCLEANFILES= Makefile.in
 
diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 05481b53..141bb5b1 100644
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -5,7 +5,6 @@
 #include "../../kernel/action.h"
 #include "tree.h"
 #include "keyboard.h"
-#include "keyaction.h"
 #include <glib.h>
 
 KeyBindingTree *firstnode;
@@ -21,6 +20,7 @@ static void grab_keys(gboolean grab)
     } else {
 	KeyBindingTree *p = firstnode;
 	while (p) {
+            /* XXX grab all lock keys too */
 	    XGrabKey(ob_display, p->key, p->state, ob_root, FALSE,
 		     GrabModeAsync, GrabModeSync);
 	    p = p->next_sibling;
@@ -38,56 +38,43 @@ static void reset_chains()
     }
 }
 
-static void clearall()
-{
-    grab_keys(FALSE);
-    tree_destroy(firstnode);
-    firstnode = NULL;
-    grab_keys(TRUE);
-}
-
-static gboolean bind(GList *keylist, KeyAction *action)
+static gboolean kbind(GList *keylist, Action *action)
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
 
+    g_assert(keylist != NULL);
+    g_assert(action != NULL);
+
     if (!(tree = tree_build(keylist))) {
         g_warning("invalid binding");
         return FALSE;
     }
-
-    t = tree_find(tree, &conflict);
-    if (conflict) {
-        g_warning("conflict with binding");
+    if ((t = tree_find(tree, &conflict)) != NULL) {
+	/* already bound to something */
+	g_warning("keychain is already bound");
         tree_destroy(tree);
         return FALSE;
     }
-    if (t != NULL) {
-	/* already bound to something */
-	g_warning("keychain is already bound");
+    if (conflict) {
+        g_warning("conflict with binding");
         tree_destroy(tree);
         return FALSE;
     }
 
-    /* grab the server here to make sure no key pressed go missed */
+    /* grab the server here to make sure no key presses go missed */
     grab_server(TRUE);
-
     grab_keys(FALSE);
 
-    /* set the function */
+    /* set the action */
     t = tree;
     while (t->first_child) t = t->first_child;
-    t->action.action = action->action;
-    t->action.type[0] = action->type[0];
-    t->action.type[1] = action->type[1];
-    t->action.data[0] = action->data[0];
-    t->action.data[1] = action->data[1];
-
-    /* assimilate this built tree into the main tree */
-    tree_assimilate(tree); /* assimilation destroys/uses the tree */
+    t->action = action;
+    /* assimilate this built tree into the main tree. assimilation
+       destroys/uses the tree */
+    tree_assimilate(tree);
 
     grab_keys(TRUE); 
-
     grab_server(FALSE);
 
     return TRUE;
@@ -117,7 +104,14 @@ static void press(ObEvent *e, void *foo)
                     }
                     curpos = p;
                 } else {
-                    keyaction_do(&p->action, focus_client);
+                    if (p->action->func != NULL) {
+                        p->action->data.any.c = focus_client;
+
+                        g_assert(!(p->action->func == action_move ||
+                                   p->action->func == action_resize));
+
+                        p->action->func(&p->action->data);
+                    }
 
                     XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
                     reset_chains();
@@ -132,49 +126,47 @@ static void press(ObEvent *e, void *foo)
 static void binddef()
 {
     GList *list = g_list_append(NULL, NULL);
-    KeyAction a;
+    Action *a;
+
+    /* When creating an Action struct, all of the data elements in the
+       appropriate struct need to be set, except the Client*, which will be set
+       at call-time when then action function is used.
+    */
 
     list->data = "C-Right";
-    a.action = Action_NextDesktop;
-    keyaction_set_bool(&a, 0, TRUE);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
+    a = action_new(action_next_desktop);
+    a->data.nextprevdesktop.wrap = TRUE;
+    kbind(list, a);
 
     list->data = "C-Left";
-    a.action = Action_PreviousDesktop;
-    keyaction_set_bool(&a, 0, TRUE);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
+    a = action_new(action_previous_desktop);
+    a->data.nextprevdesktop.wrap = TRUE;
+    kbind(list, a);
 
     list->data = "C-1";
-    a.action = Action_Desktop;
-    keyaction_set_uint(&a, 0, 0);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
+    a = action_new(action_desktop);
+    a->data.desktop.desk = 0;
+    kbind(list, a);
 
-    list->data = "C-2";
-    a.action = Action_Desktop;
-    keyaction_set_uint(&a, 0, 1);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
+    list->data = "C-2"; 
+    a = action_new(action_desktop);
+    a->data.desktop.desk = 1;
+    kbind(list, a);
 
     list->data = "C-3";
-    a.action = Action_Desktop;
-    keyaction_set_uint(&a, 0, 2);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
+    a = action_new(action_desktop);
+    a->data.desktop.desk = 2;
+    kbind(list, a);
 
     list->data = "C-4";
-    a.action = Action_Desktop;
-    keyaction_set_uint(&a, 0, 3);
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
+    a = action_new(action_desktop);
+    a->data.desktop.desk = 3;
+    kbind(list, a);
 
     list->data = "C-space";
-    a.action = Action_Execute;
-    keyaction_set_string(&a, 0, "xterm");
-    keyaction_set_none(&a, 1);
-    bind(list, &a);
+    a = action_new(action_execute);
+    a->data.execute.path = g_strdup("xterm");
+    kbind(list, a);
 }
 
 void plugin_startup()
@@ -188,6 +180,10 @@ void plugin_startup()
 void plugin_shutdown()
 {
     dispatch_register(0, (EventHandler)press, NULL);
-    clearall();
+
+    grab_keys(FALSE);
+    tree_destroy(firstnode);
+    firstnode = NULL;
+    grab_keys(TRUE);
 }
 
diff --git a/plugins/keyboard/keyboard.h b/plugins/keyboard/keyboard.h
index b183fa38..e2406d93 100644
--- a/plugins/keyboard/keyboard.h
+++ b/plugins/keyboard/keyboard.h
@@ -1,14 +1,15 @@
 #ifndef __plugin_keyboard_keybaord_h
 #define __plugin_keyboard_keybaord_h
 
-#include "keyaction.h"
 #include <glib.h>
 
+#include "../../kernel/action.h"
+
 typedef struct KeyBindingTree {
     guint state;
     guint key;
     GList *keylist;
-    KeyAction action;
+    Action *action;
 
     /* the next binding in the tree at the same level */
     struct KeyBindingTree *next_sibling; 
diff --git a/plugins/keyboard/translate.c b/plugins/keyboard/translate.c
index 75c077fd..d18c604b 100644
--- a/plugins/keyboard/translate.c
+++ b/plugins/keyboard/translate.c
@@ -1,9 +1,8 @@
 #include "../../kernel/openbox.h"
-#include "keyboard.h"
 #include <glib.h>
 #include <string.h>
 
-guint keyboard_translate_modifier(char *str)
+static guint translate_modifier(char *str)
 {
     if (!strcmp("Mod1", str) || !strcmp("A", str)) return Mod1Mask;
     else if (!strcmp("Mod2", str)) return Mod2Mask;
@@ -36,7 +35,7 @@ gboolean translate_key(char *str, guint *state, guint *keycode)
     /* figure out the mod mask */
     *state = 0;
     for (i = 0; parsed[i] != l; ++i) {
-	guint m = keyboard_translate_modifier(parsed[i]);
+	guint m = translate_modifier(parsed[i]);
 	if (!m) goto translation_fail;
 	*state |= m;
     }
diff --git a/plugins/keyboard/translate.h b/plugins/keyboard/translate.h
index e0d0bae3..4dae9014 100644
--- a/plugins/keyboard/translate.h
+++ b/plugins/keyboard/translate.h
@@ -3,7 +3,6 @@
 
 #include <glib.h>
 
-guint translate_modifier(char *str);
 gboolean translate_key(char *str, guint *state, guint *keycode);
 
 #endif
diff --git a/plugins/keyboard/tree.c b/plugins/keyboard/tree.c
index b7f51888..ab528376 100644
--- a/plugins/keyboard/tree.c
+++ b/plugins/keyboard/tree.c
@@ -1,6 +1,5 @@
 #include "keyboard.h"
 #include "translate.h"
-#include "keyaction.h"
 #include <glib.h>
 
 void tree_destroy(KeyBindingTree *tree)
@@ -15,7 +14,7 @@ void tree_destroy(KeyBindingTree *tree)
 	    for (it = tree->keylist; it != NULL; it = it->next)
 		g_free(it->data);
 	    g_list_free(tree->keylist);
-            keyaction_free(&tree->action);
+            action_free(tree->action);
 	}
 	g_free(tree);
 	tree = c;