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 45b5501218416dc408c90e1da593b52abb41bae7..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)
@@ -245,8 +247,10 @@ static void popup_cycle(Client *c, gboolean show)
         popup_hide(focus_cycle_popup);
     } else {
         Rect *a;
+        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);
@@ -257,8 +261,22 @@ static void popup_cycle(Client *c, gboolean show)
          */
         popup_size(focus_cycle_popup, 320, 48);
 
-        popup_show(focus_cycle_popup, (c->iconic ? c->icon_title : c->title),
-                   client_icon(c, 48, 48));
+        /* use the transient's parent's title/icon */
+        while (p->transient_for && p->transient_for != TRAN_GROUP)
+            p = p->transient_for;
+
+        if (p == c)
+            title = NULL;
+        else
+            title = g_strconcat((c->iconic ? c->icon_title : c->title),
+                                " - ",
+                                (p->iconic ? p->icon_title : p->title),
+                                NULL);
+
+        popup_show(focus_cycle_popup,
+                   (title ? title : (c->iconic ? c->icon_title : c->title)),
+                   client_icon(p, 48, 48));
+        g_free(title);
     }
 }
 
@@ -278,22 +296,8 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
             frame_adjust_focus(focus_client->frame, TRUE);
         goto done_cycle;
     } else if (done) {
-        if (focus_cycle_target) {
-            Client *t;
-
-            /* actually focus a transient */
-
-            /* fist, try for a modal */
-            t = client_focus_target(focus_cycle_target);
-            if (t != focus_cycle_target)
-                focus_cycle_target = t;
-            else
-                /* just grab the deepest transient you can find */
-                while (focus_cycle_target->transients)
-                    focus_cycle_target = focus_cycle_target->transients->data;
-
+        if (focus_cycle_target)
             client_activate(focus_cycle_target);
-        }
         goto done_cycle;
     }
     if (!first)
@@ -320,8 +324,13 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
         }
         /*ft = client_focus_target(it->data);*/
         ft = it->data;
-        if (ft->transient_for == NULL && client_normal(ft) &&
-            client_can_focus(ft)) {
+        /* we don't use client_can_focus here, because that doesn't let you
+           focus an iconic window, but we want to be able to, so we just check
+           if the focus flags on the window allow it, and its on the current
+           desktop */
+        if (ft->transients == NULL && client_normal(ft) &&
+            ((ft->can_focus || ft->focus_notify) &&
+             (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))) {
             if (ft != focus_cycle_target) { /* prevents flicker */
                 if (focus_cycle_target)
                     frame_adjust_focus(focus_cycle_target->frame, FALSE);