diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-01-11 16:20:53 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-11 16:20:53 -0500 |
| commit | 567fd15eebdd44e50cef140419dbf7a336708109 (patch) | |
| tree | 3b3691719c704d6da4454bd78e17ec8b495ee76a /openbox/screen.c | |
| parent | 3e9dbc01430193035e3d1f5832c019c3f9623db8 (diff) | |
| parent | e8200ae603f33b70824c125ba6b37bfaec7d89ea (diff) | |
Merge branch 'backport' into work
Conflicts:
configure.ac
data/rc.xml
openbox/client.c
openbox/event.c
openbox/focus_cycle.c
openbox/focus_cycle_popup.c
openbox/openbox.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
parser/parse.c
version.h.in
Diffstat (limited to 'openbox/screen.c')
| -rw-r--r-- | openbox/screen.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/openbox/screen.c b/openbox/screen.c index bce2faaf..2e69f11e 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -32,6 +32,7 @@ #include "focus.h" #include "focus_cycle.h" #include "popup.h" +#include "version.h" #include "obrender/render.h" #include "gettext.h" #include "obt/display.h" @@ -294,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; @@ -705,9 +711,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 +726,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) |