X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=f9716c3028f91389151dcadced0a1bdaf01103e3;hb=c8983c42a7c27321d18825f2a130c15e29046f7b;hp=54de380c4a38a8fc6d05a381df6ec8370d0230b9;hpb=bdc10887cbb7a51c1231978806963e622619e2f9;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index 54de380c..f9716c30 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -1,7 +1,8 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- keyboard.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + 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 @@ -31,6 +32,7 @@ #include "keyboard.h" #include "translate.h" #include "moveresize.h" +#include "gettext.h" #include @@ -39,7 +41,7 @@ KeyBindingTree *keyboard_firstnode; typedef struct { guint state; ObClient *client; - ObAction *action; + GSList *actions; ObFrameContext context; } ObInteractiveState; @@ -66,18 +68,12 @@ static void grab_for_window(Window win, gboolean grab) } } -void keyboard_grab_for_client(ObClient *c, gboolean grab) -{ - grab_for_window(c->window, grab); -} - static void grab_keys(gboolean grab) { 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)->window, grab); + grab_for_window(RootWindow(ob_display, ob_screen), grab); } static gboolean chain_timeout(gpointer data) @@ -119,14 +115,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; } @@ -155,22 +151,18 @@ 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; + grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER); + if (!grab_keyboard(TRUE)) { + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); + return FALSE; } } @@ -178,39 +170,41 @@ void keyboard_interactive_grab(guint state, ObClient *client, 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) + guint state, gboolean cancel, Time time) { - action_run_interactive(s->action, s->client, state, cancel, TRUE); + 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); - grab_pointer(FALSE, OB_CURSOR_NONE); + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); keyboard_reset_chains(); } } -void keyboard_interactive_end_client(gpointer data) +void keyboard_interactive_end_client(ObClient *client, gpointer data) { GSList *it, *next; - ObClient *c = data; for (it = interactive_states; it; it = next) { ObInteractiveState *s = it->data; next = g_slist_next(it); - if (s->client == c) - keyboard_interactive_end(s, 0, FALSE); + if (s->client == client) + s->client = NULL; } } @@ -230,13 +224,15 @@ 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; - } + } else if (e->type == ButtonPress) + cancel = done = TRUE; + if (done) { - keyboard_interactive_end(s, e->xkey.state, cancel); + keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time); handled = TRUE; } else @@ -271,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; } @@ -290,12 +286,17 @@ 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); + client_add_destructor(keyboard_interactive_end_client, NULL); } void keyboard_shutdown(gboolean reconfig)