github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-14 10:46:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finish Motion in Setsu

Browse source
This commit is contained in:
Florian Märkl 2021-01-06 14:23:26 +01:00
commit 88c03aa744
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
5 changed files with 160 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gui/src/streamsession.cpp
View file

@ -429,7 +429,7 @@ void StreamSession::HandleSetsuEvent(SetsuEvent *event)
case SETSU_EVENT_TOUCH_UP:
for(auto it=setsu_ids.begin(); it!=setsu_ids.end(); it++)
{
if(it.key().first == setsu_device_get_path(event->dev) && it.key().second == event->tracking_id)
if(it.key().first == setsu_device_get_path(event->dev) && it.key().second == event->touch.tracking_id)
{
chiaki_controller_state_stop_touch(&setsu_state, it.value());
setsu_ids.erase(it);
@ -439,18 +439,18 @@ void StreamSession::HandleSetsuEvent(SetsuEvent *event)
SendFeedbackState();
break;
case SETSU_EVENT_TOUCH_POSITION: {
QPair<QString, SetsuTrackingId> k = { setsu_device_get_path(event->dev), event->tracking_id };
QPair<QString, SetsuTrackingId> k = { setsu_device_get_path(event->dev), event->touch.tracking_id };
auto it = setsu_ids.find(k);
if(it == setsu_ids.end())
{
int8_t cid = chiaki_controller_state_start_touch(&setsu_state, event->x, event->y);
int8_t cid = chiaki_controller_state_start_touch(&setsu_state, event->touch.x, event->touch.y);
if(cid >= 0)
setsu_ids[k] = (uint8_t)cid;
else
break;
}
else
chiaki_controller_state_set_touch_pos(&setsu_state, it.value(), event->x, event->y);
chiaki_controller_state_set_touch_pos(&setsu_state, it.value(), event->touch.x, event->touch.y);
SendFeedbackState();
break;
}