Merge lp:~jamalta/unity/677255-unity-fullscreen-2 into lp:unity

[Jamal Fanaian]

Drawing unity screen underneath fullscreen windows.

[Jason Smith (jassmith)]

The correct solution is to ensure that the input windows nux creates are stacked properly. The problem with your solution is that the input windows and where we paint can get out of sync.

[Jamal Fanaian (jamalta)]

Ah, that makes sense. I will try to dig around how to do that, but chances are someone will fix it before I find a solution to the problem. It is still a lot of fun. Thanks so much for the input!

[Neil J. Patel (njpatel)]

Hi Jamal, thanks for the merge request! I think that the method Jason proposed has landed in trunk late last week, so I don't think we have the fullscreen problem anymore, so don't look into it :)

review: Disapprove

[Jamal Fanaian (jamalta)]

It's no problem at all... I started getting overwhelmed over this issue, as my knowledge of the X is limited. I moved back into a smaller bug for now so hopefully I can get that fixed tonight.

Thanks so much, and I appreciate all the useful input.

Unmerged revisions

649. By Jamal Fanaian on 2010-12-01

Draw unity screen underneath fullscreen windows.

=== modified file 'src/unity.cpp'
--- src/unity.cpp	2010-11-26 08:12:02 +0000
+++ src/unity.cpp	2010-12-01 03:41:19 +0000
@@ -261,15 +261,16 @@
 {
     if (uScreen->doShellRepaint && uScreen->allowWindowPaint)
     {
-	const std::list <Window> &xwns = nux::XInputWindow::NativeHandleList ();
+        const std::list <Window> &xwns = nux::XInputWindow::NativeHandleList ();
 
-	for (CompWindow *w = window; w && uScreen->doShellRepaint; w = w->prev)
-	{
-	    if (std::find (xwns.begin (), xwns.end (), w->id ()) != xwns.end ())
-	    {
-		uScreen->paintDisplay (region);
-	    }
-	}
+        for (CompWindow *w = window; w && uScreen->doShellRepaint; w = w->prev)
+        {
+            if (w->type () & CompWindowTypeFullscreenMask || 
+            std::find (xwns.begin (), xwns.end (), w->id ()) != xwns.end ())
+            {
+                uScreen->paintDisplay (region);
+            }
+        }
     }
 
     bool ret = gWindow->glDraw (matrix, attrib, region, mask);