#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 "tree.h"
#include "keyboard.h"
+#include "keysrc.h"
+#include "translate.h"
#include <glib.h>
+void plugin_setup_config()
+{
+}
+
KeyBindingTree *firstnode;
static KeyBindingTree *curpos;
if (grabbed) {
grabbed = FALSE;
grab_keyboard(FALSE);
- }
+ } else
+ XAllowEvents(ob_display, AsyncKeyboard, event_lasttime);
}
-static gboolean kbind(GList *keylist, Action *action)
+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");
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 (!grabbed) {
grab_keyboard(TRUE);
grabbed = TRUE;
- XAllowEvents(ob_display, AsyncKeyboard, CurrentTime);
+ XAllowEvents(ob_display, AsyncKeyboard,
+ event_lasttime);
}
curpos = p;
} else {
p->action->func(&p->action->data);
}
- 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 = "C-Right";
- a = action_new(action_next_desktop);
- a->data.nextprevdesktop.wrap = TRUE;
- kbind(list, a);
-
- list->data = "C-Left";
- a = action_new(action_previous_desktop);
- a->data.nextprevdesktop.wrap = TRUE;
- kbind(list, a);
-
- list->data = "C-1";
- a = action_new(action_desktop);
- a->data.desktop.desk = 0;
- kbind(list, a);
-
- list->data = "C-2";
- a = action_new(action_desktop);
- a->data.desktop.desk = 1;
- kbind(list, a);
-
- list->data = "C-3";
- a = action_new(action_desktop);
- a->data.desktop.desk = 2;
- kbind(list, a);
-
- list->data = "C-4";
- a = action_new(action_desktop);
- a->data.desktop.desk = 3;
- kbind(list, a);
-
- list->data = "C-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);
- /* XXX parse config file! */
- binddef();
+ translate_key("C-g", &reset_state, &reset_key);
+
+ keysrc_parse();
}
void plugin_shutdown()