mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[client,common] fix multitouch "engaged" state

Browse Source
This commit is contained in:
ichaoX 2023-09-10 13:49:33 +08:00 committed by akallabeth
parent a94e14fb22
commit 88f79c5748
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/common/client.c
View File

@ -1673,6 +1673,11 @@ static BOOL freerdp_handle_touch_up(rdpClientContext* cctx, const FreeRDP_TouchC
const UINT32 contactFlags = ((contact->flags & FREERDP_TOUCH_HAS_PRESSURE) != 0) const UINT32 contactFlags = ((contact->flags & FREERDP_TOUCH_HAS_PRESSURE) != 0)
? CONTACT_DATA_PRESSURE_PRESENT ? CONTACT_DATA_PRESSURE_PRESENT
: 0; : 0;
// Ensure contact position is unchanged from "engaged" to "out of range" state
rdpei->TouchRawEvent(rdpei, contact->id, contact->x, contact->y, &contactId,
RDPINPUT_CONTACT_FLAG_UPDATE | RDPINPUT_CONTACT_FLAG_INRANGE |
RDPINPUT_CONTACT_FLAG_INCONTACT,
contactFlags, contact->pressure);
rdpei->TouchRawEvent(rdpei, contact->id, contact->x, contact->y, &contactId, flags, rdpei->TouchRawEvent(rdpei, contact->id, contact->x, contact->y, &contactId, flags,
contactFlags, contact->pressure); contactFlags, contact->pressure);
} }
@ -1716,7 +1721,8 @@ static BOOL freerdp_handle_touch_down(rdpClientContext* cctx, const FreeRDP_Touc
if (rdpei->TouchRawEvent) if (rdpei->TouchRawEvent)
{ {
const UINT32 flags = RDPINPUT_CONTACT_FLAG_DOWN; const UINT32 flags = RDPINPUT_CONTACT_FLAG_DOWN | RDPINPUT_CONTACT_FLAG_INRANGE |
RDPINPUT_CONTACT_FLAG_INCONTACT;
const UINT32 contactFlags = ((contact->flags & FREERDP_TOUCH_HAS_PRESSURE) != 0) const UINT32 contactFlags = ((contact->flags & FREERDP_TOUCH_HAS_PRESSURE) != 0)
? CONTACT_DATA_PRESSURE_PRESENT ? CONTACT_DATA_PRESSURE_PRESENT
: 0; : 0;
@ -1760,7 +1766,8 @@ static BOOL freerdp_handle_touch_motion(rdpClientContext* cctx, const FreeRDP_To
if (rdpei->TouchRawEvent) if (rdpei->TouchRawEvent)
{ {
const UINT32 flags = RDPINPUT_CONTACT_FLAG_UPDATE; const UINT32 flags = RDPINPUT_CONTACT_FLAG_UPDATE | RDPINPUT_CONTACT_FLAG_INRANGE |
RDPINPUT_CONTACT_FLAG_INCONTACT;
const UINT32 contactFlags = ((contact->flags & FREERDP_TOUCH_HAS_PRESSURE) != 0) const UINT32 contactFlags = ((contact->flags & FREERDP_TOUCH_HAS_PRESSURE) != 0)
? CONTACT_DATA_PRESSURE_PRESENT ? CONTACT_DATA_PRESSURE_PRESENT
: 0; : 0;