X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=a8a15673f8e372bfe97ff15084c8719efa985d60;hb=a1746ab2158da2324aefb7ce81e7b5edc9c41e79;hp=5686a93969b979f321b8f086b20f566fbf7979bb;hpb=c230443c6596039f426542f5a286120891a745c5;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 5686a939..a8a15673 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -202,7 +202,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;
 
     ob_debug("Managing window: 0x%lx", window);
 
@@ -3816,12 +3816,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,