X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=1597b06376aa74cdf233f1dd838ad0632f36e526;hb=79e189dbac9ec5ae5baed26515ee60b8dce9a079;hp=5991606adc52e8514179589653214f896b87cb0a;hpb=ebb97c189adde498cfd64d4183289c0e2645f8d8;p=chaz%2Fopenbox diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index 5991606a..1597b063 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -1,41 +1,112 @@ #include "kernel/focus.h" +#include "kernel/screen.h" +#include "kernel/frame.h" #include "kernel/dispatch.h" #include "kernel/openbox.h" #include "kernel/event.h" #include "kernel/grab.h" +#include "kernel/client.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->xmlChildrenNode, NULL); +} + void plugin_setup_config() { - parse_reg_section("keyboard", keyparse, NULL); + parse_register("keyboard", parse_xml, NULL); } KeyBindingTree *firstnode = NULL; static KeyBindingTree *curpos; -static guint reset_key, reset_state, button_return, button_escape; -static Timer *chain_timer; +static guint reset_key, reset_state; +static ObTimer *chain_timer; -static void grab_keys() +static void grab_for_window(Window win, gboolean grab) { KeyBindingTree *p; - ungrab_all_keys(); + ungrab_all_keys(win); - p = curpos ? curpos->first_child : firstnode; - while (p) { - grab_key(p->key, p->state, GrabModeAsync); - p = p->next_sibling; + if (grab) { + p = curpos ? curpos->first_child : firstnode; + while (p) { + grab_key(p->key, p->state, win, GrabModeAsync); + p = p->next_sibling; + } + if (curpos) + grab_key(reset_key, reset_state, win, GrabModeAsync); } - if (curpos) - grab_key(reset_key, reset_state, GrabModeAsync); +} + +static void grab_keys(gboolean grab) +{ + GList *it; + + grab_for_window(screen_support_win, grab); + for (it = client_list; it; it = g_list_next(it)) + grab_for_window(((ObClient*)it->data)->frame->window, grab); } static void reset_chains() @@ -46,11 +117,11 @@ static void reset_chains() } if (curpos) { curpos = NULL; - grab_keys(); + grab_keys(TRUE); } } -static void chain_timeout(void *data) +static void chain_timeout(ObTimer *t, void *data) { reset_chains(); } @@ -75,7 +146,7 @@ gboolean kbind(GList *keylist, Action *action) while (t->first_child) t = t->first_child; if (conflict) { - g_message("conflict with binding"); + g_warning("conflict with binding"); tree_destroy(tree); return FALSE; } @@ -93,6 +164,14 @@ static void event(ObEvent *e, void *foo) { static KeyBindingTree *grabbed_key = NULL; + if (e->type == Event_Client_Mapped) { + grab_for_window(e->data.c.client->window, TRUE); + return; + } else if (e->type == Event_Client_Destroy) { + grab_for_window(e->data.c.client->window, FALSE); + return; + } + if (grabbed_key) { gboolean done = FALSE; @@ -100,9 +179,9 @@ static void event(ObEvent *e, void *foo) !(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) + if (e->data.x.e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) done = TRUE; - else if (e->data.x.e->xkey.keycode == button_escape) { + else if (e->data.x.e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) { GSList *it; for (it = grabbed_key->actions; it; it = it->next) { Action *act = it->data; @@ -147,7 +226,7 @@ static void event(ObEvent *e, void *foo) chain_timer = timer_start(5000*1000, chain_timeout, NULL); curpos = p; - grab_keys(); + grab_keys(TRUE); } else { GSList *it; for (it = p->actions; it; it = it->next) { @@ -160,14 +239,23 @@ static void event(ObEvent *e, void *foo) act->data.cycle.cancel = FALSE; } - act->func(&act->data); + if (act->func == action_moveresize) { + screen_pointer_pos(&act->data.moveresize.x, + &act->data.moveresize.y); + } if (act->func == action_cycle_windows && - !grabbed_key) { + !grabbed_key && grab_keyboard(TRUE)) { grabbed_key = p; - grab_keyboard(TRUE); - break; } + + if (act->func == action_showmenu) { + act->data.showmenu.x = e->data.x.e->xkey.x_root; + act->data.showmenu.y = e->data.x.e->xkey.y_root; + } + + act->data.any.c = focus_client; + act->func(&act->data); } } @@ -182,19 +270,16 @@ static void event(ObEvent *e, void *foo) void plugin_startup() { - guint i; - curpos = NULL; chain_timer = NULL; - dispatch_register(Event_X_KeyPress | Event_X_KeyRelease, + dispatch_register(Event_Client_Mapped | Event_Client_Destroy | + 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(); + grab_keys(TRUE); } void plugin_shutdown() @@ -203,6 +288,6 @@ void plugin_shutdown() tree_destroy(firstnode); firstnode = NULL; - ungrab_all_keys(); + grab_keys(FALSE); }