Merge lp:~unity-team/unity/unity.fix_847967 into lp:unity

[Sam Spilsbury]

Fixes LP#847967 and LP#848962

This requires an X Server patch at: http://lists.x.org/archives/xorg-devel/2011-September/024996.html

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/inputremover.cpp'
--- plugins/unityshell/src/inputremover.cpp	2011-09-09 13:21:10 +0000
+++ plugins/unityshell/src/inputremover.cpp	2011-09-13 14:00:42 +0000
@@ -22,6 +22,7 @@
 #include "inputremover.h"
 #include <X11/Xregion.h>
 #include <cstdio>
+#include <cstring>
 
 compiz::WindowInputRemover::WindowInputRemover (Display *dpy,
                                                 Window xid) :
@@ -36,6 +37,8 @@
   mBoundingRectOrdering (0),
   mRemoved (false)
 {
+  /* FIXME: roundtrip */
+  XShapeQueryExtension (mDpy, &mShapeEvent, &mShapeError);
 }
 
 compiz::WindowInputRemover::~WindowInputRemover ()
@@ -47,11 +50,23 @@
 void
 compiz::WindowInputRemover::sendShapeNotify ()
 {
-  /* Send a synthetic ShapeNotify event to the root window
+  /* Send a synthetic ShapeNotify event to the client and parent window
    * since we ignored shape events when setting visibility
    * in order to avoid cycling in the shape handling code -
    * ignore the sent shape notify event since that will
-   * be send_event = true */
+   * be send_event = true
+   *
+   * NB: We must send ShapeNotify events to both the client
+   * window and to the root window with SubstructureRedirectMask
+   * since NoEventMask will only deliver the event to the client
+   * (see xserver/dix/events.c on the handling of CantBeFiltered
+   *  messages)
+   *
+   * NB: This code will break if you don't have this patch on the
+   * X Server since XSendEvent for non-core events are broken.
+   *
+   * http://lists.x.org/archives/xorg-devel/2011-September/024996.html
+   */
 
   XShapeEvent  xsev;
   XEvent       *xev = (XEvent *) &xsev;
@@ -60,13 +75,17 @@
   Window       *children;
   int          x, y, xOffset, yOffset;
   unsigned int width, height, depth, border, nchildren;
-  int          shapeEvent, shapeError, shapeMask;
-
-  /* FIXME: roundtrip */
-  XShapeQueryExtension (mDpy, &shapeEvent, &shapeError);
-  shapeMask = XShapeInputSelected (mDpy, mShapeWindow);
-
-  xev->type   = shapeEvent + ShapeNotify;
+
+  memset (&xsev, 0, sizeof (XShapeEvent));
+
+  /* XXX: libXShape is weird and range checks the event
+   * type on event_to_wire so ensure that we are setting
+   * the event type on the right range */
+  xsev.type = (mShapeEvent - ShapeNotify) & 0x7f;
+  /* We must explicitly fill in these values to avoid padding errors */
+  xsev.serial = 0L;
+  xsev.send_event = TRUE;
+  xsev.display = mDpy;
   xsev.window = mShapeWindow;
 
   if (!mRemoved)
@@ -81,9 +100,10 @@
      * rect of the window shape according to the Shape extension
      * specification */
 
-    XTranslateCoordinates (mDpy, mShapeWindow, parentReturn, 0, 0, &xOffset, &yOffset, &childReturn);
+    XTranslateCoordinates (mDpy, mShapeWindow, parentReturn, 0, 0,
+			   &xOffset, &yOffset, &childReturn);
 
-    xev->type = ShapeBounding;
+    xsev.kind = ShapeBounding;
 
     /* Calculate extents of the bounding shape */
     if (!mNBoundingRects)
@@ -112,9 +132,10 @@
     }
 
     xsev.time = CurrentTime;
-    XSendEvent (mDpy, DefaultRootWindow (mDpy), false, shapeMask, xev);
 
-    xev->type = ShapeInput;
+    XSendEvent (mDpy, mShapeWindow, FALSE, NoEventMask, xev);
+    XSendEvent (mDpy, parentReturn, FALSE, NoEventMask, xev);
+    xsev.kind = ShapeInput;
 
     /* Calculate extents of the bounding shape */
     if (!mNInputRects)
@@ -143,14 +164,18 @@
     }
 
     xsev.time = CurrentTime;
-    XSendEvent (mDpy, DefaultRootWindow (mDpy), false, shapeMask, xev);
+
+    XSendEvent (mDpy, mShapeWindow, FALSE, NoEventMask, xev);
+    XSendEvent (mDpy, parentReturn, FALSE, NoEventMask, xev);
 
     if (children)
       XFree (children);
   }
   else
   {
-    xev->type = ShapeBounding;
+    XQueryTree (mDpy, mShapeWindow, &rootReturn, &parentReturn, &children, &nchildren);
+
+    xsev.kind = ShapeBounding;
 
     xsev.x = 0;
     xsev.y = 0;
@@ -159,15 +184,20 @@
     xsev.shaped = true;
 
     xsev.time = CurrentTime;
-    XSendEvent (mDpy, DefaultRootWindow (mDpy), false, shapeMask, xev);
+    XSendEvent (mDpy, mShapeWindow, FALSE, NoEventMask, xev);
+    XSendEvent (mDpy, parentReturn, FALSE, NoEventMask, xev);
 
-    xev->type = ShapeInput;
+    xsev.kind = ShapeInput;
 
     /* Both ShapeBounding and ShapeInput are null */
 
     xsev.time = CurrentTime;
-    XSendEvent (mDpy, DefaultRootWindow (mDpy), false, shapeMask, xev);
+
+    XSendEvent (mDpy, mShapeWindow, FALSE, NoEventMask, xev);
+    XSendEvent (mDpy, parentReturn, FALSE, NoEventMask, xev);
+
   }
