Merge lp:~canonical-dx-team/unity/unity.remove-io-from-pl into lp:unity

[Sam Spilsbury]

Hook getWindowPaintList and remove our input windows.

This ensures that we don't have lots of useless wrapped function calls on glPaint (small optimization). Also means that other plugins are not trying to do things to our windows which never get painted anyways.

[Neil J. Patel (njpatel)]

Works well, code looks good, approved.

review: Approve

=== modified file 'src/unity.cpp'
--- src/unity.cpp	2010-11-26 08:12:02 +0000
+++ src/unity.cpp	2010-11-26 09:25:48 +0000
@@ -230,20 +230,25 @@
     return "Unity";
 }
 
-bool
-UnityWindow::glPaint (const GLWindowPaintAttrib &attrib, const GLMatrix &matrix,
-	 const CompRegion &region, unsigned int mask)
+const CompWindowList &
+UnityScreen::getWindowPaintList ()
 {
+  CompWindowList &pl = _withRemovedNuxWindows = cScreen->getWindowPaintList ();
+  CompWindowList::iterator it = pl.end ();
   const std::list <Window> &xwns = nux::XInputWindow::NativeHandleList ();
-  GLWindowPaintAttrib new_tribs (attrib);
 
-  if (std::find (xwns.begin (), xwns.end (), window->id ()) != xwns.end ())
+  while (it != pl.begin ())
   {
-    new_tribs.opacity = 0;
+    it--;
+
+    if (std::find (xwns.begin (), xwns.end (), (*it)->id ()) != xwns.end ())
+    {
+      CompWindowList::iterator pit = it;
+      pl.erase (pit);
+    }
   }
 
-
-  return gWindow->glPaint (new_tribs, matrix, region, mask);
+  return pl;
 }
 
 /* handle window painting in an opengl context
@@ -355,6 +360,7 @@
 
     /* Wrap compiz interfaces */
     ScreenInterface::setHandler (screen);
+    CompositeScreenInterface::setHandler (cScreen);
     GLScreenInterface::setHandler (gScreen);
     
     StartupNotifyService::Default ()->SetSnDisplay (screen->snDisplay (), screen->screenNum ());
 
=== modified file 'src/unity.h'
--- src/unity.h	2010-11-26 08:12:02 +0000
+++ src/unity.h	2010-11-26 09:25:48 +0000
@@ -84,6 +84,9 @@
 		       		       CompOutput *,
 				       unsigned int);
 
+	/* Pop our InputOutput windows from the paint list */
+	const CompWindowList & getWindowPaintList ();
+
 	/* handle X11 events */
 	void handleEvent (XEvent *);
 
@@ -138,6 +141,7 @@
 	/* handle paint order */
 	bool	  doShellRepaint;
 	bool      allowWindowPaint;
+	CompWindowList _withRemovedNuxWindows;
 
 	friend class UnityWindow;
 };
@@ -157,10 +161,6 @@
 	CompWindow      *window;
 	GLWindow	*gWindow;
 	
-	bool
-	glPaint (const GLWindowPaintAttrib &, const GLMatrix &,
-           const CompRegion &, unsigned int);
-	
 	/* basic window draw function */
 	bool 
 	glDraw (const GLMatrix 	&matrix,