X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fkeyboard.c;h=65d2f2e072f22a1891965a907b599ff2cb4445be;hb=e68e6c6a536a2132570ddf1d1d3759bb31ef781e;hp=b517014a795df3334fdf470c5b101c7fb6934359;hpb=2c6c0757fa497f4c1e0648bcbb1927c0fa12862f;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index b517014a..65d2f2e0 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -58,7 +58,7 @@ static void grab_keys(gboolean grab) 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); + grab_for_window(((ObClient*)it->data)->window, grab); } static gboolean chain_timeout(gpointer data) @@ -73,6 +73,7 @@ void keyboard_reset_chains() ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); if (curpos) { + grab_keys(FALSE); curpos = NULL; grab_keys(TRUE); } @@ -82,6 +83,7 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) { KeyBindingTree *tree, *t; gboolean conflict; + gboolean mods = TRUE; g_assert(keylist != NULL); g_assert(action != NULL); @@ -95,7 +97,6 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) tree = NULL; } else t = tree; - while (t->first_child) t = t->first_child; if (conflict) { g_warning("conflict with binding"); @@ -103,6 +104,21 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) return FALSE; } + /* find if every key in this chain has modifiers, and also find the + bottom node of the tree */ + while (t->first_child) { + if (!t->state) + mods = FALSE; + t = t->first_child; + } + + /* when there are no modifiers in the binding, then the action cannot + be interactive */ + if (!mods && action->data.any.interactive) { + action->data.any.interactive = FALSE; + action->data.inter.final = TRUE; + } + /* set the action */ t->actions = g_slist_append(t->actions, action); /* assimilate this built tree into the main tree. assimilation @@ -117,10 +133,12 @@ void keyboard_interactive_grab(guint state, ObClient *client, { ObInteractiveState *s; + g_assert(action->data.any.interactive); + if (!interactive_states) { if (!grab_keyboard(TRUE)) return; - if (!grab_pointer(TRUE, None)) { + if (!grab_pointer(TRUE, OB_CURSOR_NONE)) { grab_keyboard(FALSE); return; } @@ -163,19 +181,18 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, cancel = done = TRUE; } if (done) { - g_assert(s->action->data.any.interactive); - - s->action->data.inter.cancel = cancel; - s->action->data.inter.final = TRUE; - - s->action->func(&s->action->data); - - grab_keyboard(FALSE); - grab_pointer(FALSE, None); - keyboard_reset_chains(); + action_run_interactive(s->action, s->client, + e->xkey.state, cancel, TRUE); g_free(s); + interactive_states = g_slist_delete_link(interactive_states, it); + if (!interactive_states) { + grab_keyboard(FALSE); + grab_pointer(FALSE, OB_CURSOR_NONE); + keyboard_reset_chains(); + } + handled = TRUE; } } @@ -202,42 +219,22 @@ void keyboard_event(ObClient *client, const XEvent *e) p = curpos->first_child; while (p) { if (p->key == e->xkey.keycode && - p->state == e->xkey.state) { + p->state == e->xkey.state) + { if (p->first_child != NULL) { /* part of a chain */ ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); /* 5 second timeout for chains */ ob_main_loop_timeout_add(ob_main_loop, 5 * G_USEC_PER_SEC, chain_timeout, NULL, NULL); + grab_keys(FALSE); curpos = p; grab_keys(TRUE); } else { GSList *it; - for (it = p->actions; it; it = it->next) { - ObAction *act = it->data; - if (act->func != NULL) { - act->data.any.c = client; - - if (act->func == action_moveresize) { - screen_pointer_pos(&act->data.moveresize.x, - &act->data.moveresize.y); - } - - if (act->data.any.interactive) { - act->data.inter.cancel = FALSE; - act->data.inter.final = FALSE; - keyboard_interactive_grab(e->xkey.state, client, - 0, act); - } - - if (act->func == action_showmenu) { - act->data.showmenu.x = e->xkey.x_root; - act->data.showmenu.y = e->xkey.y_root; - } - - act->data.any.c = client; - act->func(&act->data); - } - } + + for (it = p->actions; it; it = it->next) + action_run_key(it->data, client, e->xkey.state, + e->xkey.x_root, e->xkey.y_root); keyboard_reset_chains(); } @@ -247,15 +244,25 @@ void keyboard_event(ObClient *client, const XEvent *e) } } -void keyboard_startup() +void keyboard_startup(gboolean reconfig) { grab_keys(TRUE); } -void keyboard_shutdown() +void keyboard_shutdown(gboolean reconfig) { + GSList *it; + tree_destroy(keyboard_firstnode); keyboard_firstnode = NULL; + + for (it = interactive_states; it; it = g_slist_next(it)) + g_free(it->data); + g_slist_free(interactive_states); + interactive_states = NULL; + + ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); grab_keys(FALSE); + curpos = NULL; }