fallback to transient parents properly

diff --git a/openbox/focus.c b/openbox/focus.c
index 73cb6f52c9b096d53cc5150c85d179c85e911184..a84d253a2bbb5e88b766c283699555d0776f7446 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -244,14 +244,11 @@ static ObClient* focus_fallback_transient(ObClient *top, ObClient *old)
         return NULL;
 }
 
-ObClient* focus_fallback_target(ObFocusFallbackType type)
+ObClient* focus_fallback_target(ObFocusFallbackType type, ObClient *old)
 {
     GList *it;
-    ObClient *old = NULL;
     ObClient *target = NULL;
 
-    old = focus_client;
-
     if ((type == OB_FOCUS_FALLBACK_UNFOCUSING
          || type == OB_FOCUS_FALLBACK_CLOSED) && old) {
         if (old->transient_for) {
@@ -336,6 +333,7 @@ ObClient* focus_fallback_target(ObFocusFallbackType type)
 void focus_fallback(ObFocusFallbackType type)
 {
     ObClient *new;
+    ObClient *old = focus_client;
 
     /* unfocus any focused clients.. they can be focused by Pointer events
        and such, and then when I try focus them, I won't get a FocusIn event
@@ -343,7 +341,7 @@ void focus_fallback(ObFocusFallbackType type)
     */
     focus_set_client(NULL);
 
-    if ((new = focus_fallback_target(type)))
+    if ((new = focus_fallback_target(type, old)))
         client_focus(new);
 }
 

diff --git a/openbox/focus.h b/openbox/focus.h
index 1c95faa046272848b19dd39591cc6b2291cf9191..2846c9786a60cf7487a5e31d71b260fb692757bc 100644 (file)
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -53,7 +53,8 @@ typedef enum {
     OB_FOCUS_FALLBACK_NOFOCUS     /*!< nothing has focus for some reason */
 } ObFocusFallbackType;
 
-struct _ObClient* focus_fallback_target(ObFocusFallbackType type);
+struct _ObClient* focus_fallback_target(ObFocusFallbackType type,
+                                        struct _ObClient *old);
 
 /*! Call this when you need to focus something! */
 void focus_fallback(ObFocusFallbackType type);

diff --git a/openbox/screen.c b/openbox/screen.c
index ca3e12731e971960f511ac6195f6ef8d8e93718f..d97a732b58e3a1dad883a929c48ee0a73cfe709b 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -465,7 +465,7 @@ void screen_set_desktop(guint num)
 
     event_ignore_queued_enters();
 
-    focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS);
+    focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS, NULL);
     if (focus_hilite) {
         frame_adjust_focus(focus_hilite->frame, TRUE);