X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=71164ac34d2aa122eb613e31a37b1d33d3f4ba79;hb=d0013c0861e29433de10a849032382534c8e1659;hp=d044ba5c10b9866e9a60297aa20c65b6317d2c99;hpb=3fcba81510c98ac517afbab0ba60ced3d30f202f;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index d044ba5c..71164ac3 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) 2006 Mikael Magnusson + Copyright (c) 2003-2007 Dana 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" @@ -13,6 +32,7 @@ #include "keyboard.h" #include "translate.h" #include "moveresize.h" +#include "gettext.h" #include @@ -21,7 +41,7 @@ KeyBindingTree *keyboard_firstnode; typedef struct { guint state; ObClient *client; - ObAction *action; + GSList *actions; ObFrameContext context; } ObInteractiveState; @@ -80,6 +100,14 @@ 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; @@ -93,14 +121,14 @@ 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; if (conflict) { - g_warning("conflict with binding"); + g_message(_("Conflict with key binding in config file")); tree_destroy(tree); return FALSE; } @@ -129,32 +157,57 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) return TRUE; } -void keyboard_interactive_grab(guint state, ObClient *client, - ObAction *action) +gboolean keyboard_interactive_grab(guint state, ObClient *client, + ObAction *action) { ObInteractiveState *s; g_assert(action->data.any.interactive); - if (moveresize_in_progress) - moveresize_end(FALSE); - if (!interactive_states) { if (!grab_keyboard(TRUE)) - return; - if (!grab_pointer(TRUE, OB_CURSOR_NONE)) { - grab_keyboard(FALSE); - return; - } + return FALSE; } s = g_new(ObInteractiveState, 1); s->state = state; s->client = client; - s->action = action; + 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, Time time) +{ + action_run_interactive(s->actions, s->client, state, time, cancel, TRUE); + + g_slist_free(s->actions); + g_free(s); + + interactive_states = g_slist_remove(interactive_states, s); + + if (!interactive_states) { + grab_keyboard(FALSE); + keyboard_reset_chains(); + } +} + +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) @@ -173,23 +226,13 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client) !(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) { - action_run_interactive(s->action, s->client, - e->xkey.state, cancel, TRUE); - - g_free(s); - - interactive_states = g_slist_delete_link(interactive_states, it); - if (!interactive_states) { - grab_keyboard(FALSE); - grab_pointer(FALSE, OB_CURSOR_NONE); - keyboard_reset_chains(); - } + keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time); handled = TRUE; } else @@ -224,18 +267,18 @@ void keyboard_event(ObClient *client, const XEvent *e) ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); /* 5 second timeout for chains */ ob_main_loop_timeout_add(ob_main_loop, 5 * G_USEC_PER_SEC, - chain_timeout, NULL, NULL); + chain_timeout, NULL, + g_direct_equal, NULL); grab_keys(FALSE); curpos = p; grab_keys(TRUE); } else { - GSList *it; - - for (it = p->actions; it; it = it->next) - action_run_key(it->data, client, e->xkey.state, - e->xkey.x_root, e->xkey.y_root); keyboard_reset_chains(); + + action_run_key(p->actions, client, e->xkey.state, + e->xkey.x_root, e->xkey.y_root, + e->xkey.time); } break; } @@ -243,17 +286,25 @@ void keyboard_event(ObClient *client, const XEvent *e) } } +gboolean keyboard_interactively_grabbed() +{ + return !!interactive_states; +} + void keyboard_startup(gboolean reconfig) { grab_keys(TRUE); + + if (!reconfig) + client_add_destructor(keyboard_interactive_end_client, NULL); } void keyboard_shutdown(gboolean reconfig) { GSList *it; - tree_destroy(keyboard_firstnode); - keyboard_firstnode = NULL; + if (!reconfig) + client_remove_destructor(keyboard_interactive_end_client); for (it = interactive_states; it; it = g_slist_next(it)) g_free(it->data); @@ -261,7 +312,7 @@ void keyboard_shutdown(gboolean reconfig) interactive_states = NULL; ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); - grab_keys(FALSE); - curpos = NULL; + + keyboard_unbind_all(); }