+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ keyboard.c for the Openbox window manager
+ Copyright (c) 2003 Ben Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "mainloop.h"
#include "focus.h"
#include "screen.h"
#include "keytree.h"
#include "keyboard.h"
#include "translate.h"
+#include "moveresize.h"
#include <glib.h>
}
void keyboard_interactive_grab(guint state, ObClient *client,
- ObFrameContext context, ObAction *action)
+ ObAction *action)
{
ObInteractiveState *s;
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->context = context;
interactive_states = g_slist_append(interactive_states, s);
}
-gboolean keyboard_process_interactive_grab(const XEvent *e,
- ObClient **client,
- ObFrameContext *context)
+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)
{
GSList *it, *next;
gboolean handled = FALSE;
next = g_slist_next(it);
- *client = s->client;
- *context = s->context;
-
if ((e->type == KeyRelease &&
!(s->state & e->xkey.state)))
done = TRUE;
cancel = done = TRUE;
}
if (done) {
- action_run_interactive(s->action, s->client,
- 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();
- }
+ keyboard_interactive_end(s, e->xkey.state, cancel);
handled = TRUE;
- }
+ } else
+ *client = s->client;
}
return handled;
void keyboard_startup(gboolean reconfig)
{
grab_keys(TRUE);
+
+ if (!reconfig)
+ client_add_destructor(keyboard_interactive_end_client);
}
void keyboard_shutdown(gboolean reconfig)
{
GSList *it;
+ if (!reconfig)
+ client_remove_destructor(keyboard_interactive_end_client);
+
tree_destroy(keyboard_firstnode);
keyboard_firstnode = NULL;