SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use GetTouchEvents in EmitTouchEnd

Browse Source 
As before GetTouchEvents causes unwanted side effects.  Add a new
function GetDixTouchEnd, which generates a touch event from the touch
point.  We fill in the event's screen coordinates from the MD's current
sprite position.

Signed-off-by: Thomas Jaeger <ThJaeger@gmail.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:
Thomas Jaeger
2012-10-13 23:08:27 -04:00
committed by Peter Hutterer
parent cc79107a5b
commit fe59774c55
3 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dix/getevents.c
View File

@@ -2022,6 +2022,37 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
return num_events;
}
void
GetDixTouchEnd(InternalEvent *ievent, DeviceIntPtr dev, TouchPointInfoPtr ti,
uint32_t flags)
{
ScreenPtr scr = dev->spriteInfo->sprite->hotPhys.pScreen;
DeviceEvent *event = &ievent->device_event;
CARD32 ms = GetTimeInMillis();
BUG_WARN(!dev->enabled);
init_device_event(event, dev, ms);
event->sourceid = ti->sourceid;
event->type = ET_TouchEnd;
event->root = scr->root->drawable.id;
/* Get screen event coordinates from the sprite. Is this really the best
* we can do? */
event_set_root_coordinates(event,
dev->last.valuators[0],
dev->last.valuators[1]);
event->touchid = ti->client_id;
event->flags = flags;
if (flags & TOUCH_POINTER_EMULATED) {
event->flags |= TOUCH_POINTER_EMULATED;
event->detail.button = 1;
}
}
/**
* Synthesize a single motion event for the core pointer.
*