MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comma: process finger removal only once (#10)

Browse Source 
Co-authored-by: Comma Device <device@comma.ai>
This commit is contained in:
Maxime Desroches 2025-06-24 20:07:20 -07:00 committed by GitHub
parent 7696827099
commit cac6f6af62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/platforms/rcore_comma.c
View File

@ -68,8 +68,14 @@
// Types and Structures Definition // Types and Structures Definition
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
typedef enum {
FINGER_STATE_REMOVED = 0, // state when finger was removed and we handled its removal + default state
FINGER_STATE_REMOVING, // state when finger is currently being removed from panel (released event)
FINGER_STATE_TOUCHING, // state when finger is touching panel at any time
} FingerState;
struct finger { struct finger {
TouchAction action; FingerState state;
int x; int x;
int y; int y;
bool resetNextFrame; bool resetNextFrame;
@ -315,7 +321,7 @@ static int init_touch(const char *dev_path, const char *origin_path) {
for (int i = 0; i < MAX_TOUCH_POINTS; ++i) { for (int i = 0; i < MAX_TOUCH_POINTS; ++i) {
platform.touch.fingers[i].x = -1; platform.touch.fingers[i].x = -1;
platform.touch.fingers[i].y = -1; platform.touch.fingers[i].y = -1;
platform.touch.fingers[i].action = TOUCH_ACTION_UP; platform.touch.fingers[i].state = FINGER_STATE_REMOVED;
platform.touch.fingers[i].resetNextFrame = false; platform.touch.fingers[i].resetNextFrame = false;
CORE.Input.Touch.currentTouchState[0] = 0; CORE.Input.Touch.currentTouchState[0] = 0;
@ -640,7 +646,7 @@ void PollInputEvents(void) {
if (event.type == SYN_REPORT) { // synchronization frame. Expose completed events back to the library if (event.type == SYN_REPORT) { // synchronization frame. Expose completed events back to the library
for (int i = 0; i < MAX_TOUCH_POINTS; ++i) { for (int i = 0; i < MAX_TOUCH_POINTS; ++i) {
if (platform.touch.fingers[i].action == TOUCH_ACTION_DOWN) { if (platform.touch.fingers[i].state == FINGER_STATE_TOUCHING) {
CORE.Input.Touch.position[i].x = platform.touch.fingers[i].x; CORE.Input.Touch.position[i].x = platform.touch.fingers[i].x;
CORE.Input.Touch.position[i].y = platform.touch.fingers[i].y; CORE.Input.Touch.position[i].y = platform.touch.fingers[i].y;
@ -653,9 +659,10 @@ void PollInputEvents(void) {
CORE.Input.Mouse.currentPosition.y = platform.touch.fingers[i].y; CORE.Input.Mouse.currentPosition.y = platform.touch.fingers[i].y;
} }
} else if (platform.touch.fingers[i].action == TOUCH_ACTION_UP) { } else if (platform.touch.fingers[i].state == FINGER_STATE_REMOVING) {
CORE.Input.Touch.position[i].x = -1; CORE.Input.Touch.position[i].x = -1;
CORE.Input.Touch.position[i].y = -1; CORE.Input.Touch.position[i].y = -1;
// if we received a touch down and up event in the same frame, // if we received a touch down and up event in the same frame,
// delay up event by one frame so that API user needs no special handling // delay up event by one frame so that API user needs no special handling
if (CORE.Input.Touch.previousTouchState[i] == 0) { if (CORE.Input.Touch.previousTouchState[i] == 0) {
@ -664,6 +671,8 @@ void PollInputEvents(void) {
} else { } else {
CORE.Input.Touch.currentTouchState[i] = 0; CORE.Input.Touch.currentTouchState[i] = 0;
} }
platform.touch.fingers[i].state = FINGER_STATE_REMOVED;
} }
} }
@ -672,7 +681,7 @@ void PollInputEvents(void) {
if (event.code == ABS_MT_SLOT) { // switch finger if (event.code == ABS_MT_SLOT) { // switch finger
slot = event.value; slot = event.value;
} else if (event.code == ABS_MT_TRACKING_ID) { // finger on screen or not } else if (event.code == ABS_MT_TRACKING_ID) { // finger on screen or not
platform.touch.fingers[slot].action = event.value == -1 ? TOUCH_ACTION_UP : TOUCH_ACTION_DOWN; platform.touch.fingers[slot].state = event.value == -1 ? FINGER_STATE_REMOVING : FINGER_STATE_TOUCHING;
} else if (event.code == ABS_MT_POSITION_X) { } else if (event.code == ABS_MT_POSITION_X) {
platform.touch.fingers[slot].y = (1 - platform.touch.canonical) * (CORE.Window.screen.height - event.value) + (platform.touch.canonical * event.value); platform.touch.fingers[slot].y = (1 - platform.touch.canonical) * (CORE.Window.screen.height - event.value) + (platform.touch.canonical * event.value);
} else if (event.code == ABS_MT_POSITION_Y) { } else if (event.code == ABS_MT_POSITION_Y) {
@ -683,7 +692,7 @@ void PollInputEvents(void) {
// count how many fingers are left on the screen after processing all events // count how many fingers are left on the screen after processing all events
for (int i = 0; i < MAX_TOUCH_POINTS; ++i) { for (int i = 0; i < MAX_TOUCH_POINTS; ++i) {
CORE.Input.Touch.pointCount += platform.touch.fingers[i].action != TOUCH_ACTION_UP; CORE.Input.Touch.pointCount += platform.touch.fingers[i].state == FINGER_STATE_TOUCHING;
} }
} }