Merge lp:~smspillaz/compiz-core/compiz-core.fix_904806v2 into lp:compiz-core/0.9.5

[Sam Spilsbury]

      Support _NET_WM_STATE_FOCUSED (LP #904806)

      +_NET_WM_STATE_FOCUSED indicates whether the window's decorations are drawn in an
      +active state. Clients MUST regard it as a read-only hint. It cannot be set at
      +map time or changed via a _NET_WM_STATE client message. The window given by
      +_NET_ACTIVE_WINDOW will usually have this hint, but at times other windows may
      +as well, if they have a strong association with the active window and will be
      +considered as a unit with it by the user. Clients that modify the appearance of
      +internal elements when a toplevel has keyboard focus SHOULD check for the
      +availability of this state in _NET_SUPPORTED and, if it is available,
      +use it in preference to tracking focus via FocusIn events. By doing so they will
      +match the window decorations and accurately reflect the intentions of the Window
      +Manager.

      [1] http://cgit.freedesktop.org/xdg/xdg-specs/commit/?id=e34d84a17341bb82af38fb84c6c070bb58b6d5b5

XWMQA Test: lp:~smspillaz/+junk/net-wm-state-focused-test

[Alan Griffiths (alan-griffiths)]

OK AFAICS

review: Approve

=== modified file 'include/core/atoms.h'
--- include/core/atoms.h	2009-02-26 06:04:15 +0000
+++ include/core/atoms.h	2012-01-19 17:54:25 +0000
@@ -81,6 +81,7 @@
     extern Atom winStateBelow;
     extern Atom winStateDemandsAttention;
     extern Atom winStateDisplayModal;
+    extern Atom winStateFocused;
 
     extern Atom winActionMove;
     extern Atom winActionResize;
 
=== modified file 'include/core/window.h'
--- include/core/window.h	2011-09-19 12:54:22 +0000
+++ include/core/window.h	2012-01-19 17:54:25 +0000
@@ -93,6 +93,7 @@
 #define CompWindowStateBelowMask	    (1 << 10)
 #define CompWindowStateDemandsAttentionMask (1 << 11)
 #define CompWindowStateDisplayModalMask	    (1 << 12)
+#define CompWindowStateFocusedMask	    (1 << 13)
 
 #define MAXIMIZE_STATE (CompWindowStateMaximizedHorzMask | \
 			CompWindowStateMaximizedVertMask)
@@ -256,6 +257,8 @@
 	virtual bool alpha ();
 	virtual bool isFocussable ();
 	virtual bool managed ();
+
+	virtual bool focused ();
 };
 
 /**
@@ -263,7 +266,7 @@
  * window state, geometry, etc. between Compiz and the X server.
  */
 class CompWindow :
-    public WrapableHandler<WindowInterface, 19>,
+    public WrapableHandler<WindowInterface, 20>,
     public PluginClassStorage
 {
     public:
@@ -553,6 +556,8 @@
 	WRAPABLE_HND (17, WindowInterface, bool, isFocussable);
 	WRAPABLE_HND (18, WindowInterface, bool, managed);
 
+	WRAPABLE_HND (19, WindowInterface, bool, focused);
+
 	friend class PrivateWindow;
 	friend class CompScreen;
 	friend class PrivateScreen;
 
=== modified file 'src/atoms.cpp'
--- src/atoms.cpp	2009-02-26 06:04:15 +0000
+++ src/atoms.cpp	2012-01-19 17:54:25 +0000
@@ -78,6 +78,7 @@
     Atom winStateBelow;
     Atom winStateDemandsAttention;
     Atom winStateDisplayModal;
+    Atom winStateFocused;
 
     Atom winActionMove;
     Atom winActionResize;
@@ -228,6 +229,8 @@
 	    XInternAtom (dpy, "_NET_WM_STATE_DEMANDS_ATTENTION", 0);
 	winStateDisplayModal     =
 	    XInternAtom (dpy, "_NET_WM_STATE_DISPLAY_MODAL", 0);
+	winStateFocused		 =
+	    XInternAtom (dpy, "_NET_WM_STATE_FOCUSED", 0);
 
 	winActionMove          = XInternAtom (dpy, "_NET_WM_ACTION_MOVE", 0);
 	winActionResize        =
 
=== modified file 'src/event.cpp'
--- src/event.cpp	2012-01-19 06:08:11 +0000
+++ src/event.cpp	2012-01-19 17:54:25 +0000
@@ -1906,9 +1906,18 @@
 				}
 			    }
 
+			    active->changeState (active->focused () ?
+						 active->state () | CompWindowStateFocusedMask :
+						 active->state () & ~CompWindowStateFocusedMask);
+
 			    active->priv->updatePassiveButtonGrabs ();
 			}
 
+			if (w->focused ())
+			    state |= w->state () | CompWindowStateFocusedMask;
+			else
+			    state &= w->state () & ~CompWindowStateFocusedMask;
+
 			w->priv->updatePassiveButtonGrabs ();
 
 			priv->addToCurrentActiveWindowHistory (w->id ());
 
=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-01-19 06:08:11 +0000
+++ src/screen.cpp	2012-01-19 17:54:25 +0000
@@ -1328,6 +1328,8 @@
 	data[i++] = Atoms::winStateDemandsAttention;
     if (state & CompWindowStateDisplayModalMask)
 	data[i++] = Atoms::winStateDisplayModal;
+    if (state & CompWindowStateFocusedMask)
+        data[i++] = Atoms::winStateFocused;
 
     XChangeProperty (priv->dpy, id, Atoms::winState,
 		     XA_ATOM, 32, PropModeReplace,
@@ -2198,6 +2200,7 @@
     atoms.push_back (Atoms::winStateAbove);
     atoms.push_back (Atoms::winStateBelow);
     atoms.push_back (Atoms::winStateDemandsAttention);
+    atoms.push_back (Atoms::winStateFocused);
 
     atoms.push_back (Atoms::winOpacity);
     atoms.push_back (Atoms::winBrightness);
 
=== modified file 'src/window.cpp'
--- src/window.cpp	2012-01-19 06:08:11 +0000
+++ src/window.cpp	2012-01-19 17:54:25 +0000
@@ -5699,6 +5699,10 @@
 WindowInterface::managed ()
     WRAPABLE_DEF (managed);
 
+bool
+WindowInterface::focused ()
+    WRAPABLE_DEF (focused);
+
 Window
 CompWindow::id ()
 {
@@ -6056,6 +6060,13 @@
 }
 
 bool
+CompWindow::focused ()
+{
+    WRAPABLE_HND_FUNCTN_RETURN (bool, focused);
+    return screen->activeWindow () == id ();
+}
+
+bool
 CompWindow::grabbed ()
 {
     return priv->grabbed;