From 59487419644deeff26abb8517722fd5a78b73515 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 19 Sep 2010 18:44:33 +0200 Subject: [PATCH] Fix a number of asserts Conflicts: openbox/event.c --- openbox/event.c | 2 +- openbox/screen.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openbox/event.c b/openbox/event.c index bafeaf0b..38f914ca 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -825,7 +825,7 @@ void event_enter_client(ObClient *client) ob_debug_type(OB_DEBUG_FOCUS, "using enter event with serial %lu " "on client 0x%x", event_curserial, client->window); - if (client_enter_focusable(client) && client_can_focus(client) && (!config_focus_delay || event_time_after(client_left_focused, event_curtime - config_focus_delay /*milliseconds here, so not *1000 */))) { + if (client_enter_focusable(client) && client_can_focus(client) && (!config_focus_delay || (!client_left_focused || event_time_after(client_left_focused, event_curtime - config_focus_delay /*milliseconds here, so not *1000 */)))) { if (config_focus_delay) { ObFocusDelayData *data; diff --git a/openbox/screen.c b/openbox/screen.c index 8a39f41f..9053243f 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -297,9 +297,11 @@ gboolean screen_annex(void) supported[i++] = OBT_PROP_ATOM(OB_FOCUS); supported[i++] = OBT_PROP_ATOM(OB_WM_ACTION_UNDECORATE); supported[i++] = OBT_PROP_ATOM(OB_WM_STATE_UNDECORATED); + supported[i++] = OBT_PROP_ATOM(OB_WM_STATE_LOCKED); supported[i++] = OBT_PROP_ATOM(OPENBOX_PID); supported[i++] = OBT_PROP_ATOM(OB_THEME); supported[i++] = OBT_PROP_ATOM(OB_CONFIG_FILE); + supported[i++] = OBT_PROP_ATOM(OB_LAST_DESKTOP); supported[i++] = OBT_PROP_ATOM(OB_CONTROL); supported[i++] = OBT_PROP_ATOM(OB_VERSION); supported[i++] = OBT_PROP_ATOM(OB_APP_ROLE); @@ -309,6 +311,7 @@ gboolean screen_annex(void) supported[i++] = OBT_PROP_ATOM(OB_APP_GROUP_NAME); supported[i++] = OBT_PROP_ATOM(OB_APP_GROUP_CLASS); supported[i++] = OBT_PROP_ATOM(OB_APP_TYPE); + supported[i++] = OBT_PROP_ATOM(OB_TARGET_WINDOW); g_assert(i == num_support); OBT_PROP_SETA32(obt_root(ob_screen), -- 2.34.1