diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-25 15:00:03 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-25 15:00:03 +0930 |
| commit | 5f9c10e8da0d9d96cc00a38cdf9a8c3030063e03 (patch) | |
| tree | 266601462296fe3e51633e066c1fd9a287346fc0 /Xi | |
| parent | e54311395e1e7ae458c8ce59da0914706c4a04f6 (diff) | |
Clean up DeviceIntPtr, prepare for Server 1.4 ABI. Move sprite-related
information into a new SpriteInfoRec, remove isMPDev flag.
Diffstat (limited to 'Xi')
| -rw-r--r-- | Xi/querydp.c | 4 | ||||
| -rw-r--r-- | Xi/warpdevp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Xi/querydp.c b/Xi/querydp.c index a24dad0a5..af93fed2f 100644 --- a/Xi/querydp.c +++ b/Xi/querydp.c @@ -101,7 +101,7 @@ ProcXQueryDevicePointer(register ClientPtr client) if (pDev->valuator->motionHintWindow) MaybeStopHint(pDev, client); - pSprite = pDev->pSprite; + pSprite = pDev->spriteInfo->sprite; rep.repType = X_Reply; rep.RepType = X_QueryDevicePointer; rep.length = 0; @@ -111,7 +111,7 @@ ProcXQueryDevicePointer(register ClientPtr client) rep.rootX = pSprite->hot.x; rep.rootY = pSprite->hot.y; rep.child = None; - rep.shared = (pDev->isMPDev) ? xFalse : xTrue; + rep.shared = (pDev->spriteInfo->spriteOwner) ? xFalse : xTrue; if (pSprite->hot.pScreen == pWin->drawable.pScreen) { diff --git a/Xi/warpdevp.c b/Xi/warpdevp.c index a9ddb0b6b..8df7e14db 100644 --- a/Xi/warpdevp.c +++ b/Xi/warpdevp.c @@ -102,7 +102,7 @@ ProcXWarpDevicePointer(register ClientPtr client) } } - pSprite = pDev->pSprite; + pSprite = pDev->spriteInfo->sprite; x = pSprite->hotPhys.x; y = pSprite->hotPhys.y; |