X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=8f4424ea97d43c8c233b69886def08c1f9e5396f;hb=HEAD;hp=42eea890b2fea4add7c442baf05b55324ea8c5a5;hpb=496fbac21c0f734aa31d09af01a3362d7fd13231;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 42eea890..8f4424ea 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 "focus.h"
 #include "screen.h"
 #include "frame.h"
@@ -5,81 +24,122 @@
 #include "event.h"
 #include "grab.h"
 #include "client.h"
-#include "action.h"
-#include "prop.h"
-#include "timer.h"
+#include "actions.h"
+#include "menuframe.h"
 #include "config.h"
 #include "keytree.h"
 #include "keyboard.h"
 #include "translate.h"
+#include "moveresize.h"
+#include "popup.h"
+#include "gettext.h"
+#include "obt/keyboard.h"
 
 #include <glib.h>
 
-KeyBindingTree *keyboard_firstnode;
-
-typedef struct {
-    guint state;
-    ObClient *client;
-    ObAction *action;
-    ObFrameContext context;
-} ObInteractiveState;
-
-static GSList *interactive_states;
-
+KeyBindingTree *keyboard_firstnode = NULL;
+static ObPopup *popup = NULL;
 static KeyBindingTree *curpos;
-static ObTimer *chain_timer;
+static guint chain_timer = 0;
 
