+/* -*- 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 "frame.h"
#include "client.h"
#include "action.h"
#include "prop.h"
-#include "timer.h"
#include "config.h"
#include "keytree.h"
#include "keyboard.h"
#include "translate.h"
+#include "moveresize.h"
#include <glib.h>
static GSList *interactive_states;
static KeyBindingTree *curpos;
-static ObTimer *chain_timer;
static void grab_for_window(Window win, gboolean grab)
{
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)
+{
+ keyboard_reset_chains();
+
+ return FALSE; /* don't repeat */
}
void keyboard_reset_chains()
{
- if (chain_timer) {
- timer_stop(chain_timer);
- chain_timer = NULL;
- }
+ ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+
if (curpos) {
+ grab_keys(FALSE);
curpos = NULL;
grab_keys(TRUE);
}
}
-static void chain_timeout(ObTimer *t, void *data)
-{
- keyboard_reset_chains();
-}
-
gboolean keyboard_bind(GList *keylist, ObAction *action)
{
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
}
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;
- if (!grab_pointer(TRUE, None)) {
+ if (!grab_pointer(TRUE, OB_CURSOR_NONE)) {
grab_keyboard(FALSE);
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) {
- if (s->action->func == action_cycle_windows) {
- s->action->data.cycle.cancel = cancel;
- s->action->data.cycle.final = TRUE;
- }
- if (s->action->func == action_desktop_dir) {
- s->action->data.desktopdir.cancel = cancel;
- s->action->data.desktopdir.final = TRUE;
- }
- if (s->action->func == action_send_to_desktop_dir) {
- s->action->data.sendtodir.cancel = cancel;
- s->action->data.sendtodir.final = TRUE;
- }
-
- s->action->func(&s->action->data);
-
- grab_keyboard(FALSE);
- grab_pointer(FALSE, None);
- keyboard_reset_chains();
+ keyboard_interactive_end(s, e->xkey.state, cancel);
- g_free(s);
- interactive_states = g_slist_delete_link(interactive_states, it);
handled = TRUE;
- }
+ } else
+ *client = s->client;
}
return handled;
p = curpos->first_child;
while (p) {
if (p->key == e->xkey.keycode &&
- p->state == e->xkey.state) {
+ p->state == e->xkey.state)
+ {
if (p->first_child != NULL) { /* part of a chain */
- if (chain_timer) timer_stop(chain_timer);
+ ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
/* 5 second timeout for chains */
- chain_timer = timer_start(5000*1000, chain_timeout,
- NULL);
+ 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 {
GSList *it;
- for (it = p->actions; it; it = it->next) {
- ObAction *act = it->data;
- if (act->func != NULL) {
- act->data.any.c = client;
-
- if (act->func == action_cycle_windows)
- {
- act->data.cycle.final = FALSE;
- act->data.cycle.cancel = FALSE;
- }
- if (act->func == action_desktop_dir)
- {
- act->data.desktopdir.final = FALSE;
- act->data.desktopdir.cancel = FALSE;
- }
- if (act->func == action_send_to_desktop_dir)
- {
- act->data.sendtodir.final = FALSE;
- act->data.sendtodir.cancel = FALSE;
- }
-
- if (act->func == action_moveresize)
- {
- screen_pointer_pos(&act->data.moveresize.x,
- &act->data.moveresize.y);
- }
-
- if ((act->func == action_cycle_windows ||
- act->func == action_desktop_dir ||
- act->func == action_send_to_desktop_dir))
- {
- keyboard_interactive_grab(e->xkey.state, client,
- 0, act);
- }
-
- if (act->func == action_showmenu)
- {
- act->data.showmenu.x = e->xkey.x_root;
- act->data.showmenu.y = e->xkey.y_root;
- }
-
- act->data.any.c = client;
- act->func(&act->data);
- }
- }
+
+ 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();
}
}
}
-void keyboard_startup()
+void keyboard_startup(gboolean reconfig)
{
grab_keys(TRUE);
+
+ if (!reconfig)
+ client_add_destructor(keyboard_interactive_end_client);
}
-void keyboard_shutdown()
+void keyboard_shutdown(gboolean reconfig)
{
+ GSList *it;
+
+ 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;
}
projects / chaz / openbox / blobdiff