X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=86ead5288bd853af9964c33bc3815886f9662f2d;hb=de4f92ccc66c1dad1a2820a07d1f0161bd61a855;hp=513b6e1e30785dd2a63f7d9a2ea531ad66fe81d2;hpb=a9ce3ba2663177b002a676a140dc512f41ba2263;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index 513b6e1e..86ead528 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -1,3 +1,4 @@ +#include "mainloop.h" #include "focus.h" #include "screen.h" #include "frame.h" @@ -7,7 +8,7 @@ #include "client.h" #include "action.h" #include "prop.h" -#include "timer.h" +#include "config.h" #include "keytree.h" #include "keyboard.h" #include "translate.h" @@ -16,13 +17,16 @@ KeyBindingTree *keyboard_firstnode; +typedef struct { + guint state; + ObClient *client; + ObAction *action; + ObFrameContext context; +} ObInteractiveState; + +static GSList *interactive_states; + static KeyBindingTree *curpos; -static ObTimer *chain_timer; -static gboolean interactive_grab; -static guint grabbed_state; -static ObClient *grabbed_client; -static ObAction *grabbed_action; -static ObFrameContext grabbed_context; static void grab_for_window(Window win, gboolean grab) { @@ -36,6 +40,10 @@ static void grab_for_window(Window win, gboolean grab) grab_key(p->key, p->state, win, GrabModeAsync); p = p->next_sibling; } + if (curpos) + grab_key(config_keyboard_reset_keycode, + config_keyboard_reset_state, + win, GrabModeAsync); } } @@ -53,23 +61,23 @@ static void grab_keys(gboolean grab) grab_for_window(((ObClient*)it->data)->frame->window, grab); } +static gboolean chain_timeout(gpointer data) +{ + keyboard_reset_chains(); + + return FALSE; /* don't repeat */ +} + void keyboard_reset_chains() { - if (chain_timer) { - timer_stop(chain_timer); - chain_timer = NULL; - } + ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); + if (curpos) { curpos = NULL; grab_keys(TRUE); } } -static void chain_timeout(ObTimer *t, void *data) -{ - keyboard_reset_chains(); -} - gboolean keyboard_bind(GList *keylist, ObAction *action) { KeyBindingTree *tree, *t; @@ -107,65 +115,75 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) void keyboard_interactive_grab(guint state, ObClient *client, ObFrameContext context, ObAction *action) { - if (!interactive_grab && grab_keyboard(TRUE)) { - interactive_grab = TRUE; - grabbed_state = state; - grabbed_client = client; - grabbed_action = action; - grabbed_context = context; - grab_pointer(TRUE, None); + ObInteractiveState *s; + + if (!interactive_states) { + if (!grab_keyboard(TRUE)) + return; + if (!grab_pointer(TRUE, None)) { + grab_keyboard(FALSE); + return; + } } + + s = g_new(ObInteractiveState, 1); + + s->state = state; + s->client = client; + s->action = action; + s->context = context; + + interactive_states = g_slist_append(interactive_states, s); } gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client, ObFrameContext *context) { + GSList *it, *next; gboolean handled = FALSE; gboolean done = FALSE; + gboolean cancel = FALSE; + + for (it = interactive_states; it; it = next) { + ObInteractiveState *s = it->data; - if (interactive_grab) { - *client = grabbed_client; - *context = grabbed_context; + next = g_slist_next(it); + + *client = s->client; + *context = s->context; if ((e->type == KeyRelease && - !(grabbed_state & e->xkey.state))) + !(s->state & e->xkey.state))) done = TRUE; else if (e->type == KeyPress) { if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) done = TRUE; - else if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) { - if (grabbed_action->func == action_cycle_windows) { - grabbed_action->data.cycle.cancel = TRUE; - } - if (grabbed_action->func == action_desktop_dir) { - grabbed_action->data.desktopdir.cancel = TRUE; - } - if (grabbed_action->func == action_send_to_desktop_dir) - { - grabbed_action->data.sendtodir.cancel = TRUE; - } - done = TRUE; - } + else if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) + cancel = done = TRUE; } - if (done) { - if (grabbed_action->func == action_cycle_windows) { - grabbed_action->data.cycle.final = TRUE; + if (done) { + if (s->action->func == action_cycle_windows) { + s->action->data.cycle.cancel = cancel; + s->action->data.cycle.final = TRUE; } - if (grabbed_action->func == action_desktop_dir) { - grabbed_action->data.desktopdir.final = TRUE; + if (s->action->func == action_desktop_dir) { + s->action->data.desktopdir.cancel = cancel; + s->action->data.desktopdir.final = TRUE; } - if (grabbed_action->func == action_send_to_desktop_dir) { - grabbed_action->data.sendtodir.final = TRUE; + if (s->action->func == action_send_to_desktop_dir) { + s->action->data.sendtodir.cancel = cancel; + s->action->data.sendtodir.final = TRUE; } - grabbed_action->func(&grabbed_action->data); + s->action->func(&s->action->data); - interactive_grab = FALSE; grab_keyboard(FALSE); grab_pointer(FALSE, None); keyboard_reset_chains(); + g_free(s); + interactive_states = g_slist_delete_link(interactive_states, it); handled = TRUE; } } @@ -179,6 +197,13 @@ void keyboard_event(ObClient *client, const XEvent *e) g_assert(e->type == KeyPress); + if (e->xkey.keycode == config_keyboard_reset_keycode && + e->xkey.state == config_keyboard_reset_state) + { + keyboard_reset_chains(); + return; + } + if (curpos == NULL) p = keyboard_firstnode; else @@ -187,10 +212,10 @@ void keyboard_event(ObClient *client, const XEvent *e) if (p->key == e->xkey.keycode && p->state == e->xkey.state) { if (p->first_child != NULL) { /* part of a chain */ - if (chain_timer) timer_stop(chain_timer); + ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); /* 5 second timeout for chains */ - chain_timer = timer_start(5000*1000, chain_timeout, - NULL); + ob_main_loop_timeout_add(ob_main_loop, 5 * G_USEC_PER_SEC, + chain_timeout, NULL, NULL); curpos = p; grab_keys(TRUE); } else { @@ -232,10 +257,8 @@ void keyboard_event(ObClient *client, const XEvent *e) if (act->func == action_showmenu) { - act->data.showmenu.x = - e->xkey.x_root; - act->data.showmenu.y = - e->xkey.y_root; + act->data.showmenu.x = e->xkey.x_root; + act->data.showmenu.y = e->xkey.y_root; } act->data.any.c = client;