load keybindings from keysrc

diff --git a/plugins/keyboard/.cvsignore b/plugins/keyboard/.cvsignore
index 32752a9b36d5a74252edf2c3da5834a76fed0f50..ef46dd0173c15f6cd533b8edb408db54888516eb 100644 (file)
--- a/plugins/keyboard/.cvsignore
+++ b/plugins/keyboard/.cvsignore
@@ -7,3 +7,8 @@ Makefile.in
 tree.lo
 translate.lo
 keyaction.lo
+lex.kparse.c
+lex.kparse.lo
+y.tab.c
+y.tab.h
+y.tab.lo 

diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index b5ab4151e227d7dd7c80c9c554076fce25cb50b0..1b6800ce7ef4035e34a3258cabb9a38178471960 100644 (file)
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -1,17 +1,30 @@
 plugindir=$(libdir)/openbox/plugins
+rcdir=$(datadir)/openbox
 
 CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \
 -DPLUGINDIR=\"$(plugindir)\" \
+-DRCDIR=\"$(rcdir)\" \
 -DG_LOG_DOMAIN=\"Plugin-Keyboard\"
 
 plugin_LTLIBRARIES=keyboard.la
 
 keyboard_la_LDFLAGS=-module -avoid-version
-keyboard_la_SOURCES=keyboard.c tree.c translate.c
+keyboard_la_SOURCES=keyboard.c tree.c translate.c y.tab.c lex.kparse.c
 
-noinst_HEADERS=keyboard.h tree.h translate.h
+lex.kparse.c: keysrc.l y.tab.c
+       $(FLEX) -Pkparse $<
+
+y.tab.c: keysrc.yacc
+       $(YACC) -d -p kparse $<
+
+rc_DATA=keysrc
+
+noinst_HEADERS=keyboard.h tree.h translate.h keysrc.h
 
 MAINTAINERCLEANFILES= Makefile.in
 
+clean-local:
+       $(RM) y.tab.c lex.kparse.c
+
 distclean-local:
        $(RM) *\~ *.orig *.rej .\#*

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index 9b9c0882da295c6d2e1bed453299fafd889b5300..2b3f3e5a804515bfab901308023849dea12817f7 100644 (file)
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -5,6 +5,7 @@
 #include "../../kernel/action.h"
 #include "tree.h"
 #include "keyboard.h"
+#include "keysrc.h"
 #include <glib.h>
 
 void plugin_setup_config()
@@ -40,7 +41,7 @@ static void reset_chains()
     }
 }
 
-static gboolean kbind(GList *keylist, Action *action)
+gboolean kbind(GList *keylist, Action *action)
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
@@ -123,63 +124,11 @@ static void press(ObEvent *e, void *foo)
     XAllowEvents(ob_display, AsyncKeyboard, e->data.x.e->xkey.time);
 }
 
-static void binddef()
-{
-    GList *list = g_list_append(NULL, NULL);
-    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 = "A-Right";
-    a = action_new(action_next_desktop);
-    a->data.nextprevdesktop.wrap = TRUE;
-    kbind(list, a);
-
-    list->data = "A-Left";
-    a = action_new(action_previous_desktop);
-    a->data.nextprevdesktop.wrap = TRUE;
-    kbind(list, a);
-
-    list->data = "A-1";
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 0;
-    kbind(list, a);
-
-    list->data = "A-2"; 
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 1;
-    kbind(list, a);
-
-    list->data = "A-3";
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 2;
-    kbind(list, a);
-
-    list->data = "A-4";
-    a = action_new(action_desktop);
-    a->data.desktop.desk = 3;
-    kbind(list, a);
-
-    list->data = "A-space";
-    a = action_new(action_execute);
-    a->data.execute.path = g_strdup("xterm");
-    kbind(list, a);
-
-    list->data = "C-A-Escape";
-    a = action_new(action_execute);
-    a->data.execute.path = g_strdup("xlock -nolock -mode puzzle");
-    kbind(list, a);
-}
-
 void plugin_startup()
 {
     dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
 
-    /* XXX parse config file! */
-    binddef();
+    keysrc_parse();
 }
 
 void plugin_shutdown()

diff --git a/plugins/keyboard/keyboard.h b/plugins/keyboard/keyboard.h
index 892d4e04bf4c376e408bf24f066278d24da08dc1..bc5d3137db9025ee6bf23371b874b32d5dbdfc8f 100644 (file)
--- a/plugins/keyboard/keyboard.h
+++ b/plugins/keyboard/keyboard.h
@@ -7,6 +7,6 @@
 
 extern KeyBindingTree *firstnode;
 
-guint keyboard_translate_modifier(char *str);
+gboolean kbind(GList *keylist, Action *action);
 
 #endif

diff --git a/plugins/keyboard/keysrc b/plugins/keyboard/keysrc
new file mode 100644 (file)
index 0000000..24f4010
--- /dev/null
+++ b/plugins/keyboard/keysrc
@@ -0,0 +1,10 @@
+A-space                execute "xterm"
+C-A-Escape     execute "xlock -nolock -mode puzzle"
+
+A-Left         PreviousDesktopWrap
+A-Right                NextDesktopWrap
+
+A-1            Desktop 1
+A-2            Desktop 2
+A-3            Desktop 3
+A-4            Desktop 4

diff --git a/plugins/keyboard/keysrc.h b/plugins/keyboard/keysrc.h
new file mode 100644 (file)
index 0000000..d646b86
--- /dev/null
+++ b/plugins/keyboard/keysrc.h
@@ -0,0 +1,6 @@
+#ifndef __plugin_keyboard_keysrc_h
+#define __plugin_keyboard_keysrc_h
+
+void keysrc_parse();
+
+#endif

