add misc.h with some standard enumerations with proper prefixing and capitalizations.

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 68b208cedde1d52f03bdaff8f3e531a4f9b1b241..8d5e6c547755654b037779ebedd6cba3c3cc996f 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);
 }
@@ -108,7 +111,7 @@ void focus_set_client(Client *client)
         push_to_top(client);
 
     /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */
-    if (ob_state != State_Exiting) {
+    if (ob_state != OB_STATE_EXITING) {
         active = client ? client->window : None;
         PROP_SET32(ob_root, net_active_window, window, active);
     }
@@ -230,13 +233,12 @@ void focus_fallback(FallbackType type)
                    be fallback targets there. */
                 !((Client*)it->data)->fullscreen &&
                 client_can_focus(it->data)) {
-                gboolean r = client_focus(sit->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)
@@ -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);
@@ -258,11 +262,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((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);
     }
 }
 
@@ -310,9 +324,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);