[Xfce4-commits] r24177 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2006-12-23 20:46:47 +0000 (Sat, 23 Dec 2006)
New Revision: 24177

Modified:
   xfwm4/trunk/src/events.c
Log:
Set the demands attention flag with focus prevention enabled only (Bug #2678)

Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c	2006-12-23 18:36:30 UTC (rev 24176)
+++ xfwm4/trunk/src/events.c	2006-12-23 20:46:47 UTC (rev 24177)
@@ -1702,24 +1702,21 @@
         {
             /* 
                Focus stealing prevention:
-               Some apps tend to focus the window directly. 
-               - If focus stealing prevention is enabled, we revert the 
-                 user set focus to the window that we think has focus and 
-                 then set the demand attention flag.
-               - Otherwise, we update the focus as requested and we raise 
-                 the window so the user can see it.
+               Some apps tend to focus the window directly. If focus stealing prevention is enabled, 
+               we revert the user set focus to the window that we think has focus and then set the 
+               demand attention flag.
              */
             if (screen_info->params->prevent_focus_stealing)
             {
                 TRACE ("Setting focus back to \"%s\" (0x%lx)", user_focus->name, user_focus->window); 
                 clientSetFocus (user_focus->screen_info, user_focus, getXServerTime (display_info), NO_FOCUS_FLAG);
-            }
 
-            if (current_focus)
-            {
-                TRACE ("Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window); 
-                FLAG_SET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
-                clientSetNetState (c);
+                if (current_focus)
+                {
+                    TRACE ("Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window); 
+                    FLAG_SET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
+                    clientSetNetState (c);
+                }
             }
         }