ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
if (curpos) {
+ grab_keys(FALSE);
curpos = NULL;
grab_keys(TRUE);
}
{
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
cancel = done = TRUE;
}
if (done) {
- if (s->action->func == action_cycle_windows) {
- s->action->data.cycle.cancel = cancel;
- s->action->data.cycle.final = TRUE;
- }
- if (s->action->func == action_desktop_dir) {
- s->action->data.desktopdir.cancel = cancel;
- s->action->data.desktopdir.final = TRUE;
- }
- if (s->action->func == action_send_to_desktop_dir) {
- s->action->data.sendtodir.cancel = cancel;
- s->action->data.sendtodir.final = TRUE;
- }
+ g_assert(s->action->data.any.interactive);
+
+ s->action->data.inter.cancel = cancel;
+ s->action->data.inter.final = TRUE;
s->action->func(&s->action->data);
/* 5 second timeout for chains */
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)
- {
+ if (act->func == action_showmenu) {
act->data.showmenu.x = e->xkey.x_root;
act->data.showmenu.y = e->xkey.y_root;
}