X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=ade18d04c6d52a8e72735155e36c811753dff233;hb=acafa38c8ea210b12ed92fc16281b915ab61542c;hp=ccfe04977c755ec23ef29815a6dde78be06bb9be;hpb=a6f52b90551621316a36f7cd7b20ef1d5dca0782;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index ccfe0497..ade18d04 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -17,7 +17,6 @@ See the COPYING file for a copy of the GNU General Public License. */ -#include "mainloop.h" #include "focus.h" #include "screen.h" #include "frame.h" @@ -25,8 +24,7 @@ #include "event.h" #include "grab.h" #include "client.h" -#include "action.h" -#include "prop.h" +#include "actions.h" #include "menuframe.h" #include "config.h" #include "keytree.h" @@ -38,35 +36,28 @@ #include -typedef struct { - guint state; - ObClient *client; - GSList *actions; - ObFrameContext context; -} ObInteractiveState; - KeyBindingTree *keyboard_firstnode = NULL; static ObPopup *popup = NULL; -static GSList *interactive_states; static KeyBindingTree *curpos; static void grab_keys(gboolean grab) { KeyBindingTree *p; - ungrab_all_keys(RootWindow(ob_display, ob_screen)); + ungrab_all_keys(obt_root(ob_screen)); if (grab) { p = curpos ? curpos->first_child : keyboard_firstnode; while (p) { - grab_key(p->key, p->state, RootWindow(ob_display, ob_screen), - GrabModeAsync); + if (p->key) + grab_key(p->key, p->state, obt_root(ob_screen), + GrabModeAsync); p = p->next_sibling; } if (curpos) grab_key(config_keyboard_reset_keycode, config_keyboard_reset_state, - RootWindow(ob_display, ob_screen), GrabModeAsync); + obt_root(ob_screen), GrabModeAsync); } } @@ -78,6 +69,8 @@ static gboolean chain_timeout(gpointer data) static void set_curpos(KeyBindingTree *newpos) { + if (curpos == newpos) return; + grab_keys(FALSE); curpos = newpos; grab_keys(TRUE); @@ -85,6 +78,7 @@ static void set_curpos(KeyBindingTree *newpos) if (curpos != NULL) { gchar *text = NULL; GList *it; + Rect *a; for (it = curpos->keylist; it; it = g_list_next(it)) { gchar *oldtext = text; @@ -95,10 +89,12 @@ static void set_curpos(KeyBindingTree *newpos) g_free(oldtext); } - popup_position(popup, NorthWestGravity, 10, 10); + a = screen_physical_area_primary(); + popup_position(popup, NorthWestGravity, a->x + 10, a->y + 10); /* 1 second delay for the popup to show */ popup_delay_show(popup, G_USEC_PER_SEC, text); g_free(text); + g_free(a); } else { popup_hide(popup); } @@ -118,7 +114,7 @@ void keyboard_reset_chains(gint break_chroots) set_curpos(p); } -void keyboard_unbind_all() +void keyboard_unbind_all(void) { tree_destroy(keyboard_firstnode); keyboard_firstnode = NULL; @@ -137,11 +133,10 @@ void keyboard_chroot(GList *keylist) } } -gboolean keyboard_bind(GList *keylist, ObAction *action) +gboolean keyboard_bind(GList *keylist, ObActionsAct *action) { KeyBindingTree *tree, *t; gboolean conflict; - gboolean mods = TRUE; g_assert(keylist != NULL); g_assert(action != NULL); @@ -162,20 +157,8 @@ 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; - } + /* find the bottom node */ + for (; t->first_child; t = t->first_child); /* set the action */ t->actions = g_slist_append(t->actions, action); @@ -186,106 +169,57 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) return TRUE; } -gboolean keyboard_interactive_grab(guint state, ObClient *client, - ObAction *action) -{ - ObInteractiveState *s; - - g_assert(action->data.any.interactive); - - if (!interactive_states) { - grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER); - if (!grab_keyboard(TRUE)) { - grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); - return FALSE; - } - } - - s = g_new(ObInteractiveState, 1); - - s->state = state; - s->client = client; - s->actions = g_slist_append(NULL, action); - - interactive_states = g_slist_append(interactive_states, s); - - return TRUE; -} - -void keyboard_interactive_end(ObInteractiveState *s, - guint state, gboolean cancel, Time time) -{ - action_run_interactive(s->actions, s->client, state, time, cancel, TRUE); - - g_slist_free(s->actions); - g_free(s); - - interactive_states = g_slist_remove(interactive_states, s); - - if (!interactive_states) { - grab_keyboard(FALSE); - grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); - } -} - -void keyboard_interactive_end_client(ObClient *client, gpointer data) -{ - GSList *it, *next; - - for (it = interactive_states; it; it = next) { - ObInteractiveState *s = it->data; - - next = g_slist_next(it); - - if (s->client == client) - s->client = NULL; - } -} - +#if 0 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; } +#endif void keyboard_event(ObClient *client, const XEvent *e) { KeyBindingTree *p; + if (e->type == KeyRelease) { + grab_key_passive_count(-1); + return; + } + g_assert(e->type == KeyPress); + grab_key_passive_count(1); if (e->xkey.keycode == config_keyboard_reset_keycode && e->xkey.state == config_keyboard_reset_state) { - ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); + obt_main_loop_timeout_remove(ob_main_loop, chain_timeout); keyboard_reset_chains(-1); return; } @@ -303,20 +237,25 @@ void keyboard_event(ObClient *client, const XEvent *e) menu_frame_hide_all(); if (p->first_child != NULL) { /* part of a chain */ - ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); + obt_main_loop_timeout_remove(ob_main_loop, chain_timeout); /* 3 second timeout for chains */ - ob_main_loop_timeout_add(ob_main_loop, 3 * G_USEC_PER_SEC, - chain_timeout, NULL, - g_direct_equal, NULL); + obt_main_loop_timeout_add(ob_main_loop, 3 * G_USEC_PER_SEC, + chain_timeout, NULL, + g_direct_equal, NULL); set_curpos(p); } else if (p->chroot) /* an empty chroot */ set_curpos(p); else { - keyboard_reset_chains(0); + GSList *it; - action_run_key(p->actions, client, e->xkey.state, - e->xkey.x_root, e->xkey.y_root, - e->xkey.time); + for (it = p->actions; it; it = g_slist_next(it)) + if (actions_act_is_interactive(it->data)) break; + if (it == NULL) /* reset if the actions are not interactive */ + keyboard_reset_chains(0); + + actions_run_acts(p->actions, OB_USER_ACTION_KEYBOARD_KEY, + e->xkey.state, e->xkey.x_root, e->xkey.y_root, + 0, OB_FRAME_CONTEXT_NONE, client); } break; } @@ -324,33 +263,58 @@ void keyboard_event(ObClient *client, const XEvent *e) } } -gboolean keyboard_interactively_grabbed() +static void node_rebind(KeyBindingTree *node) { - return !!interactive_states; + if (node->first_child) { + /* find leaf nodes */ + node_rebind(node->first_child); + + /* for internal nodes, add them to the tree if they + are a chroot, but do this after adding their + children */ + if (node->chroot) + keyboard_chroot(node->keylist); + } + else { + /* for leaf nodes, rebind each action assigned to it */ + while (node->actions) { + /* add each action, and remove them from the original tree so + they don't get free'd on us */ + keyboard_bind(node->keylist, node->actions->data); + node->actions = g_slist_delete_link(node->actions, node->actions); + } + + if (node->chroot) + keyboard_chroot(node->keylist); + } + + /* go through each sibling */ + if (node->next_sibling) node_rebind(node->next_sibling); } -void keyboard_startup(gboolean reconfig) +void keyboard_rebind(void) { + KeyBindingTree *old; + + old = keyboard_firstnode; + keyboard_firstnode = NULL; + node_rebind(old); + + tree_destroy(old); + set_curpos(NULL); grab_keys(TRUE); - popup = popup_new(FALSE); +} - if (!reconfig) - client_add_destructor(keyboard_interactive_end_client, NULL); +void keyboard_startup(gboolean reconfig) +{ + grab_keys(TRUE); + popup = popup_new(); + popup_set_text_align(popup, RR_JUSTIFY_CENTER); } void keyboard_shutdown(gboolean reconfig) { - GSList *it; - - if (!reconfig) - client_remove_destructor(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; - - ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); + obt_main_loop_timeout_remove(ob_main_loop, chain_timeout); keyboard_unbind_all(); set_curpos(NULL); @@ -358,4 +322,3 @@ void keyboard_shutdown(gboolean reconfig) popup_free(popup); popup = NULL; } -