[PATCH 3/3] dix: CheckVirtualMotion must clip to siblings

[Adam Jackson]

As with the previous ConfineCursorToWindow patch, we need to clip by
siblings here.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 dix/events.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index d05b3b5..230afb4 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -812,7 +812,7 @@ CheckVirtualMotion(DeviceIntPtr pDev, QdEventPtr qe, WindowPtr pWin)
 
             i = PanoramiXNumScreens - 1;
 
-            RegionCopy(&pSprite->Reg2, &pSprite->windows[i]->borderSize);
+            RegionCopy(&pSprite->Reg2, &pSprite->windows[i]->borderClip);
             off_x = screenInfo.screens[i]->x;
             off_y = screenInfo.screens[i]->y;
 
@@ -824,7 +824,7 @@ CheckVirtualMotion(DeviceIntPtr pDev, QdEventPtr qe, WindowPtr pWin)
                     RegionTranslate(&pSprite->Reg2, x, y);
 
                 RegionUnion(&pSprite->Reg2, &pSprite->Reg2,
-                            &pSprite->windows[i]->borderSize);
+                            &pSprite->windows[i]->borderClip);
 
                 off_x = screenInfo.screens[i]->x;
                 off_y = screenInfo.screens[i]->y;
@@ -839,7 +839,7 @@ CheckVirtualMotion(DeviceIntPtr pDev, QdEventPtr qe, WindowPtr pWin)
             }
         }
 
-        lims = *RegionExtents(&pWin->borderSize);
+        lims = *RegionExtents(&pWin->borderClip);
         if (pSprite->hot.x < lims.x1)
             pSprite->hot.x = lims.x1;
         else if (pSprite->hot.x >= lims.x2)
@@ -859,7 +859,7 @@ CheckVirtualMotion(DeviceIntPtr pDev, QdEventPtr qe, WindowPtr pWin)
 #endif
         {
             if (wBoundingShape(pWin))
-                reg = &pWin->borderSize;
+                reg = &pWin->borderClip;
         }
 
         if (reg)
-- 
1.9.3