From 59eb52b7c6ccbe83742e5eb8b40b5e32bb6600cc Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 5 Nov 2008 18:48:10 +0100 Subject: Don't move windows to current desktop on net_active_window if the event didn't come from the user. Instead, just activate the flashy thinger. --- openbox/client.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'openbox/client.c') diff --git a/openbox/client.c b/openbox/client.c index d6321949..39a03468 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -3904,12 +3904,15 @@ static void client_present(ObClient *self, gboolean here, gboolean raise, client_focus(self); } -/* this function exists to map to the client_activate message in the ewmh, - the user arg is unused because nobody uses it correctly anyway. */ +/* this function exists to map to the net_active_window message in the ewmh */ void client_activate(ObClient *self, gboolean here, gboolean raise, gboolean unshade, gboolean user) { - client_present(self, here, raise, unshade); + if (user || (self->desktop == DESKTOP_ALL || + self->desktop == screen_desktop)) + client_present(self, here, raise, unshade); + else + client_hilite(self, TRUE); } static void client_bring_windows_recursive(ObClient *self, -- cgit v1.2.3 From 98b1c84bb5caca8a5590e40ad4a4f63a9eb2b869 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Mon, 10 Nov 2008 23:34:50 +0100 Subject: Fix a problem pointed out by clang openbox/client.c:269:10: warning: incompatible pointer types passing 'gint *', expected 'guint32 *' if (!OBT_PROP_GET32(self->window, NET_WM_USER_TIME, CARDINAL, &user_time)) ^~~~~~~~~~~~~~ --- openbox/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openbox/client.c') diff --git a/openbox/client.c b/openbox/client.c index 39a03468..03bbfe48 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -247,7 +247,7 @@ void client_manage(Window window, ObPrompt *prompt) gboolean transient = FALSE; Rect place, *monitor; Time launch_time, map_time; - gint user_time; + guint32 user_time; grab_server(TRUE); -- cgit v1.2.3