X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=7fdd18704eee5cfed3483054d070b2446474b1ed;hb=19ecd4d6d403e71abecb0e77f7ff0f4efa400be3;hp=d758b3869e29cc8868d7b90a9d13102319d06715;hpb=d59f0d67b0a6f3a7eed2753875691e78c08c632c;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index d758b386..7fdd1870 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -78,15 +78,16 @@ static gboolean chain_timeout(gpointer data)
 
 static void set_curpos(KeyBindingTree *newpos)
 {
-    if (curpos != newpos) {
-        grab_keys(FALSE);
-        curpos = newpos;
-        grab_keys(TRUE);
-    }
+    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;
@@ -97,10 +98,12 @@ static void set_curpos(KeyBindingTree *newpos)
             g_free(oldtext);
         }
 
-        popup_position(popup, NorthWestGravity, 10, 10);
+        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);
     }
@@ -143,7 +146,6 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
 {
     KeyBindingTree *tree, *t;
     gboolean conflict;
-    gboolean mods = TRUE;
 
     g_assert(keylist != NULL);
     g_assert(action != NULL);
@@ -164,17 +166,13 @@ 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;
-    }
+    /* find the bottom node */
+    for (; t->first_child; t = t->first_child);
 
     /* when there are no modifiers in the binding, then the action cannot
        be interactive */
-    if (!mods && action->data.any.interactive) {
+    if (!t->state && action->data.any.interactive) {
+        g_print("not interactive\n");
         action->data.any.interactive = FALSE;
         action->data.inter.final = TRUE;
     }
@@ -197,13 +195,17 @@ static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
 
     /* ungrab first so they won't be NotifyWhileGrabbed */
     if (ungrab)
-        grab_keyboard(FALSE);
+        ungrab_keyboard();
+
+    /* set this before running the actions so they know the keyboard is not
+       grabbed */
+    istate.active = FALSE;
 
     alist = g_slist_append(NULL, istate.action);
     action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
     g_slist_free(alist);
 
-    istate.active = FALSE;
+    keyboard_reset_chains(0);
 }
 
 static void keyboard_interactive_end_client(ObClient *client, gpointer data)
@@ -212,13 +214,19 @@ static void keyboard_interactive_end_client(ObClient *client, gpointer data)
         istate.client = NULL;
 }
 
+
+void keyboard_interactive_cancel()
+{
+    keyboard_interactive_end(0, TRUE, event_curtime, TRUE);
+}
+
 gboolean keyboard_interactive_grab(guint state, ObClient *client,
                                    ObAction *action)
 {
     g_assert(action->data.any.interactive);
 
     if (!istate.active) {
-        if (!grab_keyboard(TRUE))
+        if (!grab_keyboard())
             return FALSE;
     } else if (action->func != istate.action->func) {
         keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE);
@@ -269,7 +277,13 @@ 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)
@@ -301,7 +315,14 @@ void keyboard_event(ObClient *client, const XEvent *e)
             } else if (p->chroot)         /* an empty chroot */
                 set_curpos(p);
             else {
-                keyboard_reset_chains(0);
+                GSList *it;
+                gboolean inter = FALSE;
+
+                for (it = p->actions; it && !inter; it = g_slist_next(it))
+                    if (((ObAction*)it->data)->data.any.interactive)
+                        inter = TRUE;
+                if (!inter) /* don't reset if the action is interactive */
+                    keyboard_reset_chains(0);
 
                 action_run_key(p->actions, client, e->xkey.state,
                                e->xkey.x_root, e->xkey.y_root,
@@ -322,18 +343,19 @@ void keyboard_startup(gboolean reconfig)
 {
     grab_keys(TRUE);
     popup = popup_new(FALSE);
+    popup_set_text_align(popup, RR_JUSTIFY_CENTER);
 
     if (!reconfig)
-        client_add_destructor(keyboard_interactive_end_client, NULL);
+        client_add_destroy_notify(keyboard_interactive_end_client, NULL);
 }
 
 void keyboard_shutdown(gboolean reconfig)
 {
     if (!reconfig)
-        client_remove_destructor(keyboard_interactive_end_client);
+        client_remove_destroy_notify(keyboard_interactive_end_client);
 
     if (istate.active)
-        keyboard_interactive_end(0, TRUE, 0, TRUE);
+        keyboard_interactive_cancel();
 
     ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);