X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=plugins%2Fkeyboard%2Fkeyboard.c;h=acda951a452e59e0a46a3289fb109c3a2f5d7550;hb=f26f23de50cb7941a7702198e3b4d1b2f9de062e;hp=141bb5b1a1e2a706918c021e777d053caf5025c2;hpb=4bcd03b2d0904e2b5443a2383b66055422240255;p=chaz%2Fopenbox diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index 141bb5b1..acda951a 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -1,28 +1,35 @@ -#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) { if (!grab) { - XUngrabKey(ob_display, AnyKey, AnyModifier, ob_root); + ungrab_all_keys(); } else { KeyBindingTree *p = firstnode; while (p) { - /* XXX grab all lock keys too */ - XGrabKey(ob_display, p->key, p->state, ob_root, FALSE, - GrabModeAsync, GrabModeSync); + grab_key(p->key, p->state, GrabModeSync); p = p->next_sibling; } } @@ -35,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; @@ -46,18 +54,19 @@ 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"); + /* already bound to something, use the existing tree */ tree_destroy(tree); - return FALSE; - } + tree = NULL; + } else + t = tree; + while (t->first_child) t = t->first_child; + if (conflict) { - g_warning("conflict with binding"); + g_message("conflict with binding"); tree_destroy(tree); return FALSE; } @@ -67,12 +76,10 @@ static gboolean kbind(GList *keylist, Action *action) grab_keys(FALSE); /* set the action */ - t = tree; - while (t->first_child) t = t->first_child; - t->action = action; + t->actions = g_slist_append(t->actions, action); /* assimilate this built tree into the main tree. assimilation destroys/uses the tree */ - tree_assimilate(tree); + if (tree) tree_assimilate(tree); grab_keys(TRUE); grab_server(FALSE); @@ -80,12 +87,49 @@ 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) { + GSList *it; + for (it = grabbed_key->actions; it; it = it->next) { + Action *act = it->data; + act->data.cycle.cancel = TRUE; + } + done = TRUE; + } + } + if (done) { + GSList *it; + for (it = grabbed_key->actions; it; it = it->next) { + Action *act = it->data; + act->data.cycle.final = TRUE; + act->func(&act->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) @@ -100,20 +144,32 @@ 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)); - - p->action->func(&p->action->data); + GSList *it; + for (it = p->actions; it; it = it->next) { + Action *act = it->data; + if (act->func != NULL) { + act->data.any.c = focus_client; + + if (act->func == action_cycle_windows) { + act->data.cycle.final = FALSE; + act->data.cycle.cancel = FALSE; + } + + act->func(&act->data); + + if (act->func == action_cycle_windows && + !grabbed_key) { + grab_keyboard(TRUE); + grabbed_key = p; + } + } } - XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); reset_chains(); } break; @@ -123,63 +179,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 = "C-Right"; - a = action_new(action_next_desktop); - a->data.nextprevdesktop.wrap = TRUE; - kbind(list, a); - - list->data = "C-Left"; - a = action_new(action_previous_desktop); - a->data.nextprevdesktop.wrap = TRUE; - kbind(list, a); - - list->data = "C-1"; - a = action_new(action_desktop); - a->data.desktop.desk = 0; - kbind(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_new(action_desktop); - a->data.desktop.desk = 2; - kbind(list, a); - - list->data = "C-4"; - a = action_new(action_desktop); - a->data.desktop.desk = 3; - kbind(list, a); - - list->data = "C-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); + 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);