X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=42eea890b2fea4add7c442baf05b55324ea8c5a5;hb=43fded6a10351a8f9f99344a102d79ece6afe8a8;hp=70ac3ffcfd0038b64d3075ecf86ce7493affc137;hpb=ad44e8a708b6836c9d84be7205457cfa82800a65;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index 70ac3ffc..42eea890 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -1,297 +1,289 @@ #include "focus.h" +#include "screen.h" +#include "frame.h" #include "openbox.h" +#include "event.h" +#include "grab.h" +#include "client.h" +#include "action.h" +#include "prop.h" +#include "timer.h" +#include "config.h" +#include "keytree.h" #include "keyboard.h" -#include "clientwrap.h" +#include "translate.h" -#include #include -#ifdef HAVE_STRING_H -# include -#endif -typedef struct KeyBindingTree { - guint state; - guint key; - GList *keylist; - PyObject *func; - - /* the next binding in the tree at the same level */ - struct KeyBindingTree *next_sibling; - /* the first child of this binding (next binding in a chained sequence).*/ - struct KeyBindingTree *first_child; -} KeyBindingTree; - - -static KeyBindingTree *firstnode, *curpos; -static guint reset_key, reset_state; -static gboolean grabbed, user_grabbed; -static PyObject *grab_func; - -/*************************************************************************** - - Define the type 'KeyboardData' +KeyBindingTree *keyboard_firstnode; - ***************************************************************************/ - -typedef struct KeyboardData { - PyObject_HEAD - PyObject *keychain; +typedef struct { guint state; - guint keycode; - gboolean press; -} KeyboardData; + ObClient *client; + ObAction *action; + ObFrameContext context; +} ObInteractiveState; -staticforward PyTypeObject KeyboardDataType; +static GSList *interactive_states; -/*************************************************************************** - - Type methods/struct - - ***************************************************************************/ +static KeyBindingTree *curpos; +static ObTimer *chain_timer; -static PyObject *keybdata_new(PyObject *keychain, guint state, - guint keycode, gboolean press) +static void grab_for_window(Window win, gboolean grab) { - KeyboardData *data = PyObject_New(KeyboardData, &KeyboardDataType); - data->keychain = keychain; - Py_INCREF(keychain); - data->state = state; - data->keycode = keycode; - data->press = press; - return (PyObject*) data; + KeyBindingTree *p; + + ungrab_all_keys(win); + + if (grab) { + p = curpos ? curpos->first_child : keyboard_firstnode; + while (p) { + grab_key(p->key, p->state, win, GrabModeAsync); + p = p->next_sibling; + } + if (curpos) + grab_key(config_keyboard_reset_keycode, + config_keyboard_reset_state, + win, GrabModeAsync); + } } -static void keybdata_dealloc(KeyboardData *self) +void keyboard_grab_for_client(ObClient *c, gboolean grab) { - Py_DECREF(self->keychain); - PyObject_Del((PyObject*)self); + grab_for_window(c->window, grab); } -static PyObject *keybdata_getattr(KeyboardData *self, char *name) +static void grab_keys(gboolean grab) { - if (!strcmp(name, "keychain")) { - Py_INCREF(self->keychain); - return self->keychain; - } else if (!strcmp(name, "state")) - return PyInt_FromLong(self->state); - else if (!strcmp(name, "keycode")) - return PyInt_FromLong(self->keycode); - else if (!strcmp(name, "press")) - return PyInt_FromLong(!!self->press); - - PyErr_Format(PyExc_AttributeError, "no such attribute '%s'", name); - return NULL; + GList *it; + + grab_for_window(screen_support_win, grab); + for (it = client_list; it; it = g_list_next(it)) + grab_for_window(((ObClient*)it->data)->frame->window, grab); } -static PyTypeObject KeyboardDataType = { - PyObject_HEAD_INIT(NULL) - 0, - "KeyboardData", - sizeof(KeyboardData), - 0, - (destructor) keybdata_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - (getattrfunc) keybdata_getattr, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - 0, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ -}; - -/***************************************************************************/ - - - -static gboolean grab_keyboard(gboolean grab) +void keyboard_reset_chains() { - gboolean ret = TRUE; - - g_message("grab_keyboard(%s). grabbed: %d", (grab?"True":"False"),grabbed); - - user_grabbed = grab; - if (!grabbed) { - if (grab) - ret = XGrabKeyboard(ob_display, ob_root, 0, GrabModeAsync, - GrabModeAsync, CurrentTime) == GrabSuccess; - else - XUngrabKeyboard(ob_display, CurrentTime); + if (chain_timer) { + timer_stop(chain_timer); + chain_timer = NULL; + } + if (curpos) { + curpos = NULL; + grab_keys(TRUE); } - return ret; } -/*************************************************************************** - - Define the type 'Keyboard' - - ***************************************************************************/ - -#define IS_KEYBOARD(v) ((v)->ob_type == &KeyboardType) -#define CHECK_KEYBOARD(self, funcname) { \ - if (!IS_KEYBOARD(self)) { \ - PyErr_SetString(PyExc_TypeError, \ - "descriptor '" funcname "' requires a 'Keyboard' " \ - "object"); \ - return NULL; \ - } \ +static void chain_timeout(ObTimer *t, void *data) +{ + keyboard_reset_chains(); } -typedef struct Keyboard { - PyObject_HEAD -} Keyboard; - -staticforward PyTypeObject KeyboardType; +gboolean keyboard_bind(GList *keylist, ObAction *action) +{ + KeyBindingTree *tree, *t; + gboolean conflict; + + g_assert(keylist != NULL); + g_assert(action != NULL); + + if (!(tree = tree_build(keylist))) + return FALSE; + + if ((t = tree_find(tree, &conflict)) != NULL) { + /* already bound to something, use the existing tree */ + tree_destroy(tree); + tree = NULL; + } else + t = tree; + while (t->first_child) t = t->first_child; + + if (conflict) { + g_warning("conflict with binding"); + tree_destroy(tree); + return FALSE; + } + /* set the action */ + t->actions = g_slist_append(t->actions, action); + /* assimilate this built tree into the main tree. assimilation + destroys/uses the tree */ + if (tree) tree_assimilate(tree); -static PyObject *keyb_clearBinds(Keyboard *self, PyObject *args) -{ - CHECK_KEYBOARD(self, "clearBinds"); - if (!PyArg_ParseTuple(args, ":clearBinds")) - return NULL; - clearall(); - Py_INCREF(Py_None); - return Py_None; + return TRUE; } -static PyObject *keyb_grab(Keyboard *self, PyObject *args) +void keyboard_interactive_grab(guint state, ObClient *client, + ObFrameContext context, ObAction *action) { - PyObject *func; - - CHECK_KEYBOARD(self, "grab"); - if (!PyArg_ParseTuple(args, "O:grab", &func)) - return NULL; - if (!PyCallable_Check(func)) { - PyErr_SetString(PyExc_ValueError, "expected a callable object"); - return NULL; + ObInteractiveState *s; + + if (!interactive_states) { + if (!grab_keyboard(TRUE)) + return; + if (!grab_pointer(TRUE, None)) { + grab_keyboard(FALSE); + return; + } } - if (!grab_keyboard(TRUE)) { - PyErr_SetString(PyExc_RuntimeError, "failed to grab keyboard"); - return NULL; - } - grab_func = func; - Py_INCREF(grab_func); - Py_INCREF(Py_None); - return Py_None; -} -static PyObject *keyb_ungrab(Keyboard *self, PyObject *args) -{ - CHECK_KEYBOARD(self, "ungrab"); - if (!PyArg_ParseTuple(args, ":ungrab")) - return NULL; - grab_keyboard(FALSE); - Py_XDECREF(grab_func); - grab_func = NULL; - Py_INCREF(Py_None); - return Py_None; -} + s = g_new(ObInteractiveState, 1); -#define METH(n, d) {#n, (PyCFunction)keyb_##n, METH_VARARGS, #d} - -static PyMethodDef KeyboardMethods[] = { - METH(bind, - "bind(keychain, func)\n\n" - "Binds a key-chain to a function. The keychain is a tuple of strings " - "which define a chain of key presses. Each member of the tuple has " - "the format [Modifier-]...[Key]. Modifiers can be 'mod1', 'mod2', " - "'mod3', 'mod4', 'mod5', 'control', and 'shift'. The keys on your " - "keyboard that are bound to each of these modifiers can be found by " - "running 'xmodmap'. The Key can be any valid key definition. Key " - "definitions can be found by running 'xev', pressing the key while " - "its window is focused, and watching its output. Here are some " - "examples of valid keychains: ('a'), ('F7'), ('control-a', 'd'), " - "('control-mod1-x', 'control-mod4-g'), ('F1', 'space'). The func " - "must have a definition similar to 'def func(keydata, client)'. A " - "keychain cannot be bound to more than one function."), - METH(clearBinds, - "clearBinds()\n\n" - "Removes all bindings that were previously made by bind()."), - METH(grab, - "grab(func)\n\n" - "Grabs the entire keyboard, causing all possible keyboard events to " - "be passed to the given function. CAUTION: Be sure when you grab() " - "that you also have an ungrab() that will execute, or you will not " - "be able to type until you restart Openbox. The func must have a " - "definition similar to 'def func(keydata)'. The keyboard cannot be " - "grabbed if it is already grabbed."), - METH(ungrab, - "ungrab()\n\n" - "Ungrabs the keyboard. The keyboard cannot be ungrabbed if it is not " - "grabbed."), - { NULL, NULL, 0, NULL } -}; - -/*************************************************************************** - - Type methods/struct - - ***************************************************************************/ - -static void keyb_dealloc(PyObject *self) -{ - PyObject_Del(self); -} + s->state = state; + s->client = client; + s->action = action; + s->context = context; -static PyTypeObject KeyboardType = { - PyObject_HEAD_INIT(NULL) - 0, - "Keyboard", - sizeof(Keyboard), - 0, - (destructor) keyb_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - 0, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ -}; - -/**************************************************************************/ + interactive_states = g_slist_append(interactive_states, s); +} -void keyboard_startup() +gboolean keyboard_process_interactive_grab(const XEvent *e, + ObClient **client, + ObFrameContext *context) { - PyObject *input, *inputdict, *ptr; - gboolean b; + GSList *it, *next; + gboolean handled = FALSE; + gboolean done = FALSE; + gboolean cancel = FALSE; + + for (it = interactive_states; it; it = next) { + ObInteractiveState *s = it->data; + + next = g_slist_next(it); + + *client = s->client; + *context = s->context; + + if ((e->type == KeyRelease && + !(s->state & e->xkey.state))) + done = TRUE; + else if (e->type == KeyPress) { + if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) + done = TRUE; + else if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) + cancel = done = TRUE; + } + if (done) { + if (s->action->func == action_cycle_windows) { + s->action->data.cycle.cancel = cancel; + s->action->data.cycle.final = TRUE; + } + if (s->action->func == action_desktop_dir) { + s->action->data.desktopdir.cancel = cancel; + s->action->data.desktopdir.final = TRUE; + } + if (s->action->func == action_send_to_desktop_dir) { + s->action->data.sendtodir.cancel = cancel; + s->action->data.sendtodir.final = TRUE; + } + + s->action->func(&s->action->data); + + grab_keyboard(FALSE); + grab_pointer(FALSE, None); + keyboard_reset_chains(); + + g_free(s); + interactive_states = g_slist_delete_link(interactive_states, it); + handled = TRUE; + } + } - curpos = firstnode = NULL; - grabbed = user_grabbed = FALSE; + return handled; +} - b = translate("C-G", &reset_state, &reset_key); - g_assert(b); +void keyboard_event(ObClient *client, const XEvent *e) +{ + KeyBindingTree *p; - KeyboardType.ob_type = &PyType_Type; - KeyboardType.tp_methods = KeyboardMethods; - PyType_Ready(&KeyboardType); - PyType_Ready(&KeyboardDataType); + g_assert(e->type == KeyPress); - /* get the input module/dict */ - input = PyImport_ImportModule("input"); /* new */ - g_assert(input != NULL); - inputdict = PyModule_GetDict(input); /* borrowed */ - g_assert(inputdict != NULL); + if (e->xkey.keycode == config_keyboard_reset_keycode && + e->xkey.state == config_keyboard_reset_state) + { + keyboard_reset_chains(); + return; + } - /* add a Keyboard instance to the input module */ - ptr = (PyObject*) PyObject_New(Keyboard, &KeyboardType); - PyDict_SetItemString(inputdict, "Keyboard", ptr); - Py_DECREF(ptr); + if (curpos == NULL) + p = keyboard_firstnode; + else + p = curpos->first_child; + while (p) { + if (p->key == e->xkey.keycode && + p->state == e->xkey.state) { + if (p->first_child != NULL) { /* part of a chain */ + 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(TRUE); + } else { + GSList *it; + for (it = p->actions; it; it = it->next) { + ObAction *act = it->data; + if (act->func != NULL) { + act->data.any.c = client; + + if (act->func == action_cycle_windows) + { + act->data.cycle.final = FALSE; + act->data.cycle.cancel = FALSE; + } + if (act->func == action_desktop_dir) + { + act->data.desktopdir.final = FALSE; + act->data.desktopdir.cancel = FALSE; + } + if (act->func == action_send_to_desktop_dir) + { + act->data.sendtodir.final = FALSE; + act->data.sendtodir.cancel = FALSE; + } + + if (act->func == action_moveresize) + { + screen_pointer_pos(&act->data.moveresize.x, + &act->data.moveresize.y); + } + + if ((act->func == action_cycle_windows || + act->func == action_desktop_dir || + act->func == action_send_to_desktop_dir)) + { + keyboard_interactive_grab(e->xkey.state, client, + 0, act); + } + + if (act->func == action_showmenu) + { + act->data.showmenu.x = e->xkey.x_root; + act->data.showmenu.y = e->xkey.y_root; + } + + act->data.any.c = client; + act->func(&act->data); + } + } + + keyboard_reset_chains(); + } + break; + } + p = p->next_sibling; + } +} - Py_DECREF(input); +void keyboard_startup() +{ + grab_keys(TRUE); } void keyboard_shutdown() { - if (grabbed || user_grabbed) { - grabbed = FALSE; - grab_keyboard(FALSE); - } + tree_destroy(keyboard_firstnode); + keyboard_firstnode = NULL; grab_keys(FALSE); - destroytree(firstnode); - firstnode = NULL; }