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

[Sam Spilsbury]

Paints unity under fullscreen windows if there are any

[Mirco Müller (macslow)]

According to Sam this is not yet fully what they want to do, so it'll be left alone until he addresses the issue again from a different angle.

[Mirco Müller (macslow)]

The new work on this issue will be put in a new branch, so this is marked as "disapprove" to avoid others to waste time on trying to review it.

review: Disapprove

Unmerged revisions

730. By Sam Spilsbury on 2010-12-31

We have removed our own windows from the paint list - we can no longer
rely on them for paint order, so just paint underneath fullscreen windows
(since in reality we want to be on top of everything else).

This also cuts back the number of function calls we need - we can just
enable painting on fullscreen windows and nothing else

-------------- This line and the following will be ignored
--------------

modified:
  src/unityshell.cpp

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-01-04 13:56:05 +0000
+++ src/unityshell.cpp	2011-01-05 19:51:58 +0000
@@ -258,7 +258,7 @@
 {
   CompWindowList &pl = _withRemovedNuxWindows = cScreen->getWindowPaintList ();
   CompWindowList::iterator it = pl.end ();
-  const std::list <Window> &xwns = nux::XInputWindow::NativeHandleList ();
+  const std::list <Window> &xwns = nux::XInputWindow::NativeHandleList ();  
 
   while (it != pl.begin ())
   {
@@ -267,7 +267,7 @@
     if (std::find (xwns.begin (), xwns.end (), (*it)->id ()) != xwns.end ())
     {
       CompWindowList::iterator pit = it;
-      pl.erase (pit);
+      pl.erase (pit);      
     }
   }
 
@@ -289,20 +289,11 @@
 {
   if (uScreen->doShellRepaint && uScreen->allowWindowPaint)
   {
-    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);
-      }
-    }
+    /* Windows that are stacked above this one */
+    uScreen->paintDisplay (region);
   }
 
-  bool ret = gWindow->glDraw (matrix, attrib, region, mask);
-
-  return ret;
+  return gWindow->glDraw (matrix, attrib, region, mask);
 }
 
 /* Called whenever a window is mapped, unmapped, minimized etc */
@@ -317,6 +308,12 @@
 UnityWindow::stateChangeNotify (unsigned int lastState)
 {
   PluginAdapter::Default ()->NotifyStateChange (window, window->state (), lastState);
+
+  if (window->state () & CompWindowStateFullscreenMask)
+    gWindow->glDrawSetEnabled (this, true);
+  else
+    gWindow->glDrawSetEnabled (this, false);
+
   window->stateChangeNotify (lastState);
 }
 
@@ -547,7 +544,10 @@
     gWindow (GLWindow::get (window))
 {
   WindowInterface::setHandler (window);
-  GLWindowInterface::setHandler (gWindow);
+  GLWindowInterface::setHandler (gWindow, false);
+
+  if (window->state () & CompWindowStateFullscreenMask)
+    gWindow->glDrawSetEnabled (this, true);
 }
 
 UnityWindow::~UnityWindow ()