-#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/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 "tree.h"
#include "keyboard.h"
-#include "keysrc.h"
+#include "keyparse.h"
#include "translate.h"
#include <glib.h>
void plugin_setup_config()
{
+ parse_reg_section("keyboard", keyparse, NULL);
}
-KeyBindingTree *firstnode;
+KeyBindingTree *firstnode = NULL;
static KeyBindingTree *curpos;
-static guint reset_key, reset_state;
+static guint reset_key, reset_state, button_return, button_escape;
static gboolean grabbed;
static void grab_keys(gboolean grab)
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_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);
+ if (tree) tree_assimilate(tree);
grab_keys(TRUE);
grab_server(FALSE);
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);
+ grab_keyboard(FALSE);
+ grabbed_key = NULL;
+ 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();
}
curpos = p;
} 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) {
+ grab_keyboard(TRUE);
+ grabbed_key = p;
+ }
+ }
}
reset_chains();
void plugin_startup()
{
- dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL);
+ guint i;
- translate_key("C-g", &reset_state, &reset_key);
+ curpos = NULL;
+ grabbed = FALSE;
- keysrc_parse();
+ 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);
}
void plugin_shutdown()
{
- dispatch_register(0, (EventHandler)press, NULL);
+ dispatch_register(0, (EventHandler)event, NULL);
grab_keys(FALSE);
tree_destroy(firstnode);