X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=ac92f5f93ddc9290fc1a86ed92b76e224f54213a;hb=780d1b0961e2eed5fea4645b4398fafb4adad73a;hp=bcac0a3c3220ae0d38b8403cf9358371f087d2b3;hpb=ec0bbfec308610502342587b0ef748697abdf333;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index bcac0a3c..ac92f5f9 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -1,3 +1,23 @@
+/* -*- 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"
 #include "frame.h"
@@ -5,77 +25,116 @@
 #include "event.h"
 #include "grab.h"
 #include "client.h"
-#include "action.h"
+#include "actions.h"
 #include "prop.h"
-#include "timer.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 <glib.h>
 
-KeyBindingTree *keyboard_firstnode;
-
+KeyBindingTree *keyboard_firstnode = NULL;
+static ObPopup *popup = NULL;
 static KeyBindingTree *curpos;
-static ObTimer *chain_timer;
-static gboolean interactive_grab;
-static guint grabbed_state;
-static ObClient *grabbed_client;
-static ObAction *grabbed_action;
-static ObFrameContext grabbed_context;
-
-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 void set_curpos(KeyBindingTree *newpos)
 {
-    GList *it;
+    if (curpos == newpos) return;
+
+    grab_keys(FALSE);
+    curpos = newpos;
+    grab_keys(TRUE);
+
+    if (curpos != NULL) {
+        gchar *text = NULL;
+        GList *it;
+        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);
+        }
 
-    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);
+        a = screen_physical_area_active();
+        popup_position(popup, NorthWestGravity, a->x + 10, a->y + 10);
+        /* 1 second delay for the popup to show */
+        popup_delay_show(popup, G_USEC_PER_SEC, text);
+        g_free(text);
+        g_free(a);
+    } else {
+        popup_hide(popup);
+    }
 }
 
-void keyboard_reset_chains()
+void keyboard_reset_chains(gint break_chroots)
 {
-    if (chain_timer) {
-        timer_stop(chain_timer);
-        chain_timer = NULL;
-    }
-    if (curpos) {
-        curpos = NULL;
-        grab_keys(TRUE);
+    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);
 }
 
-static void chain_timeout(ObTimer *t, void *data)
+void keyboard_unbind_all()
 {
-    keyboard_reset_chains();
+    tree_destroy(keyboard_firstnode);
+    keyboard_firstnode = NULL;
+}
+
+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);
+    }
 }
 
-gboolean keyboard_bind(GList *keylist, ObAction *action)
+gboolean keyboard_bind(GList *keylist, ObActionsAct *action)
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
@@ -87,19 +146,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
@@ -109,85 +170,58 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
     return TRUE;
 }
 
-void keyboard_interactive_grab(guint state, ObClient *client,
-                               ObFrameContext context, ObAction *action)
-{
-    if (!interactive_grab && grab_keyboard(TRUE)) {
-        interactive_grab = TRUE;
-        grabbed_state = state;
-        grabbed_client = client;
-        grabbed_action = action;
-        grabbed_context = context;
-        grab_pointer(TRUE, None);
-    }
-}
-
-gboolean keyboard_process_interactive_grab(const XEvent *e,
-                                           ObClient **client,
-                                           ObFrameContext *context)
+#if 0
+gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
 {
     gboolean handled = FALSE;
     gboolean done = FALSE;
+    gboolean cancel = FALSE;
 
-    if (interactive_grab) {
-        *client = grabbed_client;
-        *context = grabbed_context;
-
-        if ((e->type == KeyRelease && 
-             !(grabbed_state & e->xkey.state)))
+    if (istate.active) {
+        if ((e->type == KeyRelease && !(istate.state & e->xkey.state))) {
             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)) {
-                if (grabbed_action->func == action_cycle_windows) {
-                    grabbed_action->data.cycle.cancel = TRUE;
-                }
-                if (grabbed_action->func == action_desktop_dir) {
-                    grabbed_action->data.desktopdir.cancel = TRUE;
-                }
-                if (grabbed_action->func == action_send_to_desktop_dir)
-                {
-                    grabbed_action->data.sendtodir.cancel = TRUE;
-                }
-                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;
+            handled = FALSE;
         }
-        if (done) { 
-            if (grabbed_action->func == action_cycle_windows) {
-                grabbed_action->data.cycle.final = TRUE;
-            }
-            if (grabbed_action->func == action_desktop_dir) {
-                grabbed_action->data.desktopdir.final = TRUE;
-            }
-            if (grabbed_action->func == action_send_to_desktop_dir) {
-                grabbed_action->data.sendtodir.final = TRUE;
-            }
-
-            grabbed_action->func(&grabbed_action->data);
 
-            interactive_grab = FALSE;
-            grab_keyboard(FALSE);
-            grab_pointer(FALSE, None);
-            keyboard_reset_chains();
+        if (done)
+            keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time,TRUE);
 
-            handled = TRUE;
-        }
+        if (handled)
+            *client = istate.client;
     }
 
     return handled;
 }
+#endif
 
 void keyboard_event(ObClient *client, const XEvent *e)
 {
     KeyBindingTree *p;
 
+    if (e->type == KeyRelease) {
+        grab_key_passive_count(-1);
+        return;
+    }
+
     g_assert(e->type == KeyPress);
+    grab_key_passive_count(1);
 
     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;
     }
 
@@ -197,63 +231,33 @@ 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 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 {
+                ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+                /* 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 {
                 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.time, e->xkey.state,
+                                 e->xkey.x_root, e->xkey.y_root,
+                                 OB_FRAME_CONTEXT_NONE, client);
             }
             break;
         }
@@ -261,15 +265,21 @@ void keyboard_event(ObClient *client, const XEvent *e)
     }
 }
 
-void keyboard_startup()
+void keyboard_startup(gboolean reconfig)
 {
     grab_keys(TRUE);
+    popup = popup_new(FALSE);
+    popup_set_text_align(popup, RR_JUSTIFY_CENTER);
 }
 
-void keyboard_shutdown()
+void keyboard_shutdown(gboolean reconfig)
 {
-    tree_destroy(keyboard_firstnode);
-    keyboard_firstnode = NULL;
-    grab_keys(FALSE);
+    ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+
+    keyboard_unbind_all();
+    set_curpos(NULL);
+
+    popup_free(popup);
+    popup = NULL;
 }