diff --git a/plugins/keyboard/keysrc.l b/plugins/keyboard/keysrc.l
new file mode 100644 (file)
index 0000000..258a23b
--- /dev/null
+++ b/plugins/keyboard/keysrc.l
@@ -0,0 +1,44 @@
+%{
+#include <glib.h>
+#include "y.tab.h"
+
+extern void kparseerror(char *s);
+int kparselineno;
+%}
+
+field [A-Za-z0-9][-A-Za-z0-9]*
+number [0-9]+
+desktop [dD][eE][sS][kK][tT][oO][pP]
+execute [eE][xX][eE][cC][uU][tT][eE]
+restart [rR][eE][sS][tT][aA][rR][tT]
+string \"[^"\n]*\"
+
+%%
+
+^[ \t]*#.*\n kparselineno++;
+{number}     kparselval.integer = atoi(kparsetext);    return INTEGER;
+{execute}    kparselval.string = g_strdup(kparsetext); return EXECUTE;
+{restart}    kparselval.string = g_strdup(kparsetext); return RESTART;
+{desktop}    kparselval.string = g_strdup(kparsetext); return DESKTOP;
+{field}      kparselval.string = g_strdup(kparsetext); return FIELD;
+{string}     {
+                 /* drop the quotes */
+                 kparselval.string = g_strdup(kparsetext+1);
+                 if (kparselval.string[kparseleng-2] != '"') {
+                     g_warning("improperly terminated string on line %d\n",
+                               kparselineno);
+                     kparseerror("");
+                 } else
+                     kparselval.string[kparseleng-2] = '\0';
+                 return STRING;
+             }
+
+[ \t]
+\n           kparselineno++; return *yytext;
+.            kparseerror("");
+
+%%
+
+int kparsewrap() {
+    return 1;
+}

diff --git a/plugins/keyboard/keysrc.yacc b/plugins/keyboard/keysrc.yacc
new file mode 100644 (file)
index 0000000..8772fa1
--- /dev/null
+++ b/plugins/keyboard/keysrc.yacc
@@ -0,0 +1,101 @@
+%{
+#include "keyboard.h"
+#include "../../kernel/action.h"
+#include <glib.h>
+#ifdef HAVE_STDIO_H
+#  include <stdio.h>
+#endif
+
+extern int kparselex();
+extern int kparselineno;
+extern FILE *kparsein;  /* lexer input */
+
+void kparseerror(char *s);
+static void addbinding(GList *keylist, char *action, char *path, int num);
+
+static char *path;
+%}
+
+%union {
+    char *string;
+    int integer;
+    GList *list;
+}
+
+%token <integer> INTEGER;
+%token <string> STRING
+%token <string> FIELD
+%token <string> EXECUTE
+%token <string> RESTART
+%token <string> DESKTOP
+
+%type <list> fields
+
+%%
+
+config:
+  | config '\n'
+  | config fields FIELD '\n' { addbinding($2, $3, NULL, 0); }
+  | config fields DESKTOP INTEGER '\n' { addbinding($2, $3, NULL, $4); }
+  | config fields RESTART '\n' { addbinding($2, $3, NULL, 0); }
+  | config fields EXECUTE STRING '\n' { addbinding($2, $3, $4, 0); }
+  | config fields RESTART STRING '\n' { addbinding($2, $3, $4, 0); }
+  ;
+
+fields:
+  FIELD { $$ = g_list_prepend(NULL, $1); }
+  | fields FIELD { $$ = g_list_prepend($1, $2); }
+  ;
+
+%%
+
+void kparseerror(char *s) {
+    g_warning("Parser error in '%s' on line %d", path, kparselineno);
+}
+
+void keysrc_parse()
+{
+    path = g_build_filename(g_get_home_dir(), ".openbox", "keysrc", NULL);
+    if ((kparsein = fopen(path, "r")) == NULL) {
+        g_free(path);
+        path = g_build_filename(RCDIR, "keysrc", NULL);
+        if ((kparsein = fopen(path, "r")) == NULL) {
+            g_warning("No keysrc file found!");
+            g_free(path);
+            return;
+        }
+    }
+
+    kparselineno = 1;
+
+    kparseparse();
+}
+
+static void addbinding(GList *keylist, char *action, char *apath, int num)
+{
+    Action *a;
+
+    a = action_from_string(action);
+
+    /* no move/resize with the keyboard */
+    if (a && (a->func == action_move || a->func == action_resize)) {
+        action_free(a);
+        a = NULL;
+    }
+    if (a == NULL) {
+        g_warning("Invalid action '%s' in '%s' on line %d", action, apath,
+                  kparselineno - 1);
+        return;
+    }
+    /* these have extra data! */
+    if (a->func == action_execute || a->func == action_restart)
+        a->data.execute.path = apath;
+    if (a->func == action_desktop)
+        a->data.desktop.desk = (unsigned) num + 1;
+
+    if (!kbind(keylist, a)) {
+        action_free(a);
+        g_warning("Unable to add binding in '%s' on line %d", path,
+                  kparselineno - 1);
+    }
+}

diff --git a/plugins/keyboard/tree.c b/plugins/keyboard/tree.c
index ab528376dfacb6e9a3df5c4dfea83fa730f6bcff..c0ea2f4958071d4f97d194bd69597fe19437936e 100644 (file)
--- a/plugins/keyboard/tree.c
+++ b/plugins/keyboard/tree.c
@@ -31,8 +31,7 @@ KeyBindingTree *tree_build(GList *keylist)
 
     for (it = g_list_last(keylist); it != NULL; it = it->prev) {
        p = ret;
-       ret = g_new(KeyBindingTree, 1);
-       ret->next_sibling = NULL;
+       ret = g_new0(KeyBindingTree, 1);
        if (p == NULL) {
            GList *it;