From 12188c8a8a537b38b1ca4cf8c0de5447e19c886a Mon Sep 17 00:00:00 2001 From: Chase Douglas Date: Tue, 3 Apr 2012 17:31:01 -0700 Subject: [PATCH] Use touch state when querying pointer through core protocol QueryPointer is part of the core protocol. As such, it knows nothing about touch devices. Touches are converted to button 1 press, pointer motion, and button 1 release for core clients, so we should ensure the pointer state mask has button 1 set when XQueryPointer is used. Signed-off-by: Chase Douglas Signed-off-by: Peter Hutterer --- dix/events.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dix/events.c b/dix/events.c index 447094757..b9f9cfa3c 100644 --- a/dix/events.c +++ b/dix/events.c @@ -5098,8 +5098,7 @@ ProcQueryPointer(ClientPtr client) memset(&rep, 0, sizeof(xQueryPointerReply)); rep.type = X_Reply; rep.sequenceNumber = client->sequence; - rep.mask = mouse->button ? (mouse->button->state) : 0; - rep.mask |= XkbStateFieldFromRec(&keyboard->key->xkbInfo->state); + rep.mask = event_get_corestate(mouse, keyboard); rep.length = 0; rep.root = (GetCurrentRootWindow(mouse))->drawable.id; rep.rootX = pSprite->hot.x;