X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=add2b473d665a01e887d08dab78ff33a5c2bf0f7;hb=68ff2eb3d2d7874e780000143cbee9a8e7c2e57f;hp=f3495eb82f1b6dfc611386d1afe5820d2e28b75f;hpb=0a2aa0892473c9fc61bfedd753fbb136a3f7e864;p=chaz%2Fopenbox diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index f3495eb8..add2b473 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -1,12 +1,21 @@ -#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 "keyparse.h" +#include "translate.h" #include +void plugin_setup_config() +{ + parse_reg_section("keyboard", keyparse); +} + KeyBindingTree *firstnode; static KeyBindingTree *curpos; @@ -33,10 +42,11 @@ static void reset_chains() if (grabbed) { grabbed = FALSE; grab_keyboard(FALSE); - } + } else + XAllowEvents(ob_display, AsyncKeyboard, event_lasttime); } -static gboolean kbind(GList *keylist, Action *action) +gboolean kbind(GList *keylist, Action *action) { KeyBindingTree *tree, *t; gboolean conflict; @@ -44,10 +54,8 @@ static gboolean kbind(GList *keylist, Action *action) g_assert(keylist != NULL); g_assert(action != NULL); - if (!(tree = tree_build(keylist))) { - g_warning("invalid binding"); + if (!(tree = tree_build(keylist))) return FALSE; - } if ((t = tree_find(tree, &conflict)) != NULL) { /* already bound to something */ g_warning("keychain is already bound"); @@ -83,7 +91,6 @@ static void press(ObEvent *e, void *foo) if (e->data.x.e->xkey.keycode == reset_key && e->data.x.e->xkey.state == reset_state) { reset_chains(); - XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); } else { KeyBindingTree *p; if (curpos == NULL) @@ -98,7 +105,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 { @@ -111,7 +119,6 @@ static void press(ObEvent *e, void *foo) p->action->func(&p->action->data); } - XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); reset_chains(); } break; @@ -121,58 +128,11 @@ static void press(ObEvent *e, void *foo) } } -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); -} - void plugin_startup() { dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL); - /* XXX parse config file! */ - binddef(); + translate_key("C-g", &reset_state, &reset_key); } void plugin_shutdown()