Merge lp:~smspillaz/unity/unity.kindof_fix_977189 into lp:unity

[Sam Spilsbury]

== Problem ==

See bug 977189 - the nvidia driver seems to optimize away pixmaps backing windows that have no bounding shape set.

== Solution ==

Since we don't really need to remove the bounding shape unless a custom
bounding shape was set, we can fix this in 99% of cases by simply not
removing the bounding shape of the window when there is no custom bounding
shape set.

Note that this doesn't fix every case, namely chromium with client side decorations
is still broken.

The only thing I can think of for those cases is to snapshot windows with a custom
bounding shape and replace calls to glDrawTexture for those windows with the snapshotted
texture. This is a rather complicated operation though and will slow down minimization
for large windows.

== Tests ==

Covered by existing test progs.

build/tests/test-input-remover

[Didier Roche-Tolomelli (didrocks)]

There is no test at all upstream for that. Sam, can you please add at least a manual test for it?

[Didier Roche-Tolomelli (didrocks)]

FYI, this didn't fix it for me, but we noted that if I maxiximize a window (so loosing its decoration), minimizing it and then spread it, the window content is around. So there is probably something that can be worked on. Putting it in work in progress.

review: Needs Fixing

Unmerged revisions

2265. By Sam Spilsbury on 2012-04-11

Kind of fix LP#977189

The nvidia driver seems to free the backing pixmap of the window whenever
its input shape is completely removed as an optimization. That causes windows
to go white.

Since we don't really need to remove the bounding shape unless a custom
bounding shape was set, we can fix this in 99% of cases by simply not
removing the bounding shape of the window when there is no custom bounding
shape set

=== modified file 'plugins/unityshell/src/inputremover.cpp'
--- plugins/unityshell/src/inputremover.cpp	2012-03-24 02:57:48 +0000
+++ plugins/unityshell/src/inputremover.cpp	2012-04-11 03:57:21 +0000
@@ -109,20 +109,10 @@
     XTranslateCoordinates (mDpy, mShapeWindow, parentReturn, 0, 0,
 			   &xOffset, &yOffset, &childReturn);
 
-    xsev.kind = ShapeBounding;
+    if (mNBoundingRects > 0)
+    {
+      xsev.kind = ShapeBounding;
 
-    /* Calculate extents of the bounding shape */
-    if (!mNBoundingRects)
-    {
-      /* No set input shape, we must use the client geometry */
-      xsev.x = x - xOffset;
-      xsev.y = y - yOffset;
-      xsev.width = width; 
-      xsev.height = height;
-      xsev.shaped = false;
-    }
-    else
-    {
       Region      boundingRegion = XCreateRegion ();
 
       for (int i = 0; i < mNBoundingRects; i++)
@@ -135,12 +125,14 @@
       xsev.shaped = true;
 
       XDestroyRegion (boundingRegion);
+    
+
+      xsev.time = CurrentTime;
+
+      XSendEvent (mDpy, mShapeWindow, FALSE, NoEventMask, xev);
+      XSendEvent (mDpy, parentReturn, FALSE, NoEventMask, xev);
     }
 
-    xsev.time = CurrentTime;
-
-    XSendEvent (mDpy, mShapeWindow, FALSE, NoEventMask, xev);
-    XSendEvent (mDpy, parentReturn, FALSE, NoEventMask, xev);
     xsev.kind = ShapeInput;
 
     /* Calculate extents of the bounding shape */
@@ -281,8 +273,9 @@
 
   XShapeCombineRectangles (mDpy, mShapeWindow, ShapeInput, 0, 0,
                            NULL, 0, ShapeSet, 0);
-  XShapeCombineRectangles (mDpy, mShapeWindow, ShapeBounding, 0, 0,
-                           NULL, 0, ShapeSet, 0);
+  if (mNBoundingRects > 0)
+    XShapeCombineRectangles (mDpy, mShapeWindow, ShapeBounding, 0, 0,
+                             NULL, 0, ShapeSet, 0);
 
   XShapeSelectInput (mDpy, mShapeWindow, mShapeMask);
 
@@ -320,17 +313,12 @@
       mNInputRects = 0;
     }
 
-    if (mNBoundingRects)
+    if (mNBoundingRects > 0)
     {
       XShapeCombineRectangles (mDpy, mShapeWindow, ShapeBounding, 0, 0,
                          mBoundingRects, mNBoundingRects,
                          ShapeSet, mBoundingRectOrdering);
     }
-    else
-    {
-      XShapeCombineMask (mDpy, mShapeWindow, ShapeBounding,
-                   0, 0, None, ShapeSet);
-    }
 
     if (mBoundingRects)
     {