Merge lp:~alan-griffiths/compiz-core/isVisible into lp:compiz-core

[Alan Griffiths]

Small piece of code tidy-up.

=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2012-01-31 14:52:20 +0000
+++ src/privatewindow.h	2012-02-14 15:30:24 +0000
@@ -34,12 +34,6 @@
 #include <core/timer.h>
 #include "privatescreen.h"
 
-#define WINDOW_INVISIBLE(w)				          \
-    ((w)->attrib.map_state != IsViewable		       || \
-     (w)->attrib.x + (w)->width  + (w)->output.right  <= 0     || \
-     (w)->attrib.y + (w)->height + (w)->output.bottom <= 0     || \
-     (w)->attrib.x - (w)->output.left >= (int) screen->width () || \
-     (w)->attrib.y - (w)->output.top >= (int) screen->height () )
 
 typedef CompWindowExtents CompFullscreenMonitorSet;
 
@@ -61,6 +55,8 @@
 
 	bool isGroupTransient (Window clientLeader);
 
+	bool isInvisible() const;
+
 	static bool stackLayerCheck (CompWindow *w,
 				     Window     clientLeader,
 				     CompWindow *below);
 
=== modified file 'src/window.cpp'
--- src/window.cpp	2012-01-31 14:52:20 +0000
+++ src/window.cpp	2012-02-14 15:30:24 +0000
@@ -71,6 +71,16 @@
 	    w->pluginClasses.resize (windowPluginClassIndices.size ());
 }
 
+inline bool
+PrivateWindow::isInvisible() const
+{
+    return attrib.map_state != IsViewable ||
+     attrib.x + width  + output.right  <= 0 ||
+     attrib.y + height + output.bottom <= 0 ||
+     attrib.x - output.left >= (int) screen->width () ||
+     attrib.y - output.top >= (int) screen->height ();
+}
+
 bool
 PrivateWindow::isAncestorTo (CompWindow *transient,
 			     CompWindow *ancestor)
@@ -1841,7 +1851,7 @@
 
 	resizeNotify (dx, dy, dwidth, dheight);
 
-	priv->invisible = WINDOW_INVISIBLE (priv);
+	priv->invisible = priv->isInvisible ();
     }
     else if (priv->geometry.x () != gm.x () || priv->geometry.y () != gm.y ())
     {
@@ -1858,7 +1868,7 @@
 	if (!priv->frameRegion.isEmpty ())
 	    priv->frameRegion.translate (dx, dy);
 
-	priv->invisible = WINDOW_INVISIBLE (priv);
+	priv->invisible = priv->isInvisible ();
 
 	moveNotify (dx, dy, true);
     }
@@ -2192,7 +2202,7 @@
 	    if (!priv->frameRegion.isEmpty ())
 		priv->frameRegion.translate (dx, dy);
 
-	    priv->invisible = WINDOW_INVISIBLE (priv);
+	    priv->invisible = priv->isInvisible ();
 
 	    moveNotify (dx, dy, immediate);
 	}
@@ -6459,7 +6469,7 @@
 
     if (priv->attrib.map_state == IsViewable)
     {
-	priv->invisible = WINDOW_INVISIBLE (priv);
+	priv->invisible = priv->isInvisible ();
     }
 }