X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=7f930f8f574ca55191cb2347c17a4ffd5a78bad7;hb=b2b8ad92bfbc60392737fe9945e719b238d34933;hp=607941dda3d643497d25260fa7510b463297493f;hpb=c90da6da781932c2d178bfb7e39ec1d5003543b7;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 607941dd..7f930f8f 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) 2004        Mikael Magnusson
+   Copyright (c) 2003        Ben 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"
@@ -7,22 +27,26 @@
 #include "client.h"
 #include "action.h"
 #include "prop.h"
-#include "timer.h"
+#include "config.h"
 #include "keytree.h"
 #include "keyboard.h"
 #include "translate.h"
+#include "moveresize.h"
 
 #include <glib.h>
 
 KeyBindingTree *keyboard_firstnode;
 
+typedef struct {
+    guint state;
+    ObClient *client;
+    GSList *actions;
+    ObFrameContext context;
+} ObInteractiveState;
+
+static GSList *interactive_states;
+
 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)
 {
@@ -36,6 +60,10 @@ static void grab_for_window(Window win, gboolean grab)
             grab_key(p->key, p->state, win, GrabModeAsync);
             p = p->next_sibling;
         }
+        if (curpos)
+            grab_key(config_keyboard_reset_keycode,
+                     config_keyboard_reset_state,
+                     win, GrabModeAsync);
     }
 }
 
@@ -50,30 +78,40 @@ static void grab_keys(gboolean grab)
 
     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);
+        grab_for_window(((ObClient*)it->data)->window, grab);
+}
+
+static gboolean chain_timeout(gpointer data)
+{
+    keyboard_reset_chains();
+
+    return FALSE; /* don't repeat */
 }
 
 void keyboard_reset_chains()
 {
-    if (chain_timer) {
-        timer_stop(chain_timer);
-        chain_timer = NULL;
-    }
+    ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+
     if (curpos) {
+        grab_keys(FALSE);
         curpos = NULL;
         grab_keys(TRUE);
     }
 }
 
-static void chain_timeout(ObTimer *t, void *data)
+void keyboard_unbind_all()
 {
-    keyboard_reset_chains();
+    tree_destroy(keyboard_firstnode);
+    keyboard_firstnode = NULL;
+    grab_keys(FALSE);
+    curpos = NULL;
 }
 
 gboolean keyboard_bind(GList *keylist, ObAction *action)
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
+    gboolean mods = TRUE;
 
     g_assert(keylist != NULL);
     g_assert(action != NULL);
@@ -82,12 +120,11 @@ 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");
@@ -95,6 +132,21 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
         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
@@ -104,70 +156,91 @@ 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)
 {
-    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);
+    ObInteractiveState *s;
+
+    g_assert(action->data.any.interactive);
+
+    if (!interactive_states) {
+        if (!grab_keyboard(TRUE))
+            return FALSE;
+        if (!grab_pointer(TRUE, OB_CURSOR_NONE)) {
+            grab_keyboard(FALSE);
+            return FALSE;
+        }
     }
+
+    s = g_new(ObInteractiveState, 1);
+
+    s->state = state;
+    s->client = client;
+    s->actions = g_slist_append(NULL, action);
+
+    interactive_states = g_slist_append(interactive_states, s);
+
+    return TRUE;
 }
 
-gboolean keyboard_process_interactive_grab(const XEvent *e,
-                                           ObClient **client,
-                                           ObFrameContext *context)
+void keyboard_interactive_end(ObInteractiveState *s,
+                              guint state, gboolean cancel)
 {
-    gboolean handled = FALSE;
-    gboolean done = FALSE;
+    action_run_interactive(s->actions, s->client, state, cancel, TRUE);
 
-    if (interactive_grab) {
-        *client = grabbed_client;
-        *context = grabbed_context;
+    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);
+        keyboard_reset_chains();
     }
+}
 
-    if ((e->type == KeyRelease && 
-         !(grabbed_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;
-        }
+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;
     }
-    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);
+gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
+{
+    GSList *it, *next;
+    gboolean handled = FALSE;
+    gboolean done = FALSE;
+    gboolean cancel = FALSE;
 
-        interactive_grab = FALSE;
-        grab_keyboard(FALSE);
-        grab_pointer(FALSE, None);
-        keyboard_reset_chains();
+    for (it = interactive_states; it; it = next) {
+        ObInteractiveState *s = it->data;
+
+        next = g_slist_next(it);
+        
+        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))
+                done = TRUE;
+            else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
+                cancel = done = TRUE;
+        }
+        if (done) {
+            keyboard_interactive_end(s, e->xkey.state, cancel);
 
-        handled = TRUE;
+            handled = TRUE;
+        } else
+            *client = s->client;
     }
 
     return handled;
@@ -179,71 +252,35 @@ void keyboard_event(ObClient *client, const XEvent *e)
 
     g_assert(e->type == KeyPress);
 
+    if (e->xkey.keycode == config_keyboard_reset_keycode &&
+        e->xkey.state == config_keyboard_reset_state)
+    {
+        keyboard_reset_chains();
+        return;
+    }
+
     if (curpos == NULL)
         p = keyboard_firstnode;
     else
         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 */
-                if (chain_timer) timer_stop(chain_timer);
+                ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
                 /* 5 second timeout for chains */
-                chain_timer = timer_start(5000*1000, chain_timeout,
-                                          NULL);
+                ob_main_loop_timeout_add(ob_main_loop, 5 * G_USEC_PER_SEC,
+                                         chain_timeout, NULL, NULL);
+                grab_keys(FALSE);
                 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_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();
+
+                action_run_key(p->actions, client, e->xkey.state,
+                               e->xkey.x_root, e->xkey.y_root);
             }
             break;
         }
@@ -251,15 +288,28 @@ void keyboard_event(ObClient *client, const XEvent *e)
     }
 }
 
-void keyboard_startup()
+void keyboard_startup(gboolean reconfig)
 {
     grab_keys(TRUE);
+
+    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);
+
+    keyboard_unbind_all();
 }