composite: correctly update the unredirected window during grabs

1 files changed, 13 insertions, 4 deletions

diff --git a/composite/compwindow.c b/composite/compwindow.c
index a79ef50aa..8e9a04200 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -1248,21 +1248,30 @@ CompositeGetRedirectedWindowInput (DeviceIntPtr pDev,
 				   WindowPtr    pWin)
 {
     CompClientIRWindowPtr cciw = GetCompClientIRWindow (pWin);
-
+    WindowPtr pGrabWin = pDev->deviceGrab.grab ?
+					 pDev->deviceGrab.grab->window : NULL;
     /* During a grab we don't want to update the unredirectedWindow, but just
-     * keep using the one that was being used when grab activated
+     * keep using the one that was being used when grab activated. However, if
+     * the window isn't part of the hierachy of the grabbed window, we should
+     * update it anyways, in order to have the expected behaviour.
      */
+    Bool update = pGrabWin ? !(IsParent (pWin, pGrabWin) ||
+			       IsParent (pGrabWin, pWin)) : TRUE;
+
     if (cciw && cciw->pDest)
     {
 	CompIRWindowPtr ciw = GetCompIRWindow (cciw->pDest);
-	if (!pDev->deviceGrab.grab)
+	/* We also need to check that the dest window isn't */
+	update = update && pGrabWin ? !(IsParent (cciw->pDest, pGrabWin) ||
+				IsParent (pGrabWin, cciw->pDest)) : TRUE;
+	if (update)
 	    ciw->unredirectedWindow[pDev->id] = pWin;
 	return cciw->pDest;
     }
     else
     {
 	CompIRWindowPtr ciw = GetCompIRWindow (pWin);
-	if (ciw && !pDev->deviceGrab.grab)
+	if (ciw && update)
 	    ciw->unredirectedWindow[pDev->id] = NULL;
 	return pWin;
     }