X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=432599e8245ba68e968664e8e419d3f87a0443a7;hb=ed4d0ca31a9c1c6c815cb87a058bb1d36a0888c1;hp=ccfe04977c755ec23ef29815a6dde78be06bb9be;hpb=a6f52b90551621316a36f7cd7b20ef1d5dca0782;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index ccfe0497..432599e8 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -31,7 +31,6 @@ #include "config.h" #include "keytree.h" #include "keyboard.h" -#include "translate.h" #include "moveresize.h" #include "popup.h" #include "gettext.h" @@ -39,15 +38,15 @@ #include typedef struct { + gboolean active; guint state; ObClient *client; - GSList *actions; - ObFrameContext context; + ObAction *action; } ObInteractiveState; KeyBindingTree *keyboard_firstnode = NULL; static ObPopup *popup = NULL; -static GSList *interactive_states; +static ObInteractiveState istate; static KeyBindingTree *curpos; static void grab_keys(gboolean grab) @@ -78,9 +77,11 @@ static gboolean chain_timeout(gpointer data) static void set_curpos(KeyBindingTree *newpos) { - grab_keys(FALSE); - curpos = newpos; - grab_keys(TRUE); + if (curpos != newpos) { + grab_keys(FALSE); + curpos = newpos; + grab_keys(TRUE); + } if (curpos != NULL) { gchar *text = NULL; @@ -186,91 +187,86 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) return TRUE; } -gboolean keyboard_interactive_grab(guint state, ObClient *client, - ObAction *action) +static void keyboard_interactive_end(guint state, gboolean cancel, Time time, + gboolean ungrab) { - ObInteractiveState *s; + GSList *alist; - g_assert(action->data.any.interactive); + g_assert(istate.active); - if (!interactive_states) { - grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER); - if (!grab_keyboard(TRUE)) { - grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); - return FALSE; - } - } + /* ungrab first so they won't be NotifyWhileGrabbed */ + if (ungrab) + ungrab_keyboard(); - s = g_new(ObInteractiveState, 1); + /* set this before running the actions so they know the keyboard is not + grabbed */ + istate.active = FALSE; - s->state = state; - s->client = client; - s->actions = g_slist_append(NULL, action); - - interactive_states = g_slist_append(interactive_states, s); - - return TRUE; + alist = g_slist_append(NULL, istate.action); + action_run_interactive(alist, istate.client, state, time, cancel, TRUE); + g_slist_free(alist); } -void keyboard_interactive_end(ObInteractiveState *s, - guint state, gboolean cancel, Time time) +static void keyboard_interactive_end_client(ObClient *client, gpointer data) { - action_run_interactive(s->actions, s->client, state, time, cancel, TRUE); - - g_slist_free(s->actions); - g_free(s); + if (istate.active && istate.client == client) + istate.client = NULL; +} - interactive_states = g_slist_remove(interactive_states, s); - if (!interactive_states) { - grab_keyboard(FALSE); - grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); - } +void keyboard_interactive_cancel() +{ + keyboard_interactive_end(0, TRUE, event_curtime, TRUE); } -void keyboard_interactive_end_client(ObClient *client, gpointer data) +gboolean keyboard_interactive_grab(guint state, ObClient *client, + ObAction *action) { - GSList *it, *next; + g_assert(action->data.any.interactive); - for (it = interactive_states; it; it = next) { - ObInteractiveState *s = it->data; + if (!istate.active) { + if (!grab_keyboard()) + return FALSE; + } else if (action->func != istate.action->func) { + keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE); + } - next = g_slist_next(it); + istate.active = TRUE; + istate.state = state; + istate.client = client; + istate.action = action; - if (s->client == client) - s->client = NULL; - } + return TRUE; } gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client) { - GSList *it, *next; gboolean handled = FALSE; gboolean done = FALSE; gboolean cancel = FALSE; - for (it = interactive_states; it; it = next) { - ObInteractiveState *s = it->data; - - next = g_slist_next(it); - - if ((e->type == KeyRelease && - !(s->state & e->xkey.state))) + if (istate.active) { + if ((e->type == KeyRelease && !(istate.state & e->xkey.state))) { done = TRUE; - else if (e->type == KeyPress) { + handled = 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)) - cancel = done = TRUE; - } else if (e->type == ButtonPress) - cancel = done = TRUE; + done = TRUE; + else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) { + cancel = done = TRUE; + handled = TRUE; + } + } else if (e->type == ButtonPress) { + cancel = TRUE; + done = TRUE; + handled = FALSE; + } - if (done) { - keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time); + if (done) + keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time,TRUE); - handled = TRUE; - } else - *client = s->client; + if (handled) + *client = istate.client; } return handled; @@ -296,7 +292,16 @@ 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) + /* tricksy. + if you have Super_L and Super_R bound to different modXmasks, + this makes either mod mask count as Super + + e.g. Super_L is mod1 and Super_R is mod2, so.. + p->state = 00011 + key state is just Super_L so 00001 + 00011 | 00001 == 00011 == p->state + */ + (p->state | e->xkey.state) == p->state) { /* if we hit a key binding, then close any open menus and run it */ if (menu_frame_visible) @@ -314,6 +319,14 @@ void keyboard_event(ObClient *client, const XEvent *e) else { keyboard_reset_chains(0); + /* If we don't have the keyboard grabbed, then ungrab it with + XUngrabKeyboard, so that there is not a passive grab left + on from the KeyPress. If the grab is left on, and focus + moves during that time, it will be NotifyWhileGrabbed, and + applications like to ignore those! */ + if (!keyboard_interactively_grabbed()) + XUngrabKeyboard(ob_display, e->xkey.time); + action_run_key(p->actions, client, e->xkey.state, e->xkey.x_root, e->xkey.y_root, e->xkey.time); @@ -326,7 +339,7 @@ void keyboard_event(ObClient *client, const XEvent *e) gboolean keyboard_interactively_grabbed() { - return !!interactive_states; + return istate.active; } void keyboard_startup(gboolean reconfig) @@ -335,20 +348,16 @@ void keyboard_startup(gboolean reconfig) popup = popup_new(FALSE); if (!reconfig) - client_add_destructor(keyboard_interactive_end_client, NULL); + client_add_destroy_notify(keyboard_interactive_end_client, NULL); } void keyboard_shutdown(gboolean reconfig) { - GSList *it; - if (!reconfig) - client_remove_destructor(keyboard_interactive_end_client); + client_remove_destroy_notify(keyboard_interactive_end_client); - for (it = interactive_states; it; it = g_slist_next(it)) - g_free(it->data); - g_slist_free(interactive_states); - interactive_states = NULL; + if (istate.active) + keyboard_interactive_cancel(); ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);