+#include "mainloop.h"
#include "focus.h"
#include "screen.h"
#include "frame.h"
#include "client.h"
#include "action.h"
#include "prop.h"
-#include "timer.h"
#include "config.h"
#include "keytree.h"
#include "keyboard.h"
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)
{
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) {
+ grab_keys(FALSE);
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;
gboolean conflict;
+ gboolean mods = TRUE;
g_assert(keylist != NULL);
g_assert(action != NULL);
tree = NULL;
} else
t = tree;
- while (t->first_child) t = t->first_child;
if (conflict) {
g_warning("conflict with binding");
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;
+ }
+
/* set the action */
t->actions = g_slist_append(t->actions, action);
/* assimilate this built tree into the main tree. assimilation
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;
- if (interactive_grab) {
- *client = grabbed_client;
- *context = grabbed_context;
+ for (it = interactive_states; it; it = next) {
+ ObInteractiveState *s = it->data;
+
+ 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 (grabbed_action->func == action_desktop_dir) {
- grabbed_action->data.desktopdir.final = TRUE;
- }
- if (grabbed_action->func == action_send_to_desktop_dir) {
- grabbed_action->data.sendtodir.final = TRUE;
- }
+ if (done) {
+ g_assert(s->action->data.any.interactive);
+
+ s->action->data.inter.cancel = cancel;
+ s->action->data.inter.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;
}
}
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);
+ grab_keys(FALSE);
curpos = p;
grab_keys(TRUE);
} else {
if (act->func != NULL) {
act->data.any.c = client;
- if (act->func == action_cycle_windows)
- {
- act->data.cycle.final = FALSE;
- act->data.cycle.cancel = FALSE;
- }
- if (act->func == action_desktop_dir)
- {
- act->data.desktopdir.final = FALSE;
- act->data.desktopdir.cancel = FALSE;
- }
- if (act->func == action_send_to_desktop_dir)
- {
- act->data.sendtodir.final = FALSE;
- act->data.sendtodir.cancel = FALSE;
- }
-
- if (act->func == action_moveresize)
- {
+ if (act->func == action_moveresize) {
screen_pointer_pos(&act->data.moveresize.x,
&act->data.moveresize.y);
}
- if ((act->func == action_cycle_windows ||
- act->func == action_desktop_dir ||
- act->func == action_send_to_desktop_dir))
- {
+ if (act->data.any.interactive) {
+ act->data.inter.cancel = FALSE;
+ act->data.inter.final = FALSE;
keyboard_interactive_grab(e->xkey.state, client,
0, act);
}
- if (act->func == action_showmenu)
- {
- act->data.showmenu.x =
- e->xkey.x_root;
- act->data.showmenu.y =
- e->xkey.y_root;
+ if (act->func == action_showmenu) {
+ act->data.showmenu.x = e->xkey.x_root;
+ act->data.showmenu.y = e->xkey.y_root;
}
act->data.any.c = client;
}
}
-void keyboard_startup()
+void keyboard_startup(gboolean reconfig)
{
grab_keys(TRUE);
}
-void keyboard_shutdown()
+void keyboard_shutdown(gboolean reconfig)
{
+ GSList *it;
+
tree_destroy(keyboard_firstnode);
keyboard_firstnode = NULL;
+
+ 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);
grab_keys(FALSE);
+ curpos = NULL;
}
projects / chaz / openbox / blobdiff