/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
keyboard.c for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2006 Mikael Magnusson
+ Copyright (c) 2003-2007 Dana 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
#include "keyboard.h"
#include "translate.h"
#include "moveresize.h"
+#include "gettext.h"
#include <glib.h>
return FALSE;
if ((t = tree_find(tree, &conflict)) != NULL) {
- /* already bound to something, use the existing tree */
+ /* already bound to something, use the existing tree */
tree_destroy(tree);
tree = NULL;
} else
t = tree;
if (conflict) {
- g_warning("conflict with binding");
+ g_message(_("Conflict with key binding in config file"));
tree_destroy(tree);
return FALSE;
}
return TRUE;
}
-void keyboard_interactive_grab(guint state, ObClient *client,
- ObAction *action)
+gboolean keyboard_interactive_grab(guint state, ObClient *client,
+ ObAction *action)
{
ObInteractiveState *s;
if (!interactive_states) {
if (!grab_keyboard(TRUE))
- return;
- if (!grab_pointer(TRUE, OB_CURSOR_NONE)) {
- grab_keyboard(FALSE);
- return;
- }
+ return FALSE;
}
s = g_new(ObInteractiveState, 1);
s->actions = g_slist_append(NULL, action);
interactive_states = g_slist_append(interactive_states, s);
+
+ return TRUE;
}
void keyboard_interactive_end(ObInteractiveState *s,
- guint state, gboolean cancel)
+ guint state, gboolean cancel, Time time)
{
- action_run_interactive(s->actions, s->client, state, cancel, TRUE);
+ action_run_interactive(s->actions, s->client, state, time, cancel, TRUE);
g_slist_free(s->actions);
g_free(s);
if (!interactive_states) {
grab_keyboard(FALSE);
- grab_pointer(FALSE, OB_CURSOR_NONE);
keyboard_reset_chains();
}
}
-void keyboard_interactive_end_client(gpointer data)
+void keyboard_interactive_end_client(ObClient *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)
+ if (s->client == client)
s->client = NULL;
}
}
!(s->state & e->xkey.state)))
done = TRUE;
else if (e->type == KeyPress) {
- if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
+ /*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;
}
if (done) {
- keyboard_interactive_end(s, e->xkey.state, cancel);
+ keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time);
handled = TRUE;
} else
ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
/* 5 second timeout for chains */
ob_main_loop_timeout_add(ob_main_loop, 5 * G_USEC_PER_SEC,
- chain_timeout, NULL, NULL);
+ chain_timeout, NULL,
+ g_direct_equal, NULL);
grab_keys(FALSE);
curpos = p;
grab_keys(TRUE);
keyboard_reset_chains();
action_run_key(p->actions, client, e->xkey.state,
- e->xkey.x_root, e->xkey.y_root);
+ e->xkey.x_root, e->xkey.y_root,
+ e->xkey.time);
}
break;
}
}
}
+gboolean keyboard_interactively_grabbed()
+{
+ return !!interactive_states;
+}
+
void keyboard_startup(gboolean reconfig)
{
grab_keys(TRUE);
if (!reconfig)
- client_add_destructor(keyboard_interactive_end_client);
+ client_add_destructor(keyboard_interactive_end_client, NULL);
}
void keyboard_shutdown(gboolean reconfig)