/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
keyboard.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
Copyright (c) 2003 Ben Jansens
This program is free software; you can redistribute it and/or modify
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
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;
+ return FALSE;
if (!grab_pointer(TRUE, OB_CURSOR_NONE)) {
grab_keyboard(FALSE);
- return;
+ return FALSE;
}
}
s->actions = g_slist_append(NULL, action);
interactive_states = g_slist_append(interactive_states, s);
+
+ return TRUE;
}
void keyboard_interactive_end(ObInteractiveState *s,
}
}
-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) {
}
}
+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)