X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=7f930f8f574ca55191cb2347c17a4ffd5a78bad7;hb=b2b8ad92bfbc60392737fe9945e719b238d34933;hp=ed9812401e89d7ca210490e06771b316540e12da;hpb=89fb38e18da8c0723c1b2be36403f016fd4a2b9f;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index ed981240..7f930f8f 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -1,3 +1,22 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + keyboard.c for the Openbox window manager + Copyright (c) 2004 Mikael Magnusson + Copyright (c) 2003 Ben Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "mainloop.h" #include "focus.h" #include "screen.h" @@ -12,6 +31,7 @@ #include "keytree.h" #include "keyboard.h" #include "translate.h" +#include "moveresize.h" #include @@ -20,7 +40,7 @@ KeyBindingTree *keyboard_firstnode; typedef struct { guint state; ObClient *client; - ObAction *action; + GSList *actions; ObFrameContext context; } ObInteractiveState; @@ -58,7 +78,7 @@ static void grab_keys(gboolean grab) 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); + grab_for_window(((ObClient*)it->data)->window, grab); } static gboolean chain_timeout(gpointer data) @@ -79,10 +99,19 @@ void keyboard_reset_chains() } } +void keyboard_unbind_all() +{ + tree_destroy(keyboard_firstnode); + keyboard_firstnode = NULL; + grab_keys(FALSE); + curpos = NULL; +} + gboolean keyboard_bind(GList *keylist, ObAction *action) { KeyBindingTree *tree, *t; gboolean conflict; + gboolean mods = TRUE; g_assert(keylist != NULL); g_assert(action != NULL); @@ -91,12 +120,11 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) return FALSE; if ((t = tree_find(tree, &conflict)) != NULL) { - /* already bound to something, use the existing tree */ + /* 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"); @@ -104,6 +132,21 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) return FALSE; } + /* find if every key in this chain has modifiers, and also find the + bottom node of the tree */ + while (t->first_child) { + if (!t->state) + mods = FALSE; + t = t->first_child; + } + + /* when there are no modifiers in the binding, then the action cannot + be interactive */ + if (!mods && action->data.any.interactive) { + action->data.any.interactive = FALSE; + action->data.inter.final = TRUE; + } + /* set the action */ t->actions = g_slist_append(t->actions, action); /* assimilate this built tree into the main tree. assimilation @@ -113,17 +156,19 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) return TRUE; } -void keyboard_interactive_grab(guint state, ObClient *client, - ObFrameContext context, ObAction *action) +gboolean keyboard_interactive_grab(guint state, ObClient *client, + ObAction *action) { ObInteractiveState *s; + g_assert(action->data.any.interactive); + if (!interactive_states) { if (!grab_keyboard(TRUE)) - return; - if (!grab_pointer(TRUE, None)) { + return FALSE; + if (!grab_pointer(TRUE, OB_CURSOR_NONE)) { grab_keyboard(FALSE); - return; + return FALSE; } } @@ -131,15 +176,45 @@ void keyboard_interactive_grab(guint state, ObClient *client, s->state = state; s->client = client; - s->action = action; - s->context = context; + s->actions = g_slist_append(NULL, action); interactive_states = g_slist_append(interactive_states, s); + + return TRUE; +} + +void keyboard_interactive_end(ObInteractiveState *s, + guint state, gboolean cancel) +{ + action_run_interactive(s->actions, s->client, state, cancel, TRUE); + + g_slist_free(s->actions); + g_free(s); + + interactive_states = g_slist_remove(interactive_states, s); + + if (!interactive_states) { + grab_keyboard(FALSE); + grab_pointer(FALSE, OB_CURSOR_NONE); + keyboard_reset_chains(); + } } -gboolean keyboard_process_interactive_grab(const XEvent *e, - ObClient **client, - ObFrameContext *context) +void keyboard_interactive_end_client(ObClient *client, gpointer data) +{ + GSList *it, *next; + + for (it = interactive_states; it; it = next) { + ObInteractiveState *s = it->data; + + next = g_slist_next(it); + + if (s->client == client) + s->client = NULL; + } +} + +gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client) { GSList *it, *next; gboolean handled = FALSE; @@ -151,34 +226,21 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, 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)) + /*if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) done = TRUE; - else if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) + else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) cancel = done = TRUE; } if (done) { - g_assert(s->action->data.any.interactive); - - s->action->data.inter.cancel = cancel; - s->action->data.inter.final = TRUE; - - s->action->func(&s->action->data); + keyboard_interactive_end(s, e->xkey.state, cancel); - grab_keyboard(FALSE); - grab_pointer(FALSE, None); - keyboard_reset_chains(); - - g_free(s); - interactive_states = g_slist_delete_link(interactive_states, it); handled = TRUE; - } + } else + *client = s->client; } return handled; @@ -203,7 +265,8 @@ void keyboard_event(ObClient *client, const XEvent *e) p = curpos->first_child; while (p) { if (p->key == e->xkey.keycode && - p->state == e->xkey.state) { + p->state == e->xkey.state) + { if (p->first_child != NULL) { /* part of a chain */ ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); /* 5 second timeout for chains */ @@ -213,35 +276,11 @@ void keyboard_event(ObClient *client, const XEvent *e) 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_moveresize) { - screen_pointer_pos(&act->data.moveresize.x, - &act->data.moveresize.y); - } - - if (act->data.any.interactive) { - act->data.inter.cancel = FALSE; - act->data.inter.final = FALSE; - 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(); + + action_run_key(p->actions, client, e->xkey.state, + e->xkey.x_root, e->xkey.y_root); } break; } @@ -249,15 +288,28 @@ void keyboard_event(ObClient *client, const XEvent *e) } } -void keyboard_startup() +void keyboard_startup(gboolean reconfig) { grab_keys(TRUE); + + if (!reconfig) + client_add_destructor(keyboard_interactive_end_client, NULL); } -void keyboard_shutdown() +void keyboard_shutdown(gboolean reconfig) { - tree_destroy(keyboard_firstnode); - keyboard_firstnode = NULL; - grab_keys(FALSE); + GSList *it; + + if (!reconfig) + client_remove_destructor(keyboard_interactive_end_client); + + for (it = interactive_states; it; it = g_slist_next(it)) + g_free(it->data); + g_slist_free(interactive_states); + interactive_states = NULL; + + ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); + + keyboard_unbind_all(); }