grab_for_window(screen_support_win, grab);
for (it = client_list; it; it = g_list_next(it))
- grab_for_window(((ObClient*)it->data)->frame->window, grab);
+ grab_for_window(((ObClient*)it->data)->window, grab);
}
static gboolean chain_timeout(gpointer data)
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
if (!interactive_states) {
if (!grab_keyboard(TRUE))
return;
- if (!grab_pointer(TRUE, None)) {
+ if (!grab_pointer(TRUE, OB_CURSOR_NONE)) {
grab_keyboard(FALSE);
return;
}
s->action->func(&s->action->data);
- grab_keyboard(FALSE);
- grab_pointer(FALSE, None);
- keyboard_reset_chains();
-
g_free(s);
+
interactive_states = g_slist_delete_link(interactive_states, it);
+ if (!interactive_states) {
+ grab_keyboard(FALSE);
+ grab_pointer(FALSE, OB_CURSOR_NONE);
+ keyboard_reset_chains();
+ }
+
handled = TRUE;
}
}
/* 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 {
}
}
-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;
}