X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=b67e738b7009a70d72d6ff859bad1f21c521a66b;hb=5ac5170decd6dcf9e86f434e55df2751a1a96e2b;hp=f110e18490220063e74cc54069c7a81a6603a8bb;hpb=838f76cd216aaadce186ab5dd4302845d89dd2f8;p=chaz%2Fopenbox diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index f110e184..b67e738b 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -1,104 +1,137 @@ -#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 "kernel/timer.h" #include "tree.h" #include "keyboard.h" -#include "keyaction.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 gboolean grabbed; +static guint reset_key, reset_state, button_return, button_escape; +static Timer *chain_timer; -static void grab_keys(gboolean grab) +static void grab_keys() { - if (!grab) { - XUngrabKey(ob_display, AnyKey, AnyModifier, ob_root); - } else { - KeyBindingTree *p = firstnode; - while (p) { - XGrabKey(ob_display, p->key, p->state, ob_root, FALSE, - GrabModeAsync, GrabModeSync); - p = p->next_sibling; - } + KeyBindingTree *p; + + ungrab_all_keys(); + + p = curpos ? curpos->first_child : firstnode; + while (p) { + grab_key(p->key, p->state, GrabModeAsync); + p = p->next_sibling; } + if (curpos) + grab_key(reset_key, reset_state, GrabModeAsync); } static void reset_chains() { - /* XXX kill timer */ - curpos = NULL; - if (grabbed) { - grabbed = FALSE; - grab_server(FALSE); + if (chain_timer) { + timer_stop(chain_timer); + chain_timer = NULL; + } + if (curpos) { + curpos = NULL; + grab_keys(); } } -static void clearall() +static void chain_timeout(void *data) { - grab_keys(FALSE); - tree_destroy(firstnode); - firstnode = NULL; - grab_keys(TRUE); + reset_chains(); } -static gboolean bind(GList *keylist, KeyAction *action) +gboolean kbind(GList *keylist, Action *action) { KeyBindingTree *tree, *t; gboolean conflict; - if (!(tree = tree_build(keylist))) { - g_warning("invalid binding"); + g_assert(keylist != NULL); + g_assert(action != NULL); + + if (!(tree = tree_build(keylist))) 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, use the existing tree */ tree_destroy(tree); - return FALSE; - } - if (t != NULL) { - /* already bound to something */ - g_warning("keychain is already bound"); + tree = NULL; + } else + t = tree; + while (t->first_child) t = t->first_child; + + if (conflict) { + g_message("conflict with binding"); tree_destroy(tree); return FALSE; } - /* grab the server here to make sure no key pressed go missed */ - grab_server(TRUE); - - grab_keys(FALSE); - - /* set the function */ - 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 */ - - grab_keys(TRUE); - - grab_server(FALSE); + /* set the action */ + t->actions = g_slist_append(t->actions, action); + /* assimilate this built tree into the main tree. assimilation + destroys/uses the tree */ + if (tree) tree_assimilate(tree); 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); + grabbed_key = NULL; + grab_keyboard(FALSE); + 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) @@ -109,17 +142,35 @@ static void press(ObEvent *e, void *foo) if (p->key == e->data.x.e->xkey.keycode && p->state == e->data.x.e->xkey.state) { if (p->first_child != NULL) { /* part of a chain */ - /* XXX TIMER */ - if (!grabbed) { - grab_server(TRUE); - grabbed = TRUE; - XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); - } + if (chain_timer) timer_stop(chain_timer); + /* 5 second timeout for chains */ + chain_timer = timer_start(5000*1000, chain_timeout, + NULL); curpos = p; + grab_keys(); } else { - keyaction_do(&p->action, focus_client); + 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) { + grabbed_key = p; + grab_keyboard(TRUE); + break; + } + } + } - XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); reset_chains(); } break; @@ -129,65 +180,29 @@ static void press(ObEvent *e, void *foo) } } -static void binddef() -{ - GList *list = g_list_append(NULL, NULL); - KeyAction a; - - list->data = "C-Right"; - a.action = Action_NextDesktop; - keyaction_set_bool(&a, 0, TRUE); - keyaction_set_none(&a, 1); - bind(list, &a); - - list->data = "C-Left"; - a.action = Action_PreviousDesktop; - keyaction_set_bool(&a, 0, TRUE); - keyaction_set_none(&a, 1); - bind(list, &a); - - list->data = "C-1"; - a.action = Action_Desktop; - keyaction_set_uint(&a, 0, 0); - keyaction_set_none(&a, 1); - bind(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-3"; - a.action = Action_Desktop; - keyaction_set_uint(&a, 0, 2); - keyaction_set_none(&a, 1); - bind(list, &a); - - list->data = "C-4"; - a.action = Action_Desktop; - keyaction_set_uint(&a, 0, 3); - keyaction_set_none(&a, 1); - bind(list, &a); - - list->data = "C-space"; - a.action = Action_Execute; - keyaction_set_string(&a, 0, "xterm"); - keyaction_set_none(&a, 1); - bind(list, &a); -} - void plugin_startup() { - dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL); + guint i; + + curpos = NULL; + chain_timer = NULL; - /* XXX parse config file! */ - binddef(); + dispatch_register(Event_X_KeyPress | Event_X_KeyRelease, + (EventHandler)event, NULL); + + translate_key("C-g", &reset_state, &reset_key); + translate_key("Escape", &i, &button_escape); + translate_key("Return", &i, &button_return); + + grab_keys(); } void plugin_shutdown() { - dispatch_register(0, (EventHandler)press, NULL); - clearall(); + dispatch_register(0, (EventHandler)event, NULL); + + tree_destroy(firstnode); + firstnode = NULL; + ungrab_all_keys(); }