X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=ac92f5f93ddc9290fc1a86ed92b76e224f54213a;hb=780d1b0961e2eed5fea4645b4398fafb4adad73a;hp=d758b3869e29cc8868d7b90a9d13102319d06715;hpb=d59f0d67b0a6f3a7eed2753875691e78c08c632c;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index d758b386..ac92f5f9 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -25,7 +25,7 @@ #include "event.h" #include "grab.h" #include "client.h" -#include "action.h" +#include "actions.h" #include "prop.h" #include "menuframe.h" #include "config.h" @@ -38,16 +38,8 @@ #include -typedef struct { - gboolean active; - guint state; - ObClient *client; - ObAction *action; -} ObInteractiveState; - KeyBindingTree *keyboard_firstnode = NULL; static ObPopup *popup = NULL; -static ObInteractiveState istate; static KeyBindingTree *curpos; static void grab_keys(gboolean grab) @@ -78,15 +70,16 @@ static gboolean chain_timeout(gpointer data) static void set_curpos(KeyBindingTree *newpos) { - if (curpos != newpos) { - grab_keys(FALSE); - curpos = newpos; - grab_keys(TRUE); - } + if (curpos == newpos) return; + + grab_keys(FALSE); + curpos = newpos; + grab_keys(TRUE); if (curpos != NULL) { gchar *text = NULL; GList *it; + Rect *a; for (it = curpos->keylist; it; it = g_list_next(it)) { gchar *oldtext = text; @@ -97,10 +90,12 @@ static void set_curpos(KeyBindingTree *newpos) g_free(oldtext); } - popup_position(popup, NorthWestGravity, 10, 10); + a = screen_physical_area_active(); + 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); } @@ -139,11 +134,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); @@ -164,20 +158,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); @@ -188,50 +170,7 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) return TRUE; } -static void keyboard_interactive_end(guint state, gboolean cancel, Time time, - gboolean ungrab) -{ - GSList *alist; - - g_assert(istate.active); - - /* ungrab first so they won't be NotifyWhileGrabbed */ - if (ungrab) - grab_keyboard(FALSE); - - alist = g_slist_append(NULL, istate.action); - action_run_interactive(alist, istate.client, state, time, cancel, TRUE); - g_slist_free(alist); - - istate.active = FALSE; -} - -static void keyboard_interactive_end_client(ObClient *client, gpointer data) -{ - if (istate.active && istate.client == client) - istate.client = NULL; -} - -gboolean keyboard_interactive_grab(guint state, ObClient *client, - ObAction *action) -{ - g_assert(action->data.any.interactive); - - if (!istate.active) { - if (!grab_keyboard(TRUE)) - return FALSE; - } else if (action->func != istate.action->func) { - keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE); - } - - istate.active = TRUE; - istate.state = state; - istate.client = client; - istate.action = action; - - return TRUE; -} - +#if 0 gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client) { gboolean handled = FALSE; @@ -264,12 +203,19 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **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) @@ -301,11 +247,17 @@ void keyboard_event(ObClient *client, const XEvent *e) } else if (p->chroot) /* an empty chroot */ set_curpos(p); else { - keyboard_reset_chains(0); + GSList *it; + + 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); - action_run_key(p->actions, client, e->xkey.state, - e->xkey.x_root, e->xkey.y_root, - e->xkey.time); + actions_run_acts(p->actions, OB_USER_ACTION_KEYBOARD_KEY, + e->xkey.time, e->xkey.state, + e->xkey.x_root, e->xkey.y_root, + OB_FRAME_CONTEXT_NONE, client); } break; } @@ -313,28 +265,15 @@ void keyboard_event(ObClient *client, const XEvent *e) } } -gboolean keyboard_interactively_grabbed() -{ - return istate.active; -} - void keyboard_startup(gboolean reconfig) { grab_keys(TRUE); popup = popup_new(FALSE); - - if (!reconfig) - client_add_destructor(keyboard_interactive_end_client, NULL); + popup_set_text_align(popup, RR_JUSTIFY_CENTER); } void keyboard_shutdown(gboolean reconfig) { - if (!reconfig) - client_remove_destructor(keyboard_interactive_end_client); - - if (istate.active) - keyboard_interactive_end(0, TRUE, 0, TRUE); - ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); keyboard_unbind_all();