-static void grab_for_window(Window win, gboolean grab)
+static void grab_keys(gboolean grab)
 {
     KeyBindingTree *p;
 
-    ungrab_all_keys(win);
+    ungrab_all_keys(obt_root(ob_screen));
 
     if (grab) {
         p = curpos ? curpos->first_child : keyboard_firstnode;
         while (p) {
-            grab_key(p->key, p->state, win, GrabModeAsync);
+            if (p->key)
+                grab_key(p->key, p->state, obt_root(ob_screen),
+                         GrabModeAsync);
             p = p->next_sibling;
         }
         if (curpos)
             grab_key(config_keyboard_reset_keycode,
                      config_keyboard_reset_state,
-                     win, GrabModeAsync);
+                     obt_root(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 void chain_done(gpointer data)
 {
-    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)->frame->window, grab);
+    chain_timer = 0;
 }
 
-void keyboard_reset_chains()
+static void set_curpos(KeyBindingTree *newpos)
 {
-    if (chain_timer) {
-        timer_stop(chain_timer);
-        chain_timer = NULL;
+    if (curpos == newpos) return;
+
+    grab_keys(FALSE);
+    curpos = newpos;
+    grab_keys(TRUE);
+
+    if (curpos != NULL) {
+        gchar *text = NULL;
+        GList *it;
+        const Rect *a;
+
+        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);
+        }
+
+        a = screen_physical_area_primary(FALSE);
+        popup_position(popup, NorthWestGravity, a->x + 10, a->y + 10);
+        /* 1 second delay for the popup to show */
+        popup_delay_show(popup, 1000, text);
+        g_free(text);
+    } else {
+        popup_hide(popup);
     }
-    if (curpos) {
-        curpos = NULL;
-        grab_keys(TRUE);
+}
+
+void keyboard_reset_chains(gint break_chroots)
+{
+    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(void)
+{
+    tree_destroy(keyboard_firstnode);
+    keyboard_firstnode = NULL;
 }
 
-static void chain_timeout(ObTimer *t, void *data)
+void keyboard_chroot(GList *keylist)
 {
-    keyboard_reset_chains();
+    /* 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);
+    }
 }
 
-gboolean keyboard_bind(GList *keylist, ObAction *action)
+gboolean keyboard_bind(GList *keylist, ObActionsAct *action)
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
@@ -91,19 +151,21 @@ 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 the bottom node */
+    for (; t->first_child; t = t->first_child);
+
     /* set the action */
     t->actions = g_slist_append(t->actions, action);
     /* assimilate this built tree into the main tree. assimilation
@@ -113,177 +175,166 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
     return TRUE;
 }
 
-void keyboard_interactive_grab(guint state, ObClient *client,
-                               ObFrameContext context, ObAction *action)
+#if 0
+gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
 {
-    ObInteractiveState *s;
-
-    if (!interactive_states) {
-        if (!grab_keyboard(TRUE))
-            return;
-        if (!grab_pointer(TRUE, None)) {
-            grab_keyboard(FALSE);
-            return;
-        }
-    }
-
-    s = g_new(ObInteractiveState, 1);
-
-    s->state = state;
-    s->client = client;
-    s->action = action;
-    s->context = context;
-
-    interactive_states = g_slist_append(interactive_states, s);
-}
-
-gboolean keyboard_process_interactive_grab(const XEvent *e,
-                                           ObClient **client,
-                                           ObFrameContext *context)
-{
-    GSList *it, *next;
     gboolean handled = FALSE;
     gboolean done = FALSE;
     gboolean cancel = FALSE;
+    guint mods;
 
-    for (it = interactive_states; it; it = next) {
-        ObInteractiveState *s = it->data;
+    mods = obt_keyboard_only_modmasks(ev->xkey.state);
 
-        next = g_slist_next(it);
-        
-        *client = s->client;
-        *context = s->context;
-
-        if ((e->type == KeyRelease && 
-             !(s->state & e->xkey.state)))
+    if (istate.active) {
+        if ((e->type == KeyRelease && !(istate.state & mods))) {
+            done = TRUE;
+            handled = TRUE;
+        } else if (e->type == KeyPress) {
+            /*if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
+              done = TRUE;
+              else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
+                  cancel = done = TRUE;
+                  handled = TRUE;
+              }
+        } else if (e->type == ButtonPress) {
+            cancel = TRUE;
             done = TRUE;
-        else if (e->type == KeyPress) {
-            if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
-                done = TRUE;
-            else if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
-                cancel = done = TRUE;
+            handled = FALSE;
         }
-        if (done) {
-            if (s->action->func == action_cycle_windows) {
-                s->action->data.cycle.cancel = cancel;
-                s->action->data.cycle.final = TRUE;
-            }
-            if (s->action->func == action_desktop_dir) {
-                s->action->data.desktopdir.cancel = cancel;
-                s->action->data.desktopdir.final = TRUE;
-            }
-            if (s->action->func == action_send_to_desktop_dir) {
-                s->action->data.sendtodir.cancel = cancel;
-                s->action->data.sendtodir.final = TRUE;
-            }
-
-            s->action->func(&s->action->data);
 
-            grab_keyboard(FALSE);
-            grab_pointer(FALSE, None);
-            keyboard_reset_chains();
+        if (done)
+            keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time,TRUE);
 
-            g_free(s);
-            interactive_states = g_slist_delete_link(interactive_states, it);
-            handled = TRUE;
-        }
+        if (handled)
+            *client = istate.client;
     }
 
     return handled;
 }
+#endif
 
-void keyboard_event(ObClient *client, const XEvent *e)
+gboolean keyboard_event(ObClient *client, const XEvent *e)
 {
     KeyBindingTree *p;
+    gboolean used;
+    guint mods;
+
+    if (e->type == KeyRelease) {
+        grab_key_passive_count(-1);
+        return FALSE;
+    }
 
     g_assert(e->type == KeyPress);
+    grab_key_passive_count(1);
+
+    mods = obt_keyboard_only_modmasks(e->xkey.state);
 
     if (e->xkey.keycode == config_keyboard_reset_keycode &&
-        e->xkey.state == config_keyboard_reset_state)
+        mods == config_keyboard_reset_state)
     {
-        keyboard_reset_chains();
-        return;
+        if (chain_timer) g_source_remove(chain_timer);
+        keyboard_reset_chains(-1);
+        return TRUE;
     }
 
+    used = FALSE;
     if (curpos == NULL)
         p = keyboard_firstnode;
     else
         p = curpos->first_child;
     while (p) {
-        if (p->key == e->xkey.keycode &&
-            p->state == e->xkey.state) {
+        if (p->key == e->xkey.keycode && p->state == mods) {
+            /* if we hit a key binding, then close any open menus and run it */
+            if (menu_frame_visible)
+                menu_frame_hide_all();
+
             if (p->first_child != NULL) { /* part of a chain */
-                if (chain_timer) timer_stop(chain_timer);
-                /* 5 second timeout for chains */
-                chain_timer = timer_start(5000*1000, chain_timeout,
-                                          NULL);
-                curpos = p;
-                grab_keys(TRUE);
-            } else {
+                if (chain_timer) g_source_remove(chain_timer);
+                /* 3 second timeout for chains */
+                chain_timer =
+                    g_timeout_add_full(G_PRIORITY_DEFAULT,
+                                       3000, chain_timeout, NULL,
+                                       chain_done);
+                set_curpos(p);
+            } else if (p->chroot)         /* an empty chroot */
+                set_curpos(p);
+            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_cycle_windows)
-                        {
-                            act->data.cycle.final = FALSE;
-                            act->data.cycle.cancel = FALSE;
-                        }
-                        if (act->func == action_desktop_dir)
-                        {
-                            act->data.desktopdir.final = FALSE;
-                            act->data.desktopdir.cancel = FALSE;
-                        }
-                        if (act->func == action_send_to_desktop_dir)
-                        {
-                            act->data.sendtodir.final = FALSE;
-                            act->data.sendtodir.cancel = FALSE;
-                        }
-
-                        if (act->func == action_moveresize)
-                        {
-                            screen_pointer_pos(&act->data.moveresize.x,
-                                               &act->data.moveresize.y);
-                        }
-
-                        if ((act->func == action_cycle_windows ||
-                             act->func == action_desktop_dir ||
-                             act->func == action_send_to_desktop_dir))
-                        {
-                            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();
+
+                for (it = p->actions; it; it = g_slist_next(it))
+                    if (actions_act_is_interactive(it->data)) break;
+                if (it == NULL) /* reset if the actions are not interactive */
+                    keyboard_reset_chains(0);
+
+                actions_run_acts(p->actions, OB_USER_ACTION_KEYBOARD_KEY,
+                                 e->xkey.state, e->xkey.x_root, e->xkey.y_root,
+                                 0, OB_FRAME_CONTEXT_NONE, client);
             }
             break;
+            used = TRUE;
         }
         p = p->next_sibling;
     }
