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 b8477bcb148c2cb4297baa3524c1381c67016b1c..12d30d27e8fffe46d1ab02e24ad1b5dd4e64e375 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -250,7 +250,7 @@ static void popup_cycle(Client *c, gboolean show)
         Client *p = c;
         char *title;
 
-        a = screen_physical_area_xinerama(0);
+        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);
@@ -268,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,