#include "event.h"
#include "grab.h"
#include "client.h"
-#include "action.h"
+#include "actions.h"
#include "prop.h"
#include "menuframe.h"
#include "config.h"
#include <glib.h>
-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)
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, RootWindow(ob_display, ob_screen),
+ GrabModeAsync);
p = p->next_sibling;
}
if (curpos)
static void set_curpos(KeyBindingTree *newpos)
{
+ 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;
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);
}
set_curpos(p);
}
-void keyboard_unbind_all()
+void keyboard_unbind_all(void)
{
tree_destroy(keyboard_firstnode);
keyboard_firstnode = NULL;
}
}
-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);
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);
return TRUE;
}
-static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
- gboolean ungrab)
-{
- GSList *alist;
-
- g_assert(istate.active);
-
- alist = g_slist_append(NULL, istate.action);
- action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
- g_slist_free(alist);
-
- istate.active = FALSE;
-
- if (ungrab)
- grab_keyboard(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, FALSE, 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;
handled = TRUE;
}
} else if (e->type == ButtonPress) {
- cancel = FALSE;
+ cancel = TRUE;
done = TRUE;
handled = FALSE;
}
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)
} 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.state, e->xkey.x_root, e->xkey.y_root,
+ 0, OB_FRAME_CONTEXT_NONE, client);
}
break;
}
}
}
-gboolean keyboard_interactively_grabbed()
+static void node_rebind(KeyBindingTree *node)
{
- return istate.active;
+ 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)
{
- 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();
popup_free(popup);
popup = NULL;
}
-
projects / dana / openbox.git / blobdiff