X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=218e251accebbdf69476e157246abfdf9dc73a09;hb=4940d007cce43a135f1b448902f5a3571dbce62a;hp=1509f69f11a8dfe2c5acb6a0987796e47e6bbf4e;hpb=0da9aa2660b51ce6208b041cc6e14f15e522c289;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 1509f69f..218e251a 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -27,6 +27,7 @@
 #include "client.h"
 #include "action.h"
 #include "prop.h"
+#include "menuframe.h"
 #include "config.h"
 #include "keytree.h"
 #include "keyboard.h"
@@ -38,15 +39,15 @@
 #include <glib.h>
 
 typedef struct {
+    gboolean active;
     guint state;
     ObClient *client;
-    GSList *actions;
-    ObFrameContext context;
+    ObAction *action;
 } ObInteractiveState;
 
 KeyBindingTree *keyboard_firstnode = NULL;
 static ObPopup *popup = NULL;
-static GSList *interactive_states;
+static ObInteractiveState istate;
 static KeyBindingTree *curpos;
 
 static void grab_keys(gboolean grab)
@@ -77,6 +78,8 @@ static gboolean chain_timeout(gpointer data)
 
 static void set_curpos(KeyBindingTree *newpos)
 {
+    if (curpos == newpos) return;
+
     grab_keys(FALSE);
     curpos = newpos;
     grab_keys(TRUE);
@@ -185,91 +188,86 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
     return TRUE;
 }
 
-gboolean keyboard_interactive_grab(guint state, ObClient *client,
-                                   ObAction *action)
+static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
+                                     gboolean ungrab)
 {
-    ObInteractiveState *s;
-
-    g_assert(action->data.any.interactive);
-
-    if (!interactive_states) {
-        grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER);
-        if (!grab_keyboard(TRUE)) {
-            grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
-            return FALSE;
-        }
-    }
+    GSList *alist;
 
-    s = g_new(ObInteractiveState, 1);
+    g_assert(istate.active);
 
-    s->state = state;
-    s->client = client;
-    s->actions = g_slist_append(NULL, action);
+    /* ungrab first so they won't be NotifyWhileGrabbed */
+    if (ungrab)
+        ungrab_keyboard();
 
-    interactive_states = g_slist_append(interactive_states, s);
+    /* set this before running the actions so they know the keyboard is not
+       grabbed */
+    istate.active = FALSE;
 
-    return TRUE;
+    alist = g_slist_append(NULL, istate.action);
+    action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
+    g_slist_free(alist);
 }
 
-void keyboard_interactive_end(ObInteractiveState *s,
-                              guint state, gboolean cancel, Time time)
+static void keyboard_interactive_end_client(ObClient *client, gpointer data)
 {
-    action_run_interactive(s->actions, s->client, state, time, cancel, TRUE);
-
-    g_slist_free(s->actions);
-    g_free(s);
+    if (istate.active && istate.client == client)
+        istate.client = NULL;
+}
 
-    interactive_states = g_slist_remove(interactive_states, s);
 
-    if (!interactive_states) {
-        grab_keyboard(FALSE);
-        grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
-    }
+void keyboard_interactive_cancel()
+{
+    keyboard_interactive_end(0, TRUE, event_curtime, TRUE);
 }
 
-void keyboard_interactive_end_client(ObClient *client, gpointer data)
+gboolean keyboard_interactive_grab(guint state, ObClient *client,
+                                   ObAction *action)
 {
-    GSList *it, *next;
+    g_assert(action->data.any.interactive);
 
-    for (it = interactive_states; it; it = next) {
-        ObInteractiveState *s = it->data;
+    if (!istate.active) {
+        if (!grab_keyboard())
+            return FALSE;
+    } else if (action->func != istate.action->func) {
+        keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE);
+    }
 
-        next = g_slist_next(it);
+    istate.active = TRUE;
+    istate.state = state;
+    istate.client = client;
+    istate.action = action;
 
-        if (s->client == client)
-            s->client = NULL;
-    }
+    return TRUE;
 }
 
 gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
 {
-    GSList *it, *next;
     gboolean handled = FALSE;
     gboolean done = FALSE;
     gboolean cancel = FALSE;
 
-    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)))
+    if (istate.active) {
+        if ((e->type == KeyRelease && !(istate.state & e->xkey.state))) {
             done = TRUE;
-        else if (e->type == KeyPress) {
+            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;
-        } else if (e->type == ButtonPress)
-            cancel = done = TRUE;
+              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) {
-            keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time);
+        if (done)
+            keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time,TRUE);
 
-            handled = TRUE;
-        } else
-            *client = s->client;
+        if (handled)
+            *client = istate.client;
     }
 
     return handled;
@@ -297,6 +295,10 @@ void keyboard_event(ObClient *client, const XEvent *e)
         if (p->key == e->xkey.keycode &&
             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 */
                 ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
                 /* 3 second timeout for chains */
@@ -321,7 +323,7 @@ void keyboard_event(ObClient *client, const XEvent *e)
 
 gboolean keyboard_interactively_grabbed()
 {
-    return !!interactive_states;
+    return istate.active;
 }
 
 void keyboard_startup(gboolean reconfig)
@@ -330,20 +332,16 @@ void keyboard_startup(gboolean reconfig)
     popup = popup_new(FALSE);
 
     if (!reconfig)
-        client_add_destructor(keyboard_interactive_end_client, NULL);
+        client_add_destroy_notify(keyboard_interactive_end_client, NULL);
 }
 
 void keyboard_shutdown(gboolean reconfig)
 {
-    GSList *it;
-
     if (!reconfig)
-        client_remove_destructor(keyboard_interactive_end_client);
+        client_remove_destroy_notify(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;
+    if (istate.active)
+        keyboard_interactive_cancel();
 
     ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);