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

added cleanup

Browse Source
This commit is contained in:
MULTidll 2025-11-18 12:07:52 +05:30
parent 0e133f1534
commit 04fe5e62fa
1 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/platforms/rcore_drm.c
View File

@ -138,6 +138,7 @@ typedef struct {
Rectangle absRange; // Range of values for absolute pointing devices (touchscreens) Rectangle absRange; // Range of values for absolute pointing devices (touchscreens)
int touchSlot; // Hold the touch slot number of the currently being sent multitouch block int touchSlot; // Hold the touch slot number of the currently being sent multitouch block
bool touchActive[MAX_TOUCH_POINTS]; // Track which touch points are currently active bool touchActive[MAX_TOUCH_POINTS]; // Track which touch points are currently active
int touchLastUpdate[MAX_TOUCH_POINTS]; // Frame counter for last update (to detect stale touches)
// Gamepad data // Gamepad data
int gamepadStreamFd[MAX_GAMEPADS]; // Gamepad device file descriptor int gamepadStreamFd[MAX_GAMEPADS]; // Gamepad device file descriptor
@ -164,6 +165,7 @@ static bool crtcSet = false;
extern CoreData CORE; // Global CORE state context extern CoreData CORE; // Global CORE state context
static PlatformData platform = { 0 }; // Platform specific data static PlatformData platform = { 0 }; // Platform specific data
static int frameCounter = 0; // Frame counter for touch cleanup
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Global Variables Definition // Global Variables Definition
@ -1084,6 +1086,27 @@ void PollInputEvents(void)
UpdateGestures(); UpdateGestures();
#endif #endif
// Periodic cleanup to prevent ghost touches (every 60 frames ~ 1 second at 60fps)
frameCounter++;
if (frameCounter > 3600) frameCounter = 1800; // Reset after 1 minute to prevent overflow, keeping reasonable gap
if (frameCounter % 60 == 0) {
// Clean up stale touches that haven't been updated recently (likely ghost touches)
for (int i = 0; i < MAX_TOUCH_POINTS; i++) {
if (platform.touchActive[i]) {
// If a touch hasn't been updated in the last 30 frames (~0.5 sec), consider it stale
int framesSinceUpdate = frameCounter - platform.touchLastUpdate[i];
if (framesSinceUpdate > 30) {
TRACELOG(LOG_DEBUG, "TOUCH: Cleaning up stale touch point %d (frames since update: %d)", i, framesSinceUpdate);
platform.touchActive[i] = false;
platform.touchLastUpdate[i] = 0;
CORE.Input.Touch.position[i].x = -1;
CORE.Input.Touch.position[i].y = -1;
}
}
}
}
// Reset keys/chars pressed registered // Reset keys/chars pressed registered
CORE.Input.Keyboard.keyPressedQueueCount = 0; CORE.Input.Keyboard.keyPressedQueueCount = 0;
CORE.Input.Keyboard.charPressedQueueCount = 0; CORE.Input.Keyboard.charPressedQueueCount = 0;
@ -1899,6 +1922,7 @@ static void InitEvdevInput(void)
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;
platform.touchActive[i] = false; platform.touchActive[i] = false;
platform.touchLastUpdate[i] = 0;
} }
// Initialize touch slot // Initialize touch slot
@ -2321,6 +2345,7 @@ static void PollMouseEvents(void)
{ {
if (platform.touchSlot < MAX_TOUCH_POINTS && platform.touchActive[platform.touchSlot]) { if (platform.touchSlot < MAX_TOUCH_POINTS && platform.touchActive[platform.touchSlot]) {
CORE.Input.Touch.position[platform.touchSlot].x = (event.value - platform.absRange.x)*CORE.Window.screen.width/platform.absRange.width; CORE.Input.Touch.position[platform.touchSlot].x = (event.value - platform.absRange.x)*CORE.Window.screen.width/platform.absRange.width;
platform.touchLastUpdate[platform.touchSlot] = frameCounter;
touchAction = 2; // TOUCH_ACTION_MOVE touchAction = 2; // TOUCH_ACTION_MOVE
} }
} }
@ -2329,6 +2354,7 @@ static void PollMouseEvents(void)
{ {
if (platform.touchSlot < MAX_TOUCH_POINTS && platform.touchActive[platform.touchSlot]) { if (platform.touchSlot < MAX_TOUCH_POINTS && platform.touchActive[platform.touchSlot]) {
CORE.Input.Touch.position[platform.touchSlot].y = (event.value - platform.absRange.y)*CORE.Window.screen.height/platform.absRange.height; CORE.Input.Touch.position[platform.touchSlot].y = (event.value - platform.absRange.y)*CORE.Window.screen.height/platform.absRange.height;
platform.touchLastUpdate[platform.touchSlot] = frameCounter;
touchAction = 2; // TOUCH_ACTION_MOVE touchAction = 2; // TOUCH_ACTION_MOVE
} }
} }
@ -2341,17 +2367,17 @@ static void PollMouseEvents(void)
{ {
// Touch has started for this point // Touch has started for this point
platform.touchActive[platform.touchSlot] = true; platform.touchActive[platform.touchSlot] = true;
platform.touchLastUpdate[platform.touchSlot] = frameCounter;
touchAction = 1; // TOUCH_ACTION_DOWN touchAction = 1; // TOUCH_ACTION_DOWN
} }
else else
{ {
// Touch has ended for this point // Touch has ended for this point
platform.touchActive[platform.touchSlot] = false; platform.touchActive[platform.touchSlot] = false;
platform.touchLastUpdate[platform.touchSlot] = 0;
CORE.Input.Touch.position[platform.touchSlot].x = -1; CORE.Input.Touch.position[platform.touchSlot].x = -1;
CORE.Input.Touch.position[platform.touchSlot].y = -1; CORE.Input.Touch.position[platform.touchSlot].y = -1;
touchAction = 0; // TOUCH_ACTION_UP touchAction = 0; // TOUCH_ACTION_UP
// Note: CompactTouchPoints() will be called after all events are processed
} }
} }
} }
@ -2420,9 +2446,8 @@ static void PollMouseEvents(void)
if (CORE.Input.Mouse.currentPosition.y > CORE.Window.screen.height/CORE.Input.Mouse.scale.y) CORE.Input.Mouse.currentPosition.y = CORE.Window.screen.height/CORE.Input.Mouse.scale.y; if (CORE.Input.Mouse.currentPosition.y > CORE.Window.screen.height/CORE.Input.Mouse.scale.y) CORE.Input.Mouse.currentPosition.y = CORE.Window.screen.height/CORE.Input.Mouse.scale.y;
} }
// Compact touch points if any were removed // Clean up any invalid touch points
static bool needsCompaction = false; CompactTouchPoints();
if (touchAction == 0) needsCompaction = true; // Touch up event
// Update touch point count // Update touch point count
CORE.Input.Touch.pointCount = 0; CORE.Input.Touch.pointCount = 0;
@ -2431,18 +2456,25 @@ static void PollMouseEvents(void)
if (platform.touchActive[i]) CORE.Input.Touch.pointCount++; if (platform.touchActive[i]) CORE.Input.Touch.pointCount++;
} }
// Compact after counting to avoid disrupting gesture events // if no touches are active but positions exist, clean it up
if (needsCompaction && touchAction != 1) { // Don't compact during touch down if (CORE.Input.Touch.pointCount == 0) {
CompactTouchPoints(); for (int i = 0; i < MAX_TOUCH_POINTS; i++) {
needsCompaction = false; if (platform.touchActive[i] || CORE.Input.Touch.position[i].x != -1) {
TRACELOG(LOG_DEBUG, "TOUCH: Force cleaning ghost touch at slot %d", i);
// Recount after compaction platform.touchActive[i] = false;
CORE.Input.Touch.pointCount = 0; platform.touchLastUpdate[i] = 0;
for (int i = 0; i < MAX_TOUCH_POINTS; i++) CORE.Input.Touch.position[i].x = -1;
{ CORE.Input.Touch.position[i].y = -1;
if (platform.touchActive[i]) CORE.Input.Touch.pointCount++;
} }
} }
}
// Debug logging
static int lastTouchCount = 0;
if (CORE.Input.Touch.pointCount != lastTouchCount && (touchAction == 0 || touchAction == 1)) {
TRACELOG(LOG_DEBUG, "TOUCH: Count changed from %d to %d (action: %d)", lastTouchCount, CORE.Input.Touch.pointCount, touchAction);
lastTouchCount = CORE.Input.Touch.pointCount;
}
#if defined(SUPPORT_GESTURES_SYSTEM) #if defined(SUPPORT_GESTURES_SYSTEM)
if (touchAction > -1) if (touchAction > -1)
@ -2466,29 +2498,16 @@ static void PollMouseEvents(void)
} }
} }
// Compact touch points to remove gaps when touches are removed // Clean up inactive touch points to prevent ghost touches
static void CompactTouchPoints(void) static void CompactTouchPoints(void)
{ {
// This function ensures that active touch points are contiguous
// starting from index 0, which helps with proper touch counting
int writeIndex = 0;
for (int readIndex = 0; readIndex < MAX_TOUCH_POINTS; readIndex++) for (int i = 0; i < MAX_TOUCH_POINTS; i++)
{ {
if (platform.touchActive[readIndex]) if (!platform.touchActive[i])
{ {
if (writeIndex != readIndex) CORE.Input.Touch.position[i].x = -1;
{ CORE.Input.Touch.position[i].y = -1;
// Move the active touch point to fill the gap
platform.touchActive[writeIndex] = true;
CORE.Input.Touch.position[writeIndex] = CORE.Input.Touch.position[readIndex];
// Clear the old position
platform.touchActive[readIndex] = false;
CORE.Input.Touch.position[readIndex].x = -1;
CORE.Input.Touch.position[readIndex].y = -1;
}
writeIndex++;
} }
} }
} }