Merge lp:~canonical-dx-team/unity/unity.paint_order_fixes_gl_draw into lp:unity

[Sam Spilsbury]

Fixes the unity interface drawing on top of the gnome-screensaver by finding windows in the draw queue that should be on top of the unity shell and painting the unity shell directly underneath them.

Fixes the unity interface drawing on top of the gnome-screensaver by finding windows in the draw queue that should be on top of the unity shell and painting the unity shell directly underneath them.

Testing:
 -> Unity shell should always be visible on screen under normal usage
 -> Normal windows should go underneath the unity shell (eg Unityshell's input windows should be stacked underneath them
 -> gnome-screensaver should obstruct unityshell. (Eg no more shell visible on lock screen)

[Jason Smith (jassmith)]

Awesome

review: Approve

=== modified file 'src/unity.cpp'
--- src/unity.cpp	2010-11-15 23:07:58 +0000
+++ src/unity.cpp	2010-11-24 11:41:22 +0000
@@ -49,8 +49,6 @@
  * and the current time of the execution of the functions in milliseconds). It's part of the composite
  * plugin's interface
  */
- 
-static bool paint_required = false;
 static UnityScreen *uScreen = 0;
 
 void
@@ -58,8 +56,8 @@
 {
     /* At the end of every function, you must call BaseClass->functionName (args) in order to pass on
      * the call chain */
+
     cScreen->preparePaint (ms);
-    paint_required = true;
 }
 
 void
@@ -108,6 +106,8 @@
     nuxPrologue ();
     wt->RenderInterfaceFromForeignCmd ();
     nuxEpilogue ();
+
+    doShellRepaint = false;
 }
 
 /* This is the guts of the paint function. You can transform the way the entire output is painted
@@ -123,12 +123,14 @@
 {
     bool ret;
 
+    doShellRepaint = true;
+
     /* glPaintOutput is part of the opengl plugin, so we need the GLScreen base class. */
     ret = gScreen->glPaintOutput (attrib, transform, region, output, mask);
-    
-    if (paint_required)
-        paintDisplay (region);
-    
+
+    if (doShellRepaint)
+	paintDisplay (region);
+
     return ret;
 }
 
@@ -191,9 +193,9 @@
 
     if (screen->otherGrabExist ("deco", "move", NULL))
     {
-      wt->ProcessForeignEvent (event, NULL);
+	wt->ProcessForeignEvent (event, NULL);
     }
-}
+}			
 
 bool
 UnityScreen::initPluginForScreen (CompPlugin *p)
@@ -238,7 +240,6 @@
  * attributes like brightness/saturation etc to play around with. GLMatrix is the window's
  * transformation matrix. the unsigned int is the mask, have a look at opengl.h on what you can do
  * with it */
-
 bool
 UnityWindow::glPaint (const GLWindowPaintAttrib &attrib, // Brightness, Saturation, Opacity etc
       const GLMatrix &transform, // Transformation Matrix
@@ -256,22 +257,21 @@
 			     const CompRegion 	&region,
 			     unsigned int	mask)
 {
-    bool ret;
-    
-    if (paint_required && uScreen && window->type () & (CompWindowTypeMenuMask | 
-                                                        CompWindowTypeDropdownMenuMask | 
-                                                        CompWindowTypePopupMenuMask |
-                                                        CompWindowTypeComboMask |
-                                                        CompWindowTypeTooltipMask |
-                                                        CompWindowTypeDndMask
-                                                        ))
+    if (uScreen->doShellRepaint)
     {
-        uScreen->paintDisplay (region);
-        paint_required = false;
+	const std::list <Window> &xwns = nux::XInputWindow::NativeHandleList ();
+
+	for (CompWindow *w = window; w; w = w->prev)
+	{
+	    if (std::find (xwns.begin (), xwns.end (), w->id ()) != xwns.end ())
+	    {
+		uScreen->paintDisplay (region);
+	    }
+	}
     }
 
-    ret = gWindow->glDraw (matrix, attrib, region, mask);
-
+    bool ret = gWindow->glDraw (matrix, attrib, region, mask);
+    
     return ret;
 }
 /* This get's called whenever a window's rect is damaged. You can do stuff here or you can adjust the damage
@@ -424,7 +424,8 @@
     PluginClassHandler <UnityScreen, CompScreen> (screen), // Initiate PluginClassHandler class template
     screen (screen),
     cScreen (CompositeScreen::get (screen)),
-    gScreen (GLScreen::get (screen))
+    gScreen (GLScreen::get (screen)),
+    doShellRepaint (false)
 {
     int (*old_handler) (Display *, XErrorEvent *);
     old_handler = XSetErrorHandler (NULL);
 
=== modified file 'src/unity.h'
--- src/unity.h	2010-11-12 10:58:04 +0000
+++ src/unity.h	2010-11-24 11:41:22 +0000
@@ -156,6 +156,8 @@
 	
 	bool
 	initPluginForScreen (CompPlugin *p);
+
+	bool			doShellRepaint;
 	
     private: