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

[Daniel van Vugt]

Don't bind the FBO if it's possible it won't get painted and unbound. That
could lead the the screen freezing while fullscreen windows are open.
(LP: #1024911)

Don't bind the FBO if it's possible it won't get painted and unbound. That
could lead the the screen freezing while fullscreen windows are open.
(LP: #1024911)

[Daniel van Vugt (vanvugt)]

And yes, I did think of doing a dummy paint/unbind of _fbo to solve this bug. However that would be wasting GPU resources and slow down rendering of fullscreen windows, which would defeat the whole purpose of the regionalDamage change.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:2502
http://jenkins.qa.ubuntu.com/job/unity-ci/78/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/78/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/78/console

review: Approve (continuous-integration)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:2503
http://jenkins.qa.ubuntu.com/job/unity-ci/79/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/79/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/79/console

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Works for me, Approved!

review: Approve

[Daniel van Vugt (vanvugt)]

Seems to conflict with the fix for bug 1024459

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

I take that back the conflict is just a bug in the other proposal. This one was fine.

review: Approve

=== modified file 'manual-tests/WindowManagement.txt'
--- manual-tests/WindowManagement.txt	2012-03-23 15:14:42 +0000
+++ manual-tests/WindowManagement.txt	2012-07-16 05:58:22 +0000
@@ -49,3 +49,23 @@
 
 Outcome:
   The window should be in the maximized state.
+
+
+Fullscreen windows
+--------------------
+Tests rendering of fullscreen windows.
+
+Action:
+#. Set a window to full screen. e.g. F11 in a web browser.
+#. Verify you can scroll the window.
+#. Tap the Super key.
+#. Verify you can still scroll the window.
+
+Outcome:
+  The fullscreen window should never look corrupt and always be scrollable.
+
+Recovery (in case of failure):
+#. Tap the Super key again.
+#. Tap F11 to leave full screen.
+#. Press Super+S twice to force a full screen redraw.
+

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-07-12 23:09:29 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-07-16 05:58:22 +0000
@@ -1202,6 +1202,42 @@
   }
 }
 
+bool UnityScreen::shellCouldBeHidden(CompOutput const& output)
+{
+  std::vector<Window> const& nuxwins(nux::XInputWindow::NativeHandleList());
+
+  // Loop through windows from front to back
+  CompWindowList const& wins = screen->windows();
+  for ( CompWindowList::const_reverse_iterator r = wins.rbegin()
+      ; r != wins.rend()
+      ; r++
+      )
+  {
+    CompWindow* w = *r;
+
+    /*
+     * The shell is hidden if there exists any window that fully covers
+     * the output and is in front of all Nux windows on that output.
+     */
+    if (w->isMapped() &&
+        !(w->state () & CompWindowStateHiddenMask) &&
+        w->geometry().contains(output))
+    {
+      return true;
+    }
+    else
+    {
+      for (Window n : nuxwins)
+      {
+        if (w->id() == n && output.intersects(w->geometry()))
+          return false;
+      }
+    }
+  }
+
+  return false;
+}
+
 /* called whenever we need to repaint parts of the screen */
 bool UnityScreen::glPaintOutput(const GLScreenPaintAttrib& attrib,
                                 const GLMatrix& transform,
@@ -1234,8 +1270,13 @@
    *   once an fbo is bound any further
    *   attempts to bind it will only increment
    *   its bind reference so make sure that
-   *   you always unbind as much as you bind */
-  if (doShellRepaint)
+   *   you always unbind as much as you bind
+   *
+   * But NOTE: It is only safe to bind the FBO if !shellCouldBeHidden.
+   *           Otherwise it's possible painting won't occur and that would
+   *           confuse the state of the FBO.
+   */
+  if (doShellRepaint && !shellCouldBeHidden(*output))
     _fbo->bind (nux::Geometry (output->x (), output->y (), output->width (), output->height ()));
 #endif
 

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-07-06 13:11:25 +0000
+++ plugins/unityshell/src/unityshell.h	2012-07-16 05:58:22 +0000
@@ -113,6 +113,8 @@
 
   void damageRegion(const CompRegion &region);
 
+  bool shellCouldBeHidden(CompOutput const& output);
+
   /* paint on top of all windows if we could not find a window
    * to paint underneath */
   bool glPaintOutput(const GLScreenPaintAttrib&,