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

[Sam Spilsbury]

Don't remove bounding rects (LP: #1091600).

Don't remove bounding rects (LP: #1091600). Test this in conjunction with https://code.launchpad.net/~compiz-team/compiz/compiz.fix_729979.1/+merge/147281.

[Marco Trevisan (Treviño) (3v1n0)]

Oh, nice fix! :)

review: Approve

=== modified file 'plugins/unityshell/src/inputremover.cpp'
--- plugins/unityshell/src/inputremover.cpp	2012-04-12 13:23:29 +0000
+++ plugins/unityshell/src/inputremover.cpp	2013-02-08 03:07:52 +0000
@@ -36,9 +36,6 @@
   mInputRects (NULL),
   mNInputRects (0),
   mInputRectOrdering (0),
-  mBoundingRects (NULL),
-  mNBoundingRects (0),
-  mBoundingRectOrdering (0),
   mRemoved (false)
 {
   /* FIXME: roundtrip */
@@ -109,38 +106,6 @@
     XTranslateCoordinates (mDpy, mShapeWindow, parentReturn, 0, 0,
 			   &xOffset, &yOffset, &childReturn);
 
-    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++)
-        XUnionRectWithRegion (&(mBoundingRects[i]), boundingRegion, boundingRegion);
-
-      xsev.x = boundingRegion->extents.x1 - xOffset;
-      xsev.y = boundingRegion->extents.y1 - yOffset;
-      xsev.width = boundingRegion->extents.x2 - boundingRegion->extents.x1;
-      xsev.height = boundingRegion->extents.y2 - boundingRegion->extents.y1;
-      xsev.shaped = true;
-
-      XDestroyRegion (boundingRegion);
-    }
-
-    xsev.time = CurrentTime;
-
-    XSendEvent (mDpy, mShapeWindow, FALSE, NoEventMask, xev);
-    XSendEvent (mDpy, parentReturn, FALSE, NoEventMask, xev);
     xsev.kind = ShapeInput;
 
     /* Calculate extents of the bounding shape */
@@ -180,19 +145,6 @@
   else
   {
     XQueryTree (mDpy, mShapeWindow, &rootReturn, &parentReturn, &children, &nchildren);
-
-    xsev.kind = ShapeBounding;
-
-    xsev.x = 0;
-    xsev.y = 0;
-    xsev.width = 0;
-    xsev.height = 0;
-    xsev.shaped = true;
-
-    xsev.time = CurrentTime;
-    XSendEvent (mDpy, mShapeWindow, FALSE, NoEventMask, xev);
-    XSendEvent (mDpy, parentReturn, FALSE, NoEventMask, xev);
-
     xsev.kind = ShapeInput;
 
     /* Both ShapeBounding and ShapeInput are null */
@@ -244,27 +196,6 @@
   mNInputRects = count;
   mInputRectOrdering = ordering;
 
-  rects = XShapeGetRectangles (mDpy, mShapeWindow, ShapeBounding,
-                               &count, &ordering);
-
-  /* check if the returned shape exactly matches the window shape -
-   * if that is true, the window currently has no set bounding shape */
-  if ((count == 1) &&
-      (rects[0].x == -((int) border)) &&
-      (rects[0].y == -((int) border)) &&
-      (rects[0].width == (width + border)) &&
-      (rects[0].height == (height + border)))
-  {
-    count = 0;
-  }
-
-  if (mBoundingRects)
-    XFree (mBoundingRects);
-
-  mBoundingRects = rects;
-  mNBoundingRects = count;
-  mBoundingRectOrdering = ordering;
-
   mShapeMask = XShapeInputSelected (mDpy, mShapeWindow);
 
   return true;
@@ -281,8 +212,6 @@
 
   XShapeCombineRectangles (mDpy, mShapeWindow, ShapeInput, 0, 0,
                            NULL, 0, ShapeSet, 0);
-  XShapeCombineRectangles (mDpy, mShapeWindow, ShapeBounding, 0, 0,
-                           NULL, 0, ShapeSet, 0);
 
   XShapeSelectInput (mDpy, mShapeWindow, mShapeMask);
 
@@ -319,25 +248,6 @@
       mInputRects = NULL;
       mNInputRects = 0;
     }
-
-    if (mNBoundingRects)
-    {
-      XShapeCombineRectangles (mDpy, mShapeWindow, ShapeBounding, 0, 0,
-                         mBoundingRects, mNBoundingRects,
-                         ShapeSet, mBoundingRectOrdering);
-    }
-    else
-    {
-      XShapeCombineMask (mDpy, mShapeWindow, ShapeBounding,
-                   0, 0, None, ShapeSet);
-    }
-
-    if (mBoundingRects)
-    {
-      XFree (mBoundingRects);
-      mBoundingRects = NULL;
-      mNBoundingRects = 0;
-    }
   }
 
   XShapeSelectInput (mDpy, mShapeWindow, mShapeMask);

=== modified file 'plugins/unityshell/src/inputremover.h'
--- plugins/unityshell/src/inputremover.h	2012-04-27 11:42:56 +0000
+++ plugins/unityshell/src/inputremover.h	2013-02-08 03:07:52 +0000
@@ -73,9 +73,6 @@
   int           mNInputRects;
   int           mInputRectOrdering;
 
-  XRectangle    *mBoundingRects;
-  int           mNBoundingRects;
-  int           mBoundingRectOrdering;
   bool          mRemoved;
 
   int           mShapeEvent;