+    return used;
 }
 
-void keyboard_startup()
+static void node_rebind(KeyBindingTree *node)
 {
-    grab_keys(TRUE);
+    if (node->first_child) {
+        /* find leaf nodes */
+        node_rebind(node->first_child);
+
+        /* for internal nodes, add them to the tree if they
+           are a chroot, but do this after adding their
+           children */
+        if (node->chroot)
+            keyboard_chroot(node->keylist);
+    }
+    else {
+        /* for leaf nodes, rebind each action assigned to it */
+        while (node->actions) {
+            /* add each action, and remove them from the original tree so
+               they don't get free'd on us */
+            keyboard_bind(node->keylist, node->actions->data);
+            node->actions = g_slist_delete_link(node->actions, node->actions);
+        }
+
+        if (node->chroot)
+            keyboard_chroot(node->keylist);
+    }
+
+    /* go through each sibling */
+    if (node->next_sibling) node_rebind(node->next_sibling);
 }
 
-void keyboard_shutdown()
+void keyboard_rebind(void)
 {
-    tree_destroy(keyboard_firstnode);
+    KeyBindingTree *old;
+
+    old = keyboard_firstnode;
     keyboard_firstnode = NULL;
-    grab_keys(FALSE);
+    if (old)
+        node_rebind(old);
+
+    tree_destroy(old);
+    set_curpos(NULL);
+    grab_keys(TRUE);
+}
+
+void keyboard_startup(gboolean reconfig)
+{
+    grab_keys(TRUE);
+    popup = popup_new();
+    popup_set_text_align(popup, RR_JUSTIFY_CENTER);
 }
 
+void keyboard_shutdown(gboolean reconfig)
+{
+    if (chain_timer) g_source_remove(chain_timer);
+
+    keyboard_unbind_all();
+    set_curpos(NULL);
+
+    popup_free(popup);
+    popup = NULL;
+}