Merge lp:~vanvugt/unity/fix-1021541 into lp:unity

[Daniel van Vugt]

Ensure the unity shell gets drawn before (below) windows stacked above it,
like DnD icons (LP: #1021541)

Ensure the unity shell gets drawn before (below) windows stacked above it,
like DnD icons (LP: #1021541)

UNBLOCK

[Sam Spilsbury (smspillaz)]

This looks okay.

If you're having trouble with override redirect windows not visually obscuring the dash and launcher, but logically doing so and thus causing the dash and launcher to flicker, I'd suggest using CompWindow::region () instead of CompWindow::geometry (), as the former will include the XShape region.

Either that or don't include override redirect windows in the calculation when the cursor is grabbed.

[Sam Spilsbury (smspillaz)]

A second note here, while it is not appropriate to enforce autotesting at this point since we're unblocking a release, however I'd strongly suggest using automated unit and integration testing as a means to test this code in future, or at least make it a priority to get it covered by autotest. People running trunk don't manually go through all the manual tests and the feedback loop that we have on the manual tests is quite (this is a fact of life).

[Sam Spilsbury (smspillaz)]

Oh wow, language fail, "while ..., I'd" ...

[Łukasz Zemczak (sil2100)]

Code looks fine and tested branch fixes the issue, +1

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/898/console reported an error when processing this lp:~vanvugt/unity/fix-1021541 branch.
Not merging it.

=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2012-06-21 06:55:53 +0000
+++ manual-tests/Dash.txt	2012-07-06 05:55:25 +0000
@@ -204,6 +204,21 @@
 Outcome:
   The Dash should close and the music file should open up in Firefox.
 
+
+DnD stacking
+------------
+
+Setup:
+#. Open the Dash (Super).
+
+Action:
+#. Drag any icon from the dash and wave it over the dash and launcher area.
+
+Outcome:
+  The icon being dragged is drawn on top of the dash and launcher. Never
+  below it.
+
+
 Lens Tests
 ============
 
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-07-04 02:37:23 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-07-06 05:55:25 +0000
@@ -916,7 +916,8 @@
 bool UnityScreen::forcePaintOnTop ()
 {
     return !allowWindowPaint ||
-      ((switcher_controller_->Visible() || launcher_controller_->IsOverlayOpen())
+      ((switcher_controller_->Visible() ||
+        PluginAdapter::Default()->IsExpoActive())
        && !fullscreen_windows_.empty () && (!(screen->grabbed () && !screen->otherGrabExist (NULL))));
 }
 
@@ -1241,14 +1242,14 @@
 #endif
 
   // CompRegion has no clear() method. So this is the fastest alternative.
-  aboveShell = CompRegion();
+  fullscreenRegion = CompRegion();
   nuxRegion = CompRegion();
 
   /* glPaintOutput is part of the opengl plugin, so we need the GLScreen base class. */
   ret = gScreen->glPaintOutput(attrib, transform, region, output, mask);
 
 #ifndef USE_MODERN_COMPIZ_GL
-  if (doShellRepaint && !force && aboveShell.contains(*output))
+  if (doShellRepaint && !force && fullscreenRegion.contains(*output))
     doShellRepaint = false;
 
   if (doShellRepaint)
@@ -1313,6 +1314,7 @@
   compizDamageNux(cScreen->currentDamage());
 
   didShellRepaint = false;
+  firstWindowAboveShell = NULL;
 }
 
 void UnityScreen::donePaint()
@@ -2286,13 +2288,17 @@
   /*
    * The occlusion pass tests windows from TOP to BOTTOM. That's opposite to
    * the actual painting loop.
+   *
+   * Detect uScreen->fullscreenRegion here. That represents the region which
+   * fully covers the shell on its output. It does not include regular windows
+   * stacked above the shell like DnD icons or Onboard etc.
    */
   if (isNuxWindow(window))
   {
     if (mask & PAINT_WINDOW_OCCLUSION_DETECTION_MASK)
     {
       uScreen->nuxRegion += window->geometry();
-      uScreen->nuxRegion -= uScreen->aboveShell;
+      uScreen->nuxRegion -= uScreen->fullscreenRegion;
     }
     return false;  // Ensure nux windows are never painted by compiz
   }
@@ -2302,14 +2308,17 @@
                               PAINT_WINDOW_TRANSLUCENT_MASK |
                               PAINT_WINDOW_TRANSFORMED_MASK |
                               PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
-    if (!(mask & nonOcclusionBits))
+    if (!(mask & nonOcclusionBits) &&
+        (window->state() & CompWindowStateFullscreenMask))
         // And I've been advised to test other things, but they don't work:
         // && (attrib.opacity == OPAQUE)) <-- Doesn't work; Only set in glDraw
         // && !window->alpha() <-- Doesn't work; Opaque windows often have alpha
     {
-      uScreen->aboveShell += window->geometry();
-      uScreen->aboveShell -= uScreen->nuxRegion;
+      uScreen->fullscreenRegion += window->geometry();
+      uScreen->fullscreenRegion -= uScreen->nuxRegion;
     }
+    if (uScreen->nuxRegion.isEmpty())
+      uScreen->firstWindowAboveShell = window;
   }
 
   GLWindowPaintAttrib wAttrib = attrib;
@@ -2370,38 +2379,17 @@
     }
   }
 
-  /*
-   * Paint the shell in *roughly* the compiz stacking order. This is only
-   * approximate because we're painting all the nux windows as soon as we find
-   * the bottom-most nux window (from bottom to top).
-   * But remember to avoid painting the shell if it's within the aboveShell
-   * region.
-   */
   if (uScreen->doShellRepaint &&
       !uScreen->forcePaintOnTop () &&
-      !uScreen->aboveShell.contains(window->geometry())
+      window == uScreen->firstWindowAboveShell &&
+      !uScreen->fullscreenRegion.contains(window->geometry())
      )
   {
-    std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();
-    unsigned int size = xwns.size();
-
-    for (CompWindow* w = window; w && uScreen->doShellRepaint; w = w->prev)
-    {
-      auto id = w->id();
-
-      for (unsigned int i = 0; i < size; ++i)
-      {
-        if (xwns[i] == id)
-        {
 #ifdef USE_MODERN_COMPIZ_GL
-          uScreen->paintDisplay();
+    uScreen->paintDisplay();
 #else
-          uScreen->paintDisplay(region, matrix, mask);
+    uScreen->paintDisplay(region, matrix, mask);
 #endif
-          break;
-        }
-      }
-    }
   }
 
   if (window->type() == CompWindowTypeDesktopMask)
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-07-04 02:37:23 +0000
+++ plugins/unityshell/src/unityshell.h	2012-07-06 05:55:25 +0000
@@ -283,7 +283,8 @@
   CompOutput* _last_output;
 
   CompRegion nuxRegion;
-  CompRegion aboveShell;
+  CompRegion fullscreenRegion;
+  CompWindow* firstWindowAboveShell;
 
   nux::Property<nux::Geometry> primary_monitor_;