From eac18f81e0695a7155618cdb8df9a717b78bc757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Fri, 3 Jul 2020 18:23:00 +0200 Subject: [PATCH] Use Button from Setsu in GUI --- gui/src/streamsession.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gui/src/streamsession.cpp b/gui/src/streamsession.cpp index 45cfc3a..dd4ddfd 100644 --- a/gui/src/streamsession.cpp +++ b/gui/src/streamsession.cpp @@ -332,9 +332,9 @@ void StreamSession::HandleSetsuEvent(SetsuEvent *event) } SendFeedbackState(); break; - case SETSU_EVENT_DOWN: + case SETSU_EVENT_TOUCH_DOWN: break; - case SETSU_EVENT_UP: + 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) @@ -346,7 +346,7 @@ void StreamSession::HandleSetsuEvent(SetsuEvent *event) } SendFeedbackState(); break; - case SETSU_EVENT_POSITION: { + case SETSU_EVENT_TOUCH_POSITION: { QPair k = { setsu_device_get_path(event->dev), event->tracking_id }; auto it = setsu_ids.find(k); if(it == setsu_ids.end()) @@ -362,6 +362,12 @@ void StreamSession::HandleSetsuEvent(SetsuEvent *event) SendFeedbackState(); break; } + case SETSU_EVENT_BUTTON_DOWN: + setsu_state.buttons |= CHIAKI_CONTROLLER_BUTTON_TOUCHPAD; + break; + case SETSU_EVENT_BUTTON_UP: + setsu_state.buttons &= ~CHIAKI_CONTROLLER_BUTTON_TOUCHPAD; + break; } } #endif