diff options
author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-11-03 15:01:35 -0700 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-11-03 15:01:35 -0700 |
commit | 2d6760f591a4138b2f4a32220e6a5aa855c123ca (patch) | |
tree | 57ce3c7b7c3f4ce4de77fe253889d6110f9f0bdc | |
parent | 0bffe6b38cdf6b21d9ec9b0abf0092d4d4eaef86 (diff) |
Revert "dix: don't XWarpPointer through the last slave anymore (#38313)"
This reverts commit bbe6a69da398dba93679c23c3c50f9916cb562ca.
This commit caused a regression.
See: http://xquartz.macosforge.org/trac/ticket/517#comment:10
-rw-r--r-- | dix/events.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/dix/events.c b/dix/events.c index 8068fc733..8e7f9c324 100644 --- a/dix/events.c +++ b/dix/events.c @@ -3351,21 +3351,16 @@ XineramaWarpPointer(ClientPtr client) { WindowPtr dest = NULL; int x, y, rc; - DeviceIntPtr dev; - SpritePtr pSprite; + SpritePtr pSprite = PickPointer(client)->spriteInfo->sprite; REQUEST(xWarpPointerReq); + if (stuff->dstWid != None) { rc = dixLookupWindow(&dest, stuff->dstWid, client, DixReadAccess); if (rc != Success) return rc; } - - /* Post through the XTest device */ - dev = PickPointer(client); - dev = GetXTestDevice(dev); - pSprite = dev->spriteInfo->sprite; x = pSprite->hotPhys.x; y = pSprite->hotPhys.y; @@ -3415,9 +3410,9 @@ XineramaWarpPointer(ClientPtr client) else if (y >= pSprite->physLimits.y2) y = pSprite->physLimits.y2 - 1; if (pSprite->hotShape) - ConfineToShape(dev, pSprite->hotShape, &x, &y); + ConfineToShape(PickPointer(client), pSprite->hotShape, &x, &y); - XineramaSetCursorPosition(dev, x, y, TRUE); + XineramaSetCursorPosition(PickPointer(client), x, y, TRUE); return Success; } @@ -3435,7 +3430,7 @@ ProcWarpPointer(ClientPtr client) WindowPtr dest = NULL; int x, y, rc; ScreenPtr newScreen; - DeviceIntPtr dev, tmp, xtest_dev = NULL; + DeviceIntPtr dev, tmp; SpritePtr pSprite; REQUEST(xWarpPointerReq); @@ -3448,13 +3443,11 @@ ProcWarpPointer(ClientPtr client) rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixWriteAccess); if (rc != Success) return rc; - if (IsXTestDevice(tmp, dev)) - xtest_dev = tmp; } } - /* Use the XTest device to actually move the pointer */ - dev = xtest_dev; + if (dev->lastSlave) + dev = dev->lastSlave; pSprite = dev->spriteInfo->sprite; #ifdef PANORAMIX |