add decoration state to the frame struct. make client_configure adjust the frame...

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 5909ca773449ece98bee8e3043e222739740ef42..0a88865aa8736846775d102ddab443b5b93e7066 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -229,11 +229,13 @@ void focus_fallback(FallbackType type)
                    checks for this is in transient/group fallbacks, so they can
                    be fallback targets there. */
                 !((Client*)it->data)->fullscreen &&
-                client_focus(it->data))
+                client_can_focus(it->data)) {
+                gboolean r = client_focus(it->data);
+                assert(r);
                 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)
@@ -242,6 +244,8 @@ 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);
         popup_position(focus_cycle_popup, CenterGravity,
@@ -255,11 +259,21 @@ static void popup_cycle(Client *c, gboolean show)
         popup_size(focus_cycle_popup, 320, 48);
 
         /* use the transient's parent's title/icon */
-        while (c->transient_for && c->transient_for != TRAN_GROUP)
-            c = c->transient_for;
-
-        popup_show(focus_cycle_popup, (c->iconic ? c->icon_title : c->title),
-                   client_icon(c, 48, 48));
+        while (p->transient_for && p->transient_for != TRAN_GROUP)
+            p = p->transient_for;
+
+        if (p == c)
+            title = NULL;
+        else
+            title = g_strconcat((p->iconic ? p->icon_title : p->title),
+                                " - ",
+                                (c->iconic ? c->icon_title : c->title),
+                                NULL);
+
+        popup_show(focus_cycle_popup,
+                   (title ? title : (c->iconic ? c->icon_title : c->title)),
+                   client_icon(p, 48, 48));
+        g_free(title);
     }
 }
 
@@ -307,9 +321,13 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
         }
         /*ft = client_focus_target(it->data);*/
         ft = it->data;
-        if (ft->transients == NULL && /*ft == it->data &&*/client_normal(ft) &&
-            (ft->can_focus || ft->focus_notify) &&
-            (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)) {
+        /* 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);