frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xext: xtest.c: death to tabs+spaces indendation, remove #define XINPUT

This commit is contained in:
Peter Hutterer 2008-04-18 09:48:06 +09:30
parent eebdf69e9a
commit cb0168b4ac
1 changed files with 331 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Xext/xtest.c
View File

@ -45,17 +45,13 @@ from The Open Group.
#define _XTEST_SERVER_ #define _XTEST_SERVER_
#include <X11/extensions/XTest.h> #include <X11/extensions/XTest.h>
#include <X11/extensions/xteststr.h> #include <X11/extensions/xteststr.h>
#ifdef XINPUT
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#define EXTENSION_EVENT_BASE 64 #define EXTENSION_EVENT_BASE 64
#endif /* XINPUT */
#include "modinit.h" #include "modinit.h"
#ifdef XINPUT
extern int DeviceValuator; extern int DeviceValuator;
#endif /* XINPUT */
#ifdef PANORAMIX #ifdef PANORAMIX
#include "panoramiX.h" #include "panoramiX.h"
@ -165,12 +161,10 @@ ProcXTestFakeInput(client)
xEvent *ev; xEvent *ev;
DeviceIntPtr dev = NULL; DeviceIntPtr dev = NULL;
WindowPtr root; WindowPtr root;
#ifdef XINPUT
Bool extension = FALSE; Bool extension = FALSE;
deviceValuator *dv = NULL; deviceValuator *dv = NULL;
int base; int base;
int *values; int *values;
#endif /* XINPUT */
nev = (stuff->length << 2) - sizeof(xReq); nev = (stuff->length << 2) - sizeof(xReq);
if ((nev % sizeof(xEvent)) || !nev) if ((nev % sizeof(xEvent)) || !nev)
@ -179,7 +173,7 @@ ProcXTestFakeInput(client)
UpdateCurrentTime(); UpdateCurrentTime();
ev = (xEvent *)&((xReq *)stuff)[1]; ev = (xEvent *)&((xReq *)stuff)[1];
type = ev->u.u.type & 0177; type = ev->u.u.type & 0177;
#ifdef XINPUT
if (type >= EXTENSION_EVENT_BASE) if (type >= EXTENSION_EVENT_BASE)
{ {
type -= DeviceValuator; type -= DeviceValuator;
@ -197,7 +191,7 @@ ProcXTestFakeInput(client)
return BadValue; return BadValue;
} }
if (nev == 1 && type == XI_DeviceMotionNotify) if (nev == 1 && type == XI_DeviceMotionNotify)
return BadLength; return BadLength; /* DevMotion must be followed by DevValuator */
if (type == XI_DeviceMotionNotify) if (type == XI_DeviceMotionNotify)
base = ((deviceValuator *)(ev+1))->first_valuator; base = ((deviceValuator *)(ev+1))->first_valuator;
else else
@ -226,7 +220,6 @@ ProcXTestFakeInput(client)
extension = TRUE; extension = TRUE;
} }
else else
#endif /* XINPUT */
{ {
if (nev != 1) if (nev != 1)
return BadLength; return BadLength;
@ -243,6 +236,8 @@ ProcXTestFakeInput(client)
return BadValue; return BadValue;
} }
} }
/* If the event has a time set, wait for it to pass */
if (ev->u.keyButtonPointer.time) if (ev->u.keyButtonPointer.time)
{ {
TimeStamp activateTime; TimeStamp activateTime;
@ -271,7 +266,7 @@ ProcXTestFakeInput(client)
client->sequence--; client->sequence--;
return Success; return Success;
} }
#ifdef XINPUT
if (extension) if (extension)
{ {
rc = dixLookupDevice(&dev, stuff->deviceid & 0177, client, rc = dixLookupDevice(&dev, stuff->deviceid & 0177, client,
@ -297,14 +292,11 @@ ProcXTestFakeInput(client)
} }
} }
} }
#endif /* XINPUT */
switch (type) switch (type)
{ {
case KeyPress: case KeyPress:
case KeyRelease: case KeyRelease:
#ifdef XINPUT
if (!extension) if (!extension)
#endif /* XINPUT */
dev = PickKeyboard(client); dev = PickKeyboard(client);
if (ev->u.u.detail < dev->key->curKeySyms.minKeyCode || if (ev->u.u.detail < dev->key->curKeySyms.minKeyCode ||
ev->u.u.detail > dev->key->curKeySyms.maxKeyCode) ev->u.u.detail > dev->key->curKeySyms.maxKeyCode)
@ -314,7 +306,6 @@ ProcXTestFakeInput(client)
} }
break; break;
case MotionNotify: case MotionNotify:
#ifdef XINPUT
if (extension) if (extension)
{ {
if (ev->u.u.detail != xFalse && ev->u.u.detail != xTrue) if (ev->u.u.detail != xFalse && ev->u.u.detail != xTrue)
@ -322,6 +313,7 @@ ProcXTestFakeInput(client)
client->errorValue = ev->u.u.detail; client->errorValue = ev->u.u.detail;
return BadValue; return BadValue;
} }
/* detail is True for relative coordinates */
if (ev->u.u.detail == xTrue && dev->valuator->mode == Absolute) if (ev->u.u.detail == xTrue && dev->valuator->mode == Absolute)
{ {
values = dev->valuator->axisVal + dv->first_valuator; values = dev->valuator->axisVal + dv->first_valuator;
@ -348,7 +340,7 @@ ProcXTestFakeInput(client)
} }
break; break;
} }
#endif /* XINPUT */
if (!dev) if (!dev)
dev = PickPointer(client); dev = PickPointer(client);
if (ev->u.keyButtonPointer.root == None) if (ev->u.keyButtonPointer.root == None)
@ -437,9 +429,7 @@ ProcXTestFakeInput(client)
break; break;
case ButtonPress: case ButtonPress:
case ButtonRelease: case ButtonRelease:
#ifdef XINPUT
if (!extension) if (!extension)
#endif /* XINPUT */
dev = PickPointer(client); dev = PickPointer(client);
if (!ev->u.u.detail || ev->u.u.detail > dev->button->numButtons) if (!ev->u.u.detail || ev->u.u.detail > dev->button->numButtons)
{ {