X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=bf670c49f89ba41807925a6c1d992d39032afc7e;hb=c4af950903820221bc8617de81231de32eef4f07;hp=4fa6a8ed4d51ab00d36ee8a550d4beca612d6e52;hpb=001233837ec4789e2363e21dc124e10294233adb;p=chaz%2Fopenbox diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index 4fa6a8ed..bf670c49 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -1,16 +1,25 @@ -#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 -KeyBindingTree *firstnode; +void plugin_setup_config() +{ + parse_reg_section("keyboard", keyparse, NULL); +} + +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) @@ -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,18 +54,16 @@ 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"); + 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; } @@ -78,12 +86,41 @@ static 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(); - XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); } else { KeyBindingTree *p; if (curpos == NULL) @@ -98,20 +135,28 @@ 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 { 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; + } } - XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); reset_chains(); } break; @@ -121,68 +166,23 @@ 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); - - 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); + guint i; + + curpos = NULL; + grabbed = FALSE; + + dispatch_register(Event_X_KeyPress | Event_X_KeyRelease, (EventHandler)event, NULL); - /* XXX parse config file! */ - binddef(); + 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);