istate.active = FALSE;
- if (ungrab) {
+ if (ungrab)
grab_keyboard(FALSE);
- grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
- }
}
static void keyboard_interactive_end_client(ObClient *client, gpointer data)
g_assert(action->data.any.interactive);
if (!istate.active) {
- grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER);
- if (!grab_keyboard(TRUE)) {
- grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
+ if (!grab_keyboard(TRUE))
return FALSE;
- }
} else if (action->func != istate.action->func) {
keyboard_interactive_end(state, FALSE, action->data.any.time, FALSE);
}
gboolean cancel = FALSE;
if (istate.active) {
- if ((e->type == KeyRelease && !(istate.state & e->xkey.state)))
+ if ((e->type == KeyRelease && !(istate.state & e->xkey.state))) {
done = TRUE;
- else if (e->type == KeyPress) {
+ handled = 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))
+ else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
cancel = done = TRUE;
- } else if (e->type == ButtonPress)
- cancel = done = TRUE;
+ handled = TRUE;
+ }
+ } else if (e->type == ButtonPress) {
+ cancel = FALSE;
+ done = TRUE;
+ handled = FALSE;
+ }
- if (done) {
+ if (done)
keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time,TRUE);
- handled = TRUE;
- } else
+ if (handled)
*client = istate.client;
}
if (!reconfig)
client_remove_destructor(keyboard_interactive_end_client);
- keyboard_interactive_end(0, TRUE, 0, TRUE);
+ if (istate.active)
+ keyboard_interactive_end(0, TRUE, 0, TRUE);
ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);