nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

when the client for an interactive action is closed, kill the action

Browse source
This commit is contained in:
Dana Jansens 2003-09-10 17:21:27 +00:00
parent 3541c60fcb
commit fe2f637e2b
1 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
openbox/keyboard.c
View file

@ -157,6 +157,37 @@ void keyboard_interactive_grab(guint state, ObClient *client,
interactive_states = g_slist_append(interactive_states, s); 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);
g_free(s);
interactive_states = g_slist_remove(interactive_states, s);
if (!interactive_states) {
grab_keyboard(FALSE);
grab_pointer(FALSE, OB_CURSOR_NONE);
keyboard_reset_chains();
}
}
void keyboard_interactive_end_client(gpointer data)
{
GSList *it, *next;
ObClient *c = data;
for (it = interactive_states; it; it = next) {
ObInteractiveState *s = it->data;
next = g_slist_next(it);
if (s->client == c)
keyboard_interactive_end(s, 0, FALSE);
}
}
gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client) gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
{ {
GSList *it, *next; GSList *it, *next;
@ -179,17 +210,7 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
cancel = done = TRUE; cancel = done = TRUE;
} }
if (done) { if (done) {
action_run_interactive(s->action, s->client, keyboard_interactive_end(s, e->xkey.state, cancel);
e->xkey.state, cancel, TRUE);
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; handled = TRUE;
} else } else
@ -246,12 +267,18 @@ void keyboard_event(ObClient *client, const XEvent *e)
void keyboard_startup(gboolean reconfig) void keyboard_startup(gboolean reconfig)
{ {
grab_keys(TRUE); grab_keys(TRUE);
if (!reconfig)
client_add_destructor(keyboard_interactive_end_client);
} }
void keyboard_shutdown(gboolean reconfig) void keyboard_shutdown(gboolean reconfig)
{ {
GSList *it; GSList *it;
if (!reconfig)
client_remove_destructor(keyboard_interactive_end_client);
tree_destroy(keyboard_firstnode); tree_destroy(keyboard_firstnode);
keyboard_firstnode = NULL; keyboard_firstnode = NULL;