-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
keyboard.c for the Openbox window manager
Copyright (c) 2003 Ben Jansens
typedef struct {
guint state;
ObClient *client;
- ObAction *action;
+ GSList *actions;
ObFrameContext context;
} ObInteractiveState;
}
}
+void keyboard_unbind_all()
+{
+ tree_destroy(keyboard_firstnode);
+ keyboard_firstnode = NULL;
+ grab_keys(FALSE);
+ curpos = NULL;
+}
+
gboolean keyboard_bind(GList *keylist, ObAction *action)
{
KeyBindingTree *tree, *t;
g_assert(action->data.any.interactive);
- if (moveresize_in_progress)
- moveresize_end(FALSE);
-
if (!interactive_states) {
if (!grab_keyboard(TRUE))
return;
s->state = state;
s->client = client;
- s->action = action;
+ s->actions = g_slist_append(NULL, action);
interactive_states = g_slist_append(interactive_states, s);
}
void keyboard_interactive_end(ObInteractiveState *s,
guint state, gboolean cancel)
{
- action_run_interactive(s->action, s->client, state, cancel, TRUE);
+ action_run_interactive(s->actions, s->client, state, cancel, TRUE);
+ g_slist_free(s->actions);
g_free(s);
interactive_states = g_slist_remove(interactive_states, s);
next = g_slist_next(it);
if (s->client == c)
- keyboard_interactive_end(s, 0, FALSE);
+ s->client = NULL;
}
}
curpos = p;
grab_keys(TRUE);
} else {
- GSList *it;
-
- for (it = p->actions; it; it = it->next)
- action_run_key(it->data, client, e->xkey.state,
- e->xkey.x_root, e->xkey.y_root);
keyboard_reset_chains();
+
+ action_run_key(p->actions, client, e->xkey.state,
+ e->xkey.x_root, e->xkey.y_root);
}
break;
}
if (!reconfig)
client_remove_destructor(keyboard_interactive_end_client);
- 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;
+
+ keyboard_unbind_all();
}