+
 }
 
 bool
@@ -211,6 +241,17 @@
   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);
 
@@ -236,17 +277,21 @@
   XShapeCombineRectangles (mDpy, mShapeWindow, ShapeBounding, 0, 0,
                            NULL, 0, ShapeSet, 0);
 
-  XShapeSelectInput (mDpy, mShapeWindow, ShapeNotify);
-
-  sendShapeNotify ();
+  XShapeSelectInput (mDpy, mShapeWindow, mShapeMask);
 
   mRemoved = true;
+
+  sendShapeNotify ();
+
   return true;
 }
 
 bool
 compiz::WindowInputRemover::restore ()
 {
+
+  XShapeSelectInput (mDpy, mShapeWindow, NoEventMask);
+
   if (mRemoved)
   {
     if (mNInputRects)
@@ -283,9 +328,10 @@
 
   XShapeSelectInput (mDpy, mShapeWindow, mShapeMask);
 
-  sendShapeNotify ();
-
   mRemoved = false;
+
+  sendShapeNotify ();
+
   mNInputRects  = 0;
   mInputRects = NULL;
   mNBoundingRects = 0;
 
=== modified file 'plugins/unityshell/src/inputremover.h'
--- plugins/unityshell/src/inputremover.h	2011-09-09 13:21:10 +0000
+++ plugins/unityshell/src/inputremover.h	2011-09-13 14:00:42 +0000
@@ -57,6 +57,9 @@
   int           mBoundingRectOrdering;
   bool          mRemoved;
 
+  int           mShapeEvent;
+  int           mShapeError;
+
 };
 }
 
 
=== modified file 'tests/test-input-remover/test-input-remover.cpp'
--- tests/test-input-remover/test-input-remover.cpp	2011-08-24 13:46:21 +0000
+++ tests/test-input-remover/test-input-remover.cpp	2011-09-13 14:00:42 +0000
@@ -77,9 +77,10 @@
   Window                     xid;
   int                        time = 0;
   compiz::WindowInputRemover *remover;
-  bool		       shapeExt;
-  int			       shapeEvent;
-  int			       shapeError;
+  bool		             shapeExt;
+  int			     shapeEvent;
+  int			     shapeError;
+  XEvent                     event;
 
   if ((argc == 2 && std::string (argv[1]) == "--help") || argc > 3)
   {
@@ -109,34 +110,38 @@
   else
   {
     XSetWindowAttributes attrib;
-    XEvent		     e;
+
+    attrib.backing_pixel = 0x0;
 
     xid = XCreateWindow (dpy, DefaultRootWindow (dpy), 0, 0, 100, 100, 0,
                          DefaultDepth (dpy, DefaultScreen (dpy)), InputOutput,
-                         DefaultVisual (dpy, DefaultScreen (dpy)), 0, &attrib);
+                         DefaultVisual (dpy, DefaultScreen (dpy)), CWBackingPixel, &attrib);
 
     XSelectInput (dpy, xid, ExposureMask | StructureNotifyMask);
     XMapRaised (dpy, xid);
-    while (1)
+    do
     {
-	    XNextEvent (dpy, &e);
-	    bool exposed = false;
-
-	    switch (e.type)
-	    {
-      case Expose:
-		    if (e.xexpose.window == xid)
-          exposed = true;
-		    break;
-      default:
-		    break;
-	    }
-
-	    if (exposed)
+      XNextEvent (dpy, &event);
+      bool exposed = false;
+
+      switch (event.type)
+      {
+        case Expose:
+          if (event.xexpose.window == xid)
+            exposed = true;
+          break;
+        default:
+          break;
+      }
+
+      if (exposed)
         break;
-    }
+
+    } while (XPending (dpy));
   }
 
+  XShapeSelectInput (dpy, xid, ShapeNotifyMask);
+
   if (argc == 3)
     std::stringstream (argv[2]) >> std::dec >> time;
 
@@ -150,7 +155,26 @@
   remover->save ();
   std::cout << "Removing input shape of 0x" << std::hex << xid << std::dec << std::endl;
   remover->remove ();
-  XSync (dpy, false);
+
+  /* We won't get a synethetic ShapeNotify event if this
+   * is on a window that we don't own */
+
+  if (argc == 1)
+  {
+    do
+    {
+      XNextEvent (dpy, &event);
+      if (event.type == shapeEvent + ShapeNotify &&
+  	event.xany.send_event)
+      {
+        std::cout << "received ShapeNotify on 0x" << std::hex << xid << std::endl;
+  	break;
+      }
+
+    } while (XPending (dpy));
+  }
+  else
+    XSync (dpy, false);
 
   std::cout << "Getting input rects for 0x" << std::hex << xid << std::dec << std::endl;
   if (print_rects (dpy, xid))
@@ -163,9 +187,26 @@
 
   std::cout << "Waiting " << std::dec << time << " seconds" << std::endl;
   sleep (time);
+
   std::cout << "Restoring input shape of 0x" << std::hex << xid << std::dec << std::endl;
   remover->restore ();
-  XSync (dpy, false);
+
+  if (argc == 1)
+  {
+    do
+    {
+      XNextEvent (dpy, &event);
+      if (event.type == shapeEvent + ShapeNotify &&
+  	event.xany.send_event)
+      {
+          std::cout << "received ShapeNotify on 0x" << std::hex << xid << std::endl;
+  	break;
+      }
+
+    } while (XPending (dpy));
+  }
+  else
+    XSync (dpy, false);
 
   if (!print_rects (dpy, xid))
   {