X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=374f24932e47078172990242f99fefe9516585f6;hb=d1e355de2c6aae38cea3cdc0e0b902ea2b194e86;hp=b0529e0a78205de9a2ca4b44bf53191fe79b49c3;hpb=98c0c676dd5cc45a92bb9c90902de7f4c7d16528;p=chaz%2Fopenbox diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index b0529e0a..374f2493 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -4,46 +4,112 @@ #include "kernel/event.h" #include "kernel/grab.h" #include "kernel/action.h" -#include "kernel/parse.h" +#include "kernel/prop.h" +#include "kernel/timer.h" +#include "parser/parse.h" #include "tree.h" #include "keyboard.h" -#include "keyparse.h" #include "translate.h" #include +/* + + + + 3 + + + +*/ + +static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist) +{ + char *key; + Action *action; + xmlNodePtr n, nact; + GList *it; + + n = parse_find_node("keybind", node); + while (n) { + if (parse_attr_string("key", n, &key)) { + keylist = g_list_append(keylist, key); + + parse_key(doc, n->xmlChildrenNode, keylist); + + it = g_list_last(keylist); + g_free(it->data); + keylist = g_list_delete_link(keylist, it); + } + n = parse_find_node("keybind", n->next); + } + if (keylist) { + nact = parse_find_node("action", node); + while (nact) { + if ((action = action_parse(doc, nact))) { + /* validate that its okay for a key binding */ + if (action->func == action_moveresize && + action->data.moveresize.corner != + prop_atoms.net_wm_moveresize_move_keyboard && + action->data.moveresize.corner != + prop_atoms.net_wm_moveresize_size_keyboard) { + action_free(action); + action = NULL; + } + + if (action) + kbind(keylist, action); + } + nact = parse_find_node("action", nact->next); + } + } +} + +static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d) +{ + parse_key(doc, node, NULL); +} + void plugin_setup_config() { - parse_reg_section("keyboard", keyparse); + parse_register("keyboard", parse_xml, 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) { - ungrab_all_keys(); - } else { - KeyBindingTree *p = firstnode; - while (p) { - grab_key(p->key, p->state, 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_keyboard(FALSE); - } else - XAllowEvents(ob_display, AsyncKeyboard, event_lasttime); + if (chain_timer) { + timer_stop(chain_timer); + chain_timer = NULL; + } + if (curpos) { + curpos = NULL; + grab_keys(); + } +} + +static void chain_timeout(void *data) +{ + reset_chains(); } gboolean kbind(GList *keylist, Action *action) @@ -56,38 +122,70 @@ gboolean kbind(GList *keylist, Action *action) if (!(tree = tree_build(keylist))) return FALSE; + if ((t = tree_find(tree, &conflict)) != NULL) { - /* already bound to something */ - g_message("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_message("conflict with binding"); tree_destroy(tree); return FALSE; } - /* grab the server here to make sure no key presses go missed */ - grab_server(TRUE); - 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); - - grab_keys(TRUE); - grab_server(FALSE); + 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(); @@ -101,22 +199,34 @@ 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_keyboard(TRUE); - grabbed = TRUE; - XAllowEvents(ob_display, AsyncKeyboard, - event_lasttime); - } + 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 { - if (p->action->func != NULL) { - p->action->data.any.c = 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; - g_assert(!(p->action->func == action_move || - p->action->func == action_resize)); + if (act->func == action_cycle_windows) { + act->data.cycle.final = FALSE; + act->data.cycle.cancel = FALSE; + } - p->action->func(&p->action->data); + act->data.any.c = focus_client; + act->func(&act->data); + + if (act->func == action_cycle_windows && + !grabbed_key) { + grabbed_key = p; + grab_keyboard(TRUE); + break; + } + } } reset_chains(); @@ -130,21 +240,27 @@ static void press(ObEvent *e, void *foo) void plugin_startup() { + guint i; + curpos = NULL; - grabbed = FALSE; + chain_timer = NULL; - dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL); + 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); + dispatch_register(0, (EventHandler)event, NULL); - grab_keys(FALSE); tree_destroy(firstnode); firstnode = NULL; - grab_keys(TRUE); + ungrab_all_keys(); }