len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

hosted: improvements in devinput touchscreen handling

Browse source 
Some screens (eg Surfans F28) only report absolute positioning
via "EV_ABS" events, and the actual "touch on, touch off" happens
via a separate "EV_KEY" event.  So handle this.

This also fixes a nasty bug introduced in 3270daf2c4.

Change-Id: If73d390679ba6ffe37541442f631c03b73774fbb
This commit is contained in:
Solomon Peachy 2025-05-05 20:33:02 -04:00
parent 18f93ec46a
commit 3a0d490713
1 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

46
firmware/target/hosted/button-devinput.c
View file

@ -122,6 +122,7 @@ static bool handle_touchscreen_event(__u16 code, __s32 value)
switch(code) switch(code)
{ {
case ABS_X:
case ABS_MT_POSITION_X: case ABS_MT_POSITION_X:
{ {
_last_x = value; _last_x = value;
@ -132,6 +133,7 @@ static bool handle_touchscreen_event(__u16 code, __s32 value)
break; break;
} }
case ABS_Y:
case ABS_MT_POSITION_Y: case ABS_MT_POSITION_Y:
{ {
_last_y = value; _last_y = value;
@ -159,7 +161,7 @@ static bool handle_touchscreen_event(__u16 code, __s32 value)
} }
#endif #endif
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_BUTTON_DATA
#define BDATA int *data #define BDATA int *data
#else #else
#define BDATA void #define BDATA void
@ -169,6 +171,10 @@ int button_read_device(BDATA)
static int button_bitmap = 0; static int button_bitmap = 0;
struct input_event event; struct input_event event;
#if defined(HAVE_BUTTON_DATA) && !defined(HAVE_TOUCHSCREEN)
(void)data;
#endif
#ifdef HAVE_SCROLLWHEEL #ifdef HAVE_SCROLLWHEEL
int wheel_ticks = 0; int wheel_ticks = 0;
#endif #endif
@ -183,16 +189,12 @@ int button_read_device(BDATA)
#endif #endif
/* check if there are any events pending and process them */ /* check if there are any events pending and process them */
while(poll(poll_fds, num_devices, 0)) while(poll(poll_fds, num_devices, 0)) {
{ for(int i = 0; i < num_devices; i++) {
for(int i = 0; i < num_devices; i++)
{
/* read only if non-blocking */ /* read only if non-blocking */
if(poll_fds[i].revents & POLLIN) if(poll_fds[i].revents & POLLIN) {
{
int size = read(poll_fds[i].fd, &event, sizeof(event)); int size = read(poll_fds[i].fd, &event, sizeof(event));
if(size == (int)sizeof(event)) if(size == (int)sizeof(event)) {
{
switch(event.type) { switch(event.type) {
case EV_KEY: { case EV_KEY: {
/* map linux event code to rockbox button bitmap */ /* map linux event code to rockbox button bitmap */
@ -201,8 +203,7 @@ int button_read_device(BDATA)
/* event.value == 0x10000 means press /* event.value == 0x10000 means press
* event.value == 0 means release * event.value == 0 means release
*/ */
if(event.value) if(event.value) {
{
#ifdef HAVE_SCROLLWHEEL #ifdef HAVE_SCROLLWHEEL
/* Filter out wheel ticks */ /* Filter out wheel ticks */
if (bmap & BUTTON_SCROLL_BACK) if (bmap & BUTTON_SCROLL_BACK)
@ -214,25 +215,36 @@ int button_read_device(BDATA)
#ifdef BUTTON_DELAY_RELEASE #ifdef BUTTON_DELAY_RELEASE
bmap &= ~BUTTON_DELAY_RELEASE; bmap &= ~BUTTON_DELAY_RELEASE;
#endif #endif
button_bitmap |= bmap; #if defined(HAVE_TOUCHSCREEN) && defined(BUTTON_TOUCH)
/* Some touchscreens give us actual touch/untouch as a "key" */
if (bmap & BUTTON_TOUCH) {
handle_touchscreen_event(ABS_MT_TRACKING_ID, EVENT_VALUE_TOUCHSCREEN_PRESS);
bmap &= ~BUTTON_TOUCH;
} }
else #endif
{ button_bitmap |= bmap;
} else {
#if defined(HAVE_TOUCHSCREEN) && defined(BUTTON_TOUCH)
/* Some touchscreens give us actual touch/untouch as a "key" */
if (bmap & BUTTON_TOUCH) {
handle_touchscreen_event(ABS_MT_TRACKING_ID, 0);
bmap &= ~BUTTON_TOUCH;
}
#endif
#ifdef BUTTON_DELAY_RELEASE #ifdef BUTTON_DELAY_RELEASE
/* Delay the release of any requested buttons */ /* Delay the release of any requested buttons */
if (bmap & BUTTON_DELAY_RELEASE) if (bmap & BUTTON_DELAY_RELEASE) {
{
button_delay_release |= bmap & ~BUTTON_DELAY_RELEASE; button_delay_release |= bmap & ~BUTTON_DELAY_RELEASE;
delay_tick = current_tick + HZ/20; delay_tick = current_tick + HZ/20;
bmap = 0; bmap = 0;
} }
#endif #endif
}
#ifdef HAVE_SCROLLWHEEL #ifdef HAVE_SCROLLWHEEL
/* Wheel gives us press+release back to back; ignore the release */ /* Wheel gives us press+release back to back; ignore the release */
bmap &= ~(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD); bmap &= ~(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD);
#endif #endif
button_bitmap &= ~bmap; button_bitmap &= ~bmap;
}
break; break;
} }
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN