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

Report touch emulated buttons in XIQueryPointer for XI 2.1 and earlier 

XInput 2.1 and earlier clients do not know about touches. We must report
touch emulated button presses for these clients. For later clients, we
only report true pointer button presses.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Chase Douglas 2012-05-01 10:21:12 -07:00 committed by Peter Hutterer
parent 1e7b500a8e
commit ee542b8559
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Xi/xiquerypointer.c
View File

@ -79,10 +79,21 @@ ProcXIQueryPointer(ClientPtr client)
XkbStatePtr state; XkbStatePtr state;
char *buttons = NULL; char *buttons = NULL;
int buttons_size = 0; /* size of buttons array */ int buttons_size = 0; /* size of buttons array */
XIClientPtr xi_client;
Bool have_xi22 = FALSE;
REQUEST(xXIQueryPointerReq); REQUEST(xXIQueryPointerReq);
REQUEST_SIZE_MATCH(xXIQueryPointerReq); REQUEST_SIZE_MATCH(xXIQueryPointerReq);
/* Check if client is compliant with XInput 2.2 or later. Earlier clients
* do not know about touches, so we must report emulated button presses. 2.2
* and later clients are aware of touches, so we don't include emulated
* button presses in the reply. */
xi_client = dixLookupPrivate(&client->devPrivates, XIClientPrivateKey);
if (version_compare(xi_client->major_version,
xi_client->minor_version, 2, 2) >= 0)
have_xi22 = TRUE;
rc = dixLookupDevice(&pDev, stuff->deviceid, client, DixReadAccess); rc = dixLookupDevice(&pDev, stuff->deviceid, client, DixReadAccess);
if (rc != Success) { if (rc != Success) {
client->errorValue = stuff->deviceid; client->errorValue = stuff->deviceid;
@ -145,6 +156,9 @@ ProcXIQueryPointer(ClientPtr client)
for (i = 1; i < pDev->button->numButtons; i++) for (i = 1; i < pDev->button->numButtons; i++)
if (BitIsOn(pDev->button->down, i)) if (BitIsOn(pDev->button->down, i))
SetBit(buttons, pDev->button->map[i]); SetBit(buttons, pDev->button->map[i]);
if (!have_xi22 && pDev->touch && pDev->touch->buttonsDown > 0)
SetBit(buttons, pDev->button->map[1]);
} }
else else
rep.buttons_len = 0; rep.buttons_len = 0;