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

[Olivier Fourdan]

Author: olivier
Date: 2006-12-30 21:58:51 +0000 (Sat, 30 Dec 2006)
New Revision: 24223

Modified:
   xfwm4/trunk/src/netwm.c
Log:
Do not apply NET_WM_STATE_DEMANDS_ATTENTION if client is already focused, as some apps seem to request NET_WM_STATE_DEMANDS_ATTENTION state even while focused (See comment #14 in bug #2678)

Modified: xfwm4/trunk/src/netwm.c
===================================================================
--- xfwm4/trunk/src/netwm.c	2006-12-30 20:29:37 UTC (rev 24222)
+++ xfwm4/trunk/src/netwm.c	2006-12-30 21:58:51 UTC (rev 24223)
@@ -35,6 +35,7 @@
 #include "compositor.h"
 #include "display.h"
 #include "frame.h"
+#include "focus.h"
 #include "hints.h"
 #include "misc.h"
 #include "netwm.h"
@@ -120,7 +121,9 @@
         TRACE ("clientSetNetState : hidden");
         data[i++] = display_info->atoms[NET_WM_STATE_HIDDEN];
     }
-    if (FLAG_TEST (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION))
+    /* Do not apply NET_WM_STATE_DEMANDS_ATTENTION if client is already focused */
+    if ((c != clientGetFocusOrPending ()) && 
+        FLAG_TEST (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION))
     {
         TRACE ("clientSetNetState : demands_attention");
         data[i++] = display_info->atoms[NET_WM_STATE_DEMANDS_ATTENTION];