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 b8477bcb148c2cb4297baa3524c1381c67016b1c..8d5e6c547755654b037779ebedd6cba3c3cc996f 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -111,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);
     }
@@ -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,