diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-01 17:19:37 +1030 |
|---|---|---|
| committer | Peter Hutterer <whot@hyena.localdomain> | 2007-03-01 17:19:37 +1030 |
| commit | 43bd35fcf85b51b7e5714844bade90184dbd746f (patch) | |
| tree | 76120c1a607fff3e0e1d7d65fc0ad7373fc28133 /Xext/xtest.c | |
| parent | 2a35d44b6d87f96a7ce90dc8f0142f48cc176e95 (diff) | |
dix: Remove InitSprite, work can be done by InitializeSprite.
Free sprite struct if a spriteOwner is paired.
xfree86: Use PairDevices instead of passing booleans around when creating a
sprite.
Xext: Switch back to using LookupPointer/KeyboardDevice instead of
inputInfo.xyz.
Diffstat (limited to 'Xext/xtest.c')
| -rw-r--r-- | Xext/xtest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Xext/xtest.c b/Xext/xtest.c index d46d6e7d9..cb7b5b83b 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -316,7 +316,7 @@ ProcXTestFakeInput(client) #ifdef XINPUT if (!extension) #endif /* XINPUT */ - dev = inputInfo.keyboard; + dev = (DeviceIntPtr)LookupKeyboardDevice(); if (ev->u.u.detail < dev->key->curKeySyms.minKeyCode || ev->u.u.detail > dev->key->curKeySyms.maxKeyCode) { @@ -361,7 +361,7 @@ ProcXTestFakeInput(client) } #endif /* XINPUT */ if (!dev) - dev = inputInfo.pointer; + dev = (DeviceIntPtr*)LookupPointerDevice(); if (ev->u.keyButtonPointer.root == None) root = GetCurrentRootWindow(); else @@ -427,7 +427,7 @@ ProcXTestFakeInput(client) #ifdef PANORAMIX if ((!noPanoramiXExtension && root->drawable.pScreen->myNum - != XineramaGetCursorScreen(inputInfo.pointer)) + != XineramaGetCursorScreen(dev)) || (noPanoramiXExtension && root != GetCurrentRootWindow())) #else @@ -451,7 +451,7 @@ ProcXTestFakeInput(client) #ifdef XINPUT if (!extension) #endif /* XINPUT */ - dev = inputInfo.pointer; + dev = (DeviceIntPtr*)LookupPointerDevice(); if (!ev->u.u.detail || ev->u.u.detail > dev->button->numButtons) { client->errorValue = ev->u.u.detail; |