Merge branch 'backport' into work

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 5074f18606c39e5684d6139250f6a09155cf07de..2e69f11e7fb94197b5e805969dd87e26a69fbb2e 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -30,8 +30,10 @@
 #include "frame.h"
 #include "event.h"
 #include "focus.h"
+#include "focus_cycle.h"
 #include "popup.h"
-#include "render/render.h"
+#include "version.h"
+#include "obrender/render.h"
 #include "gettext.h"
 #include "obt/display.h"
 #include "obt/prop.h"
@@ -293,15 +295,20 @@ gboolean screen_annex(void)
     supported[i++] = OBT_PROP_ATOM(OB_THEME);
     supported[i++] = OBT_PROP_ATOM(OB_CONFIG_FILE);
     supported[i++] = OBT_PROP_ATOM(OB_CONTROL);
-    supported[i++] = OBT_PROP_ATOM(OB_ROLE);
-    supported[i++] = OBT_PROP_ATOM(OB_NAME);
-    supported[i++] = OBT_PROP_ATOM(OB_CLASS);
+    supported[i++] = OBT_PROP_ATOM(OB_VERSION);
+    supported[i++] = OBT_PROP_ATOM(OB_APP_ROLE);
+    supported[i++] = OBT_PROP_ATOM(OB_APP_NAME);
+    supported[i++] = OBT_PROP_ATOM(OB_APP_CLASS);
+    supported[i++] = OBT_PROP_ATOM(OB_APP_TYPE);
     g_assert(i == num_support);
 
     OBT_PROP_SETA32(obt_root(ob_screen),
                     NET_SUPPORTED, ATOM, supported, num_support);
     g_free(supported);
 
+    OBT_PROP_SETS(RootWindow(obt_display, ob_screen), OB_VERSION, utf8,
+                  OPENBOX_VERSION);
+
     screen_tell_ksplash();
 
     return TRUE;
@@ -703,18 +710,24 @@ void screen_set_desktop(guint num, gboolean dofocus)
     for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
         if (WINDOW_IS_CLIENT(it->data)) {
             ObClient *c = it->data;
-            if (client_hide(c) && c == focus_client) {
-                /* c was focused and we didn't do fallback clearly so make sure
-                   openbox doesnt still consider the window focused.
-                   this happens when using NextWindow with allDesktops, since
-                   it doesnt want to move focus on desktop change, but the
-                   focus is not going to stay with the current window, which
-                   has now disappeared */
-                focus_set_client(NULL);
+            if (client_hide(c)) {
+                if (c == focus_client) {
+                    /* c was focused and we didn't do fallback clearly so make
+                       sure openbox doesnt still consider the window focused.
+                       this happens when using NextWindow with allDesktops,
+                       since it doesnt want to move focus on desktop change,
+                       but the focus is not going to stay with the current
+                       window, which has now disappeared.
+                       only do this if the client was actually hidden,
+                       otherwise it can keep focus. */
+                    focus_set_client(NULL);
+                }
             }
         }
     }
 
+    focus_cycle_addremove(NULL, TRUE);
+
     event_end_ignore_all_enters(ignore_start);
 
     if (event_curtime != CurrentTime)
@@ -949,6 +962,8 @@ void screen_show_desktop_popup(guint d, gboolean perm)
                                   config_desktop_popup_time * 1000,
                                   hide_desktop_popup_func, desktop_popup,
                                   g_direct_equal, NULL);
+    if (perm)
+        desktop_popup_perm = TRUE;
 
     g_free(a);
 }