X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=cbcaad798604af9eb61d2a119c3459aa6ea9e222;hb=6cf3357036561134383198cc8b853abb3fe5a982;hp=bb98e084cadd9017c55205fe81fa6792d0a19671;hpb=965ed8907a5dd81d5ffbc93b67a672fa78833854;p=chaz%2Fopenbox diff --git a/openbox/screen.c b/openbox/screen.c index bb98e084..cbcaad79 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -32,7 +32,8 @@ #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" @@ -294,15 +295,21 @@ 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_TITLE); + 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; @@ -705,9 +712,6 @@ void screen_set_desktop(guint num, gboolean dofocus) if (WINDOW_IS_CLIENT(it->data)) { ObClient *c = it->data; if (client_hide(c)) { - /* in the middle of cycling..? kill it. */ - focus_cycle_stop(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. @@ -723,6 +727,8 @@ void screen_set_desktop(guint num, gboolean dofocus) } } + focus_cycle_addremove(NULL, TRUE); + event_end_ignore_all_enters(ignore_start); if (event_curtime != CurrentTime)