Merge lp:~smspillaz/compiz-core/compiz-core.core_923087 into lp:compiz-core

[Sam Spilsbury]

Refactors out fillStateData since it was being duplicated in a plugin that was causing bug 932087

[Alan Griffiths (alan-griffiths)]

This seems overcomplicated:

62 + boost::scoped_array <Atom> data (new Atom[32]);

over

62 + Atom data[32];

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Agreed. scoped_array makes no sense for such a small array. You'd literally be adding hundreds if not thousands of bytes of template code for something that doesn't need it.

If a fixed size array works, then it should be used over a template.

[lp:~smspillaz/compiz-core/compiz-core.core_923087]

3005. By Sam Spilsbury on 2012-02-16

Use a regular ptr

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Daniel van Vugt (vanvugt)]

Looks good. No obvious regressions either.

I do still wonder if core needs to contain multiple different namespaces though.

review: Approve

=== modified file 'include/core/window.h'
--- include/core/window.h	2012-01-31 14:52:20 +0000
+++ include/core/window.h	2012-02-16 10:16:31 +0000
@@ -204,6 +204,14 @@
  */
 typedef compiz::window::extents::Extents CompWindowExtents;
 
+namespace compiz
+{
+    namespace window
+    {
+        unsigned int fillStateData (unsigned int state, Atom *data);
+    }
+}
+
 /**
  * Specifies the area of the screen taken up by strut windows
  */

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-02-16 01:11:23 +0000
+++ src/screen.cpp	2012-02-16 10:16:31 +0000
@@ -1411,10 +1411,9 @@
     return state;
 }
 
-void
-PrivateScreen::setWindowState (unsigned int state, Window id)
+unsigned int
+compiz::window::fillStateData (unsigned int state, Atom *data)
 {
-    Atom data[32];
     int	 i = 0;
 
     if (state & CompWindowStateModalMask)
@@ -1444,11 +1443,21 @@
     if (state & CompWindowStateDisplayModalMask)
 	data[i++] = Atoms::winStateDisplayModal;
     if (state & CompWindowStateFocusedMask)
-        data[i++] = Atoms::winStateFocused;
-
-    XChangeProperty (dpy, id, Atoms::winState,
-		     XA_ATOM, 32, PropModeReplace,
-		     (unsigned char *) data, i);
+	data[i++] = Atoms::winStateFocused;
+
+    return i;
+}
+
+void
+PrivateScreen::setWindowState (unsigned int state, Window id)
+{
+    int i = 0;
+    Atom data[32];
+
+    if ((i = compiz::window::fillStateData (state, data)))
+        XChangeProperty (dpy, id, Atoms::winState,
+	                 XA_ATOM, 32, PropModeReplace,
+	                 (unsigned char *) data, i);
 }
 
 unsigned int