X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=d8f35bccbcca5339ba8ca48e492216d1c7dae4b8;hb=af7280b45d65480cf81f1262494b78df98a80681;hp=ccfe04977c755ec23ef29815a6dde78be06bb9be;hpb=a6f52b90551621316a36f7cd7b20ef1d5dca0782;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index ccfe0497..d8f35bcc 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -39,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)
@@ -78,9 +78,11 @@ static gboolean chain_timeout(gpointer data)
 
 static void set_curpos(KeyBindingTree *newpos)
 {
-    grab_keys(FALSE);
-    curpos = newpos;
-    grab_keys(TRUE);
+    if (curpos != newpos) {
+        grab_keys(FALSE);
+        curpos = newpos;
+        grab_keys(TRUE);
+    }
 
     if (curpos != NULL) {
         gchar *text = NULL;
@@ -186,91 +188,77 @@ 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;
+    GSList *alist;
 
-    g_assert(action->data.any.interactive);
+    g_assert(istate.active);
 
-    if (!interactive_states) {
-        grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER);
-        if (!grab_keyboard(TRUE)) {
-            grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
-            return FALSE;
-        }
-    }
+    alist = g_slist_append(NULL, istate.action);
+    action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
+    g_slist_free(alist);
 
-    s = g_new(ObInteractiveState, 1);
+    istate.active = FALSE;
 
-    s->state = state;
-    s->client = client;
-    s->actions = g_slist_append(NULL, action);
-
-    interactive_states = g_slist_append(interactive_states, s);
-
-    return TRUE;
+    if (ungrab)
+        grab_keyboard(FALSE);
 }
 
-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);
-
-    interactive_states = g_slist_remove(interactive_states, s);
-
-    if (!interactive_states) {
-        grab_keyboard(FALSE);
-        grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
-    }
+    if (istate.active && istate.client == client)
+        istate.client = NULL;
 }
 
-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(TRUE))
+            return FALSE;
+    } else if (action->func != istate.action->func) {
+        keyboard_interactive_end(state, FALSE, 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;
@@ -326,7 +314,7 @@ void keyboard_event(ObClient *client, const XEvent *e)
 
 gboolean keyboard_interactively_grabbed()
 {
-    return !!interactive_states;
+    return istate.active;
 }
 
 void keyboard_startup(gboolean reconfig)
@@ -340,15 +328,11 @@ void keyboard_startup(gboolean reconfig)
 
 void keyboard_shutdown(gboolean reconfig)
 {
-    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;
+    if (istate.active)
+        keyboard_interactive_end(0, TRUE, 0, TRUE);
 
     ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);