From 69c9b6211bbfa0211426a511991502bbacd14672 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 5 Apr 2003 22:03:24 +0000 Subject: [PATCH] add special shit for window cycling, grab the keyboard etc --- plugins/keyboard/keyboard.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index 2233a04a..b2c5debf 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -86,8 +86,22 @@ gboolean kbind(GList *keylist, Action *action) return TRUE; } -static void press(ObEvent *e, void *foo) +static void event(ObEvent *e, void *foo) { + static KeyBindingTree *grabbed_key = NULL; + + if (e->type == Event_X_KeyRelease) { + if (grabbed_key) { + if (!(grabbed_key->state & e->data.x.e->xkey.state)) { + grabbed_key->action->data.cycle.final = TRUE; + grabbed_key->action->func(&grabbed_key->action->data); + grab_keyboard(FALSE); + grabbed_key = FALSE; + } + } + return; + } + if (e->data.x.e->xkey.keycode == reset_key && e->data.x.e->xkey.state == reset_state) { reset_chains(); @@ -116,7 +130,15 @@ static void press(ObEvent *e, void *foo) g_assert(!(p->action->func == action_move || p->action->func == action_resize)); + if (p->action->func == action_cycle_windows) + p->action->data.cycle.final = FALSE; + p->action->func(&p->action->data); + + if (p->action->func == action_cycle_windows) { + grab_keyboard(TRUE); + grabbed_key = p; + } } reset_chains(); @@ -133,14 +155,14 @@ void plugin_startup() curpos = NULL; grabbed = FALSE; - dispatch_register(Event_X_KeyPress, (EventHandler)press, NULL); + dispatch_register(Event_X_KeyPress | Event_X_KeyRelease, (EventHandler)event, NULL); translate_key("C-g", &reset_state, &reset_key); } void plugin_shutdown() { - dispatch_register(0, (EventHandler)press, NULL); + dispatch_register(0, (EventHandler)event, NULL); grab_keys(FALSE); tree_destroy(firstnode); -- 2.39.2