X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=05c292a2bb9f3098177d27e30d2444008b68c97a;hb=f5f59cea71b42ac462a8d30122646b79462e6499;hp=9c4620b293e7cbea6478e2c53c4a5a26e2cd7577;hpb=c22a6b32ab23a4193863882e14fc6ff77ed3d247;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index 9c4620b2..05c292a2 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -74,6 +74,8 @@ static gboolean replace_wm()
     g_free(wm_sn);
 
     current_wm_sn_owner = XGetSelectionOwner(ob_display, wm_sn_atom);
+    if (current_wm_sn_owner == screen_support_win)
+        current_wm_sn_owner = None;
     if (current_wm_sn_owner) {
         if (!ob_replace_wm) {
             g_warning("A window manager is already running on screen %d",
@@ -438,16 +440,16 @@ void screen_set_desktop(guint num)
     /* show windows before hiding the rest to lessen the enter/leave events */
 
     /* show windows from top to bottom */
-    for (it = stacking_list; it != NULL; it = it->next) {
+    for (it = stacking_list; it; it = g_list_next(it)) {
         if (WINDOW_IS_CLIENT(it->data)) {
             ObClient *c = it->data;
-            if (!c->frame->visible && client_should_show(c))
+            if (client_should_show(c))
                 frame_show(c->frame);
         }
     }
 
     /* hide windows from bottom to top */
-    for (it = g_list_last(stacking_list); it != NULL; it = it->prev) {
+    for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
         if (WINDOW_IS_CLIENT(it->data)) {
             ObClient *c = it->data;
             if (c->frame->visible && !client_should_show(c))
@@ -457,13 +459,18 @@ void screen_set_desktop(guint num)
 
     event_ignore_queued_enters();
 
-    /*!
-      When this focus_client check is not used, you can end up with races, as
-      demonstrated with gnome-panel, sometmies the window you click on on
-      another desktop ends up losing focus cuz of the fallback.
-    */
-    if (!focus_client)
-        focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
+    focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS);
+    if (focus_hilite) {
+        frame_adjust_focus(focus_hilite->frame, TRUE);
+
+        /*!
+          When this focus_client check is not used, you can end up with races,
+          as demonstrated with gnome-panel, sometmies the window you click on
+          another desktop ends up losing focus cuz of the focus change here.
+        */
+        /*if (!focus_client)*/
+        client_focus(focus_hilite);
+    }
 }
 
 static void get_row_col(guint d, guint *r, guint *c)