Merge lp:~smspillaz/compiz-workarounds-plugin/compiz-workarounds-plugin.fix_923087 into lp:compiz-workarounds-plugin

[Sam Spilsbury]

Fixes LP #923087

The workarounds plugin would forcibly remove _NET_WM_STATE_FOCUSED whenever it refreshed _NET_WM_STATE

[lp:~smspillaz/compiz-workarounds-plugin/compiz-workarounds-plugin.fix_923087]

119. By Sam Spilsbury on 2012-02-16

Use a regular ptr

120. By Sam Spilsbury on 2012-02-21

Also allow no state data

[Jason Smith (jassmith)]

Code looks fine

review: Approve

[Daniel van Vugt (vanvugt)]

The bug number is a typo. It is actually bug 932087.

=== modified file 'src/workarounds.cpp'
--- src/workarounds.cpp	2011-08-12 06:06:48 +0000
+++ src/workarounds.cpp	2012-02-21 03:55:21 +0000
@@ -548,39 +548,13 @@
 void
 WorkaroundsScreen::setWindowState (unsigned int state, Window id)
 {
+    int i = 0;
     Atom data[32];
-    int  i = 0;
-
-    if (state & CompWindowStateModalMask)
-        data[i++] = Atoms::winStateModal;
-    if (state & CompWindowStateStickyMask)
-        data[i++] = Atoms::winStateSticky;
-    if (state & CompWindowStateMaximizedVertMask)
-        data[i++] = Atoms::winStateMaximizedVert;
-    if (state & CompWindowStateMaximizedHorzMask)
-        data[i++] = Atoms::winStateMaximizedHorz;
-    if (state & CompWindowStateShadedMask)
-        data[i++] = Atoms::winStateShaded;
-    if (state & CompWindowStateSkipTaskbarMask)
-        data[i++] = Atoms::winStateSkipTaskbar;
-    if (state & CompWindowStateSkipPagerMask)
-        data[i++] = Atoms::winStateSkipPager;
-    if (state & CompWindowStateHiddenMask)
-        data[i++] = Atoms::winStateHidden;
-    if (state & CompWindowStateFullscreenMask)
-        data[i++] = Atoms::winStateFullscreen;
-    if (state & CompWindowStateAboveMask)
-        data[i++] = Atoms::winStateAbove;
-    if (state & CompWindowStateBelowMask)
-        data[i++] = Atoms::winStateBelow;
-    if (state & CompWindowStateDemandsAttentionMask)
-        data[i++] = Atoms::winStateDemandsAttention;
-    if (state & CompWindowStateDisplayModalMask)
-        data[i++] = Atoms::winStateDisplayModal;
-
+
+    i = compiz::window::fillStateData (state, data);
     XChangeProperty (screen->dpy (), id, Atoms::winState,
-                     XA_ATOM, 32, PropModeReplace,
-                     (unsigned char *) data, i);
+	             XA_ATOM, 32, PropModeReplace,
+	             (unsigned char *) data, i);
 }
 
 void