X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Fkeyboard.c;h=4fa6a8ed4d51ab00d36ee8a550d4beca612d6e52;hb=84a4e2ba2235af92b2a9765347fd2b62f3a36303;hp=4a090dc3d3742c66a889c5c073ad0cdce0715d2a;hpb=739c958ac58154f8b1896113701e1c7f580d4cde;p=chaz%2Fopenbox diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index 4a090dc3..4fa6a8ed 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -1,10 +1,10 @@ #include "../../kernel/focus.h" #include "../../kernel/dispatch.h" #include "../../kernel/openbox.h" +#include "../../kernel/grab.h" #include "../../kernel/action.h" #include "tree.h" #include "keyboard.h" -#include "keyaction.h" #include KeyBindingTree *firstnode; @@ -16,12 +16,11 @@ static gboolean grabbed; static void grab_keys(gboolean grab) { if (!grab) { - XUngrabKey(ob_display, AnyKey, AnyModifier, ob_root); + ungrab_all_keys(); } else { KeyBindingTree *p = firstnode; while (p) { - XGrabKey(ob_display, p->key, p->state, ob_root, FALSE, - GrabModeAsync, GrabModeSync); + grab_key(p->key, p->state, GrabModeSync); p = p->next_sibling; } } @@ -33,63 +32,48 @@ static void reset_chains() curpos = NULL; if (grabbed) { grabbed = FALSE; - XUngrabKeyboard(ob_display, CurrentTime); + grab_keyboard(FALSE); } } -static void clearall() -{ - grab_keys(FALSE); - tree_destroy(firstnode); - firstnode = NULL; - grab_keys(TRUE); -} - -static gboolean bind(GList *keylist, KeyAction *action) +static 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"); return FALSE; } - - t = tree_find(tree, &conflict); - if (conflict) { - g_warning("conflict with binding"); + if ((t = tree_find(tree, &conflict)) != NULL) { + /* already bound to something */ + g_warning("keychain is already bound"); tree_destroy(tree); return FALSE; } - if (t != NULL) { - /* already bound to something */ - g_warning("keychain is already bound"); + if (conflict) { + g_warning("conflict with binding"); tree_destroy(tree); return FALSE; } - /* grab the server here to make sure no key pressed go missed */ - XGrabServer(ob_display); - XSync(ob_display, FALSE); - + /* grab the server here to make sure no key presses go missed */ + grab_server(TRUE); grab_keys(FALSE); - /* set the function */ + /* set the action */ t = tree; while (t->first_child) t = t->first_child; - t->action.action = action->action; - t->action.type[0] = action->type[0]; - t->action.type[1] = action->type[1]; - t->action.data[0] = action->data[0]; - t->action.data[1] = action->data[1]; - - /* assimilate this built tree into the main tree */ - tree_assimilate(tree); /* assimilation destroys/uses the tree */ + t->action = action; + /* assimilate this built tree into the main tree. assimilation + destroys/uses the tree */ + tree_assimilate(tree); grab_keys(TRUE); - - XUngrabServer(ob_display); - XFlush(ob_display); + grab_server(FALSE); return TRUE; } @@ -112,17 +96,20 @@ static void press(ObEvent *e, void *foo) if (p->first_child != NULL) { /* part of a chain */ /* XXX TIMER */ if (!grabbed) { - /*grab should never fail because we should have a - sync grab at this point */ - XGrabKeyboard(ob_display, ob_root, 0, - GrabModeAsync, GrabModeSync, - CurrentTime); + grab_keyboard(TRUE); + grabbed = TRUE; + XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); } - grabbed = TRUE; curpos = p; - XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); } else { - keyaction_do(&p->action, focus_client); + 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); + } XAllowEvents(ob_display, AsyncKeyboard, CurrentTime); reset_chains(); @@ -137,49 +124,52 @@ static void press(ObEvent *e, void *foo) static void binddef() { GList *list = g_list_append(NULL, NULL); - KeyAction a; - - list->data = "C-Right"; - a.action = Action_NextDesktop; - keyaction_set_bool(&a, 0, TRUE); - keyaction_set_none(&a, 1); - bind(list, &a); - - list->data = "C-Left"; - a.action = Action_PreviousDesktop; - keyaction_set_bool(&a, 0, TRUE); - keyaction_set_none(&a, 1); - bind(list, &a); - - list->data = "C-1"; - a.action = Action_Desktop; - keyaction_set_uint(&a, 0, 0); - keyaction_set_none(&a, 1); - bind(list, &a); - - list->data = "C-2"; - a.action = Action_Desktop; - keyaction_set_uint(&a, 0, 1); - keyaction_set_none(&a, 1); - bind(list, &a); - - list->data = "C-3"; - a.action = Action_Desktop; - keyaction_set_uint(&a, 0, 2); - keyaction_set_none(&a, 1); - bind(list, &a); - - list->data = "C-4"; - a.action = Action_Desktop; - keyaction_set_uint(&a, 0, 3); - keyaction_set_none(&a, 1); - bind(list, &a); - - list->data = "C-space"; - a.action = Action_Execute; - keyaction_set_string(&a, 0, "xterm"); - keyaction_set_none(&a, 1); - bind(list, &a); + 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); + + list->data = "C-A-Escape"; + a = action_new(action_execute); + a->data.execute.path = g_strdup("xlock -nolock -mode puzzle"); + kbind(list, a); } void plugin_startup() @@ -193,6 +183,10 @@ void plugin_startup() void plugin_shutdown() { dispatch_register(0, (EventHandler)press, NULL); - clearall(); + + grab_keys(FALSE); + tree_destroy(firstnode); + firstnode = NULL; + grab_keys(TRUE); }