X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=c1151eb392eda2b8bb803c37390a08ae12148d63;hb=26879183e96f5a0d981e6ae76fda82a0d4564b20;hp=b517014a795df3334fdf470c5b101c7fb6934359;hpb=2c6c0757fa497f4c1e0648bcbb1927c0fa12862f;p=chaz%2Fopenbox diff --git a/openbox/keyboard.c b/openbox/keyboard.c index b517014a..c1151eb3 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" @@ -12,69 +31,124 @@ #include "keytree.h" #include "keyboard.h" #include "translate.h" +#include "moveresize.h" +#include "popup.h" +#include "gettext.h" #include -KeyBindingTree *keyboard_firstnode; - typedef struct { guint state; ObClient *client; - ObAction *action; + GSList *actions; ObFrameContext context; } ObInteractiveState; +KeyBindingTree *keyboard_firstnode = NULL; +static ObPopup *popup = NULL; static GSList *interactive_states; - static KeyBindingTree *curpos; -static void grab_for_window(Window win, gboolean grab) +static void grab_keys(gboolean grab) { KeyBindingTree *p; - ungrab_all_keys(win); + ungrab_all_keys(RootWindow(ob_display, ob_screen)); if (grab) { p = curpos ? curpos->first_child : keyboard_firstnode; while (p) { - grab_key(p->key, p->state, win, GrabModeAsync); + grab_key(p->key, p->state, RootWindow(ob_display, ob_screen), + GrabModeAsync); p = p->next_sibling; } if (curpos) grab_key(config_keyboard_reset_keycode, config_keyboard_reset_state, - win, GrabModeAsync); + RootWindow(ob_display, ob_screen), GrabModeAsync); } } -void keyboard_grab_for_client(ObClient *c, gboolean grab) +static gboolean chain_timeout(gpointer data) { - grab_for_window(c->window, grab); + keyboard_reset_chains(0); + return FALSE; /* don't repeat */ } -static void grab_keys(gboolean grab) +static gboolean popup_show_timeout(gpointer data) { - GList *it; + gchar *text = data; + popup_show(popup, text); - 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); + return FALSE; /* don't repeat */ } -static gboolean chain_timeout(gpointer data) +static void set_curpos(KeyBindingTree *newpos) { - keyboard_reset_chains(); + grab_keys(FALSE); + curpos = newpos; + grab_keys(TRUE); - return FALSE; /* don't repeat */ + if (curpos != NULL) { + gchar *text = NULL; + GList *it; + + for (it = curpos->keylist; it; it = g_list_next(it)) { + gchar *oldtext = text; + if (text == NULL) + text = g_strdup(it->data); + else + text = g_strconcat(text, " - ", it->data, NULL); + g_free(oldtext); + } + + popup_position(popup, NorthWestGravity, 10, 10); + if (popup->mapped) { + popup_show_timeout(text); + g_free(text); + } else { + ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout); + /* 1 second delay for the popup to show */ + ob_main_loop_timeout_add(ob_main_loop, G_USEC_PER_SEC, + popup_show_timeout, text, + g_direct_equal, g_free); + } + } else { + popup_hide(popup); + ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout); + } } -void keyboard_reset_chains() +void keyboard_reset_chains(gint break_chroots) { - ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); + KeyBindingTree *p; + + for (p = curpos; p; p = p->parent) { + if (p->chroot) { + if (break_chroots == 0) break; /* stop here */ + if (break_chroots > 0) + --break_chroots; + } + } + set_curpos(p); +} + +void keyboard_unbind_all() +{ + tree_destroy(keyboard_firstnode); + keyboard_firstnode = NULL; +} - if (curpos) { - curpos = NULL; - grab_keys(TRUE); +void keyboard_chroot(GList *keylist) +{ + /* try do it in the existing tree. if we can't that means it is an empty + chroot binding. so add it to the tree then. */ + if (!tree_chroot(keyboard_firstnode, keylist)) { + KeyBindingTree *tree; + if (!(tree = tree_build(keylist))) + return; + tree_chroot(tree, keylist); + tree_assimilate(tree); } } @@ -82,6 +156,7 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) { KeyBindingTree *tree, *t; gboolean conflict; + gboolean mods = TRUE; g_assert(keylist != NULL); g_assert(action != NULL); @@ -90,19 +165,33 @@ 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"); + g_message(_("Conflict with key binding in config file")); tree_destroy(tree); 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 @@ -112,17 +201,18 @@ 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)) { - grab_keyboard(FALSE); - return; + grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER); + if (!grab_keyboard(TRUE)) { + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); + return FALSE; } } @@ -130,15 +220,44 @@ 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, 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); + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); + } +} + +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, - ObFrameContext *context) +gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client) { GSList *it, *next; gboolean handled = FALSE; @@ -150,34 +269,23 @@ 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); + } else if (e->type == ButtonPress) + cancel = done = TRUE; - grab_keyboard(FALSE); - grab_pointer(FALSE, None); - keyboard_reset_chains(); + if (done) { + keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time); - g_free(s); - interactive_states = g_slist_delete_link(interactive_states, it); handled = TRUE; - } + } else + *client = s->client; } return handled; @@ -192,7 +300,8 @@ void keyboard_event(ObClient *client, const XEvent *e) if (e->xkey.keycode == config_keyboard_reset_keycode && e->xkey.state == config_keyboard_reset_state) { - keyboard_reset_chains(); + ob_main_loop_timeout_remove(ob_main_loop, chain_timeout); + keyboard_reset_chains(-1); return; } @@ -202,44 +311,23 @@ 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 */ - ob_main_loop_timeout_add(ob_main_loop, 5 * G_USEC_PER_SEC, - chain_timeout, NULL, 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_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(); + /* 3 second timeout for chains */ + ob_main_loop_timeout_add(ob_main_loop, 3 * G_USEC_PER_SEC, + chain_timeout, NULL, + g_direct_equal, NULL); + set_curpos(p); + } else if (p->chroot) /* an empty chroot */ + set_curpos(p); + else { + keyboard_reset_chains(0); + + action_run_key(p->actions, client, e->xkey.state, + e->xkey.x_root, e->xkey.y_root, + e->xkey.time); } break; } @@ -247,15 +335,39 @@ void keyboard_event(ObClient *client, const XEvent *e) } } -void keyboard_startup() +gboolean keyboard_interactively_grabbed() +{ + return !!interactive_states; +} + +void keyboard_startup(gboolean reconfig) { grab_keys(TRUE); + popup = popup_new(FALSE); + + 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); + ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout); + + keyboard_unbind_all(); + set_curpos(NULL); + + popup_free(popup); + popup = NULL; }