-#include "../../kernel/focus.h"
-#include "../../kernel/dispatch.h"
-#include "../../kernel/openbox.h"
-#include "../../kernel/grab.h"
-#include "../../kernel/action.h"
+#include "kernel/focus.h"
+#include "kernel/dispatch.h"
+#include "kernel/openbox.h"
+#include "kernel/event.h"
+#include "kernel/grab.h"
+#include "kernel/action.h"
+#include "kernel/parse.h"
+#include "kernel/timer.h"
#include "tree.h"
#include "keyboard.h"
+#include "keyparse.h"
+#include "translate.h"
#include <glib.h>
-KeyBindingTree *firstnode;
+void plugin_setup_config()
+{
+ parse_reg_section("keyboard", keyparse, NULL);
+}
+
+KeyBindingTree *firstnode = NULL;
static KeyBindingTree *curpos;
-static guint reset_key, reset_state;
-static gboolean grabbed;
+static guint reset_key, reset_state, button_return, button_escape;
+static Timer *chain_timer;
-static void grab_keys(gboolean grab)
+static void grab_keys()
{
- if (!grab) {
- ungrab_all_keys();
- } else {
- KeyBindingTree *p = firstnode;
- while (p) {
- grab_key(p->key, p->state, GrabModeSync);
- p = p->next_sibling;
- }
+ KeyBindingTree *p;
+
+ ungrab_all_keys();
+
+ p = curpos ? curpos->first_child : firstnode;
+ while (p) {
+ grab_key(p->key, p->state, GrabModeAsync);
+ p = p->next_sibling;
}
+ if (curpos)
+ grab_key(reset_key, reset_state, GrabModeAsync);
}
static void reset_chains()
{
- /* XXX kill timer */
- curpos = NULL;
- if (grabbed) {
- grabbed = FALSE;
- grab_keyboard(FALSE);
+ if (chain_timer) {
+ timer_stop(chain_timer);
+ chain_timer = NULL;
+ }
+ if (curpos) {
+ curpos = NULL;
+ grab_keys();
}
}
-static gboolean kbind(GList *keylist, Action *action)
+static void chain_timeout(void *data)
+{
+ reset_chains();
+}
+
+gboolean kbind(GList *keylist, Action *action)
{
KeyBindingTree *tree, *t;
gboolean conflict;
g_assert(keylist != NULL);
g_assert(action != NULL);
- if (!(tree = tree_build(keylist))) {
- g_warning("invalid binding");
+ if (!(tree = tree_build(keylist)))
return FALSE;
- }
+
if ((t = tree_find(tree, &conflict)) != NULL) {
- /* already bound to something */
- g_warning("keychain is already bound");
+ /* already bound to something, use the existing tree */
tree_destroy(tree);
- return FALSE;
- }
+ tree = NULL;
+ } else
+ t = tree;
+ while (t->first_child) t = t->first_child;
+
if (conflict) {
- g_warning("conflict with binding");
+ g_message("conflict with binding");
tree_destroy(tree);
return FALSE;
}
- /* grab the server here to make sure no key presses go missed */
- grab_server(TRUE);
- grab_keys(FALSE);
-
/* set the action */
- t = tree;
- while (t->first_child) t = t->first_child;
- t->action = action;
+ t->actions = g_slist_append(t->actions, action);
/* assimilate this built tree into the main tree. assimilation
destroys/uses the tree */
- tree_assimilate(tree);
-
- grab_keys(TRUE);
- grab_server(FALSE);
+ if (tree) tree_assimilate(tree);
return TRUE;
}
-static void press(ObEvent *e, void *foo)
+static void event(ObEvent *e, void *foo)
{
+ static KeyBindingTree *grabbed_key = NULL;
+
+ if (grabbed_key) {
+ gboolean done = FALSE;
+
+ if ((e->type == Event_X_KeyRelease &&
+ !(grabbed_key->state & e->data.x.e->xkey.state)))
+ done = TRUE;
+ else if (e->type == Event_X_KeyPress) {
+ if (e->data.x.e->xkey.keycode == button_return)
+ done = TRUE;
+ else if (e->data.x.e->xkey.keycode == button_escape) {
+ GSList *it;
+ for (it = grabbed_key->actions; it; it = it->next) {
+ Action *act = it->data;
+ act->data.cycle.cancel = TRUE;
+ }
+ done = TRUE;
+ }
+ }
+ if (done) {
+ GSList *it;
+ for (it = grabbed_key->actions; it; it = it->next) {
+ Action *act = it->data;
+ act->data.cycle.final = TRUE;
+ act->func(&act->data);
+ }
+ grabbed_key = NULL;
+ grab_keyboard(FALSE);
+ reset_chains();
+ return;
+ }
+ }
+ if (e->type == Event_X_KeyRelease)
+ return;
+
+ g_assert(e->type == Event_X_KeyPress);
+
if (e->data.x.e->xkey.keycode == reset_key &&
e->data.x.e->xkey.state == reset_state) {
reset_chains();
- XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
} else {
KeyBindingTree *p;
if (curpos == NULL)
if (p->key == e->data.x.e->xkey.keycode &&
p->state == e->data.x.e->xkey.state) {
if (p->first_child != NULL) { /* part of a chain */
- /* XXX TIMER */
- if (!grabbed) {
- grab_keyboard(TRUE);
- grabbed = TRUE;
- XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
- }
+ if (chain_timer) timer_stop(chain_timer);
+ /* 5 second timeout for chains */
+ chain_timer = timer_start(5000*1000, chain_timeout,
+ NULL);
curpos = p;
+ grab_keys();
} else {
- if (p->action->func != NULL) {
- p->action->data.any.c = focus_client;
-
- g_assert(!(p->action->func == action_move ||
- p->action->func == action_resize));
-
- p->action->func(&p->action->data);
+ GSList *it;
+ for (it = p->actions; it; it = it->next) {
+ Action *act = it->data;
+ if (act->func != NULL) {
+ act->data.any.c = focus_client;
+
+ if (act->func == action_cycle_windows) {
+ act->data.cycle.final = FALSE;
+ act->data.cycle.cancel = FALSE;
+ }
+
+ act->func(&act->data);
+
+ if (act->func == action_cycle_windows &&
+ !grabbed_key) {
+ grabbed_key = p;
+ grab_keyboard(TRUE);
+ break;
+ }
+ }
}
- XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
reset_chains();
}
break;
}
}
-static void binddef()
-{
- GList *list = g_list_append(NULL, NULL);
- Action *a;
-
- /* When creating an Action struct, all of the data elements in the
- appropriate struct need to be set, except the Client*, which will be set
- at call-time when then action function is used.
- */
-
- list->data = "A-Right";
- a = action_new(action_next_desktop);
- a->data.nextprevdesktop.wrap = TRUE;
- kbind(list, a);
-
- list->data = "A-Left";
- a = action_new(action_previous_desktop);
- a->data.nextprevdesktop.wrap = TRUE;
- kbind(list, a);
-
- list->data = "A-1";
- a = action_new(action_desktop);
- a->data.desktop.desk = 0;
- kbind(list, a);
-
- list->data = "A-2";
- a = action_new(action_desktop);
- a->data.desktop.desk = 1;
- kbind(list, a);
-
- list->data = "A-3";
- a = action_new(action_desktop);
- a->data.desktop.desk = 2;
- kbind(list, a);
-
- list->data = "A-4";
- a = action_new(action_desktop);
- a->data.desktop.desk = 3;
- kbind(list, a);
-
- list->data = "A-space";
- a = action_new(action_execute);
- a->data.execute.path = g_strdup("xterm");
- kbind(list, a);
-}
-
void plugin_startup()
{
- dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
+ guint i;
+
+ curpos = NULL;
+ chain_timer = NULL;
+
+ dispatch_register(Event_X_KeyPress | Event_X_KeyRelease,
+ (EventHandler)event, NULL);
+
+ translate_key("C-g", &reset_state, &reset_key);
+ translate_key("Escape", &i, &button_escape);
+ translate_key("Return", &i, &button_return);
- /* XXX parse config file! */
- binddef();
+ grab_keys();
}
void plugin_shutdown()
{
- dispatch_register(0, (EventHandler)press, NULL);
+ dispatch_register(0, (EventHandler)event, NULL);
- grab_keys(FALSE);
tree_destroy(firstnode);
firstnode = NULL;
- grab_keys(TRUE);
+ ungrab_all_keys();
}
projects / chaz / openbox / blobdiff