rename 'xinerama' stuff to 'monitors' to be more generic and descriptive.

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 141fc4746b342a519c66ccbccbcfb8b835267a90..12d30d27e8fffe46d1ab02e24ad1b5dd4e64e375 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -34,7 +34,6 @@ void focus_startup()
     XSetWindowAttributes attrib;
 
     focus_client = NULL;
-    focus_cycle_popup = popup_new(TRUE);
 
     attrib.override_redirect = TRUE;
     focus_backup = XCreateWindow(ob_display, ob_root,
@@ -43,6 +42,10 @@ void focus_startup()
                                  CWOverrideRedirect, &attrib);
     XMapRaised(ob_display, focus_backup);
 
+    /* do this *after* focus_backup is created, since it is used for
+       stacking */
+    focus_cycle_popup = popup_new(TRUE);
+
     /* start with nothing focused */
     focus_set_client(NULL);
 }
@@ -235,8 +238,7 @@ void focus_fallback(FallbackType type)
                 return;
             }
 
-    /* nothing to focus */
-    focus_set_client(NULL);
+    /* nothing to focus, and already set it to none above */
 }
 
 static void popup_cycle(Client *c, gboolean show)
@@ -248,7 +250,7 @@ static void popup_cycle(Client *c, gboolean show)
         Client *p = c;
         char *title;
 
-        a = screen_area(c->desktop);
+        a = screen_physical_area_monitor(0);
         popup_position(focus_cycle_popup, CenterGravity,
                        a->x + a->width / 2, a->y + a->height / 2);
 /*        popup_size(focus_cycle_popup, a->height/2, a->height/16);
@@ -266,9 +268,9 @@ static void popup_cycle(Client *c, gboolean show)
         if (p == c)
             title = NULL;
         else
-            title = g_strconcat((p->iconic ? p->icon_title : p->title),
+            title = g_strconcat((c->iconic ? c->icon_title : c->title),
                                 " - ",
-                                (c->iconic ? c->icon_title : c->title),
+                                (p->iconic ? p->icon_title : p->title),
                                 NULL);
 
         popup_show(focus_cycle_popup,