encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

evdev: Batch mouse axis updates until SYN_REPORT 

This is necessary for consistent position reports with absolute mice
and improves application performance with relative mice by cutting the
number of reported mouse motion events roughly in half.
This commit is contained in:
Cameron Gutman 2022-07-31 12:36:11 -05:00
parent 7f42fb54ad
commit 574db63c8e
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/core/linux/SDL_evdev.c
View File

@ -96,8 +96,12 @@ typedef struct SDL_evdevlist_item
} * touchscreen_data; } * touchscreen_data;
/* Mouse state */
SDL_bool high_res_wheel; SDL_bool high_res_wheel;
SDL_bool high_res_hwheel; SDL_bool high_res_hwheel;
SDL_bool relative_mouse;
int mouse_x, mouse_y;
int mouse_wheel, mouse_hwheel;
struct SDL_evdevlist_item *next; struct SDL_evdevlist_item *next;
} SDL_evdevlist_item; } SDL_evdevlist_item;
@ -361,16 +365,20 @@ SDL_EVDEV_Poll(void)
if (item->touchscreen_data->max_slots != 1) if (item->touchscreen_data->max_slots != 1)
break; break;
item->touchscreen_data->slots[0].x = events[i].value; item->touchscreen_data->slots[0].x = events[i].value;
} else } else if (!item->relative_mouse) {
SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_FALSE, events[i].value, mouse->y); /* FIXME: Normalize to input device's reported input range (EVIOCGABS) */
item->mouse_x = events[i].value;
}
break; break;
case ABS_Y: case ABS_Y:
if (item->is_touchscreen) { if (item->is_touchscreen) {
if (item->touchscreen_data->max_slots != 1) if (item->touchscreen_data->max_slots != 1)
break; break;
item->touchscreen_data->slots[0].y = events[i].value; item->touchscreen_data->slots[0].y = events[i].value;
} else } else if (!item->relative_mouse) {
SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_FALSE, mouse->x, events[i].value); /* FIXME: Normalize to input device's reported input range (EVIOCGABS) */
item->mouse_y = events[i].value;
}
break; break;
default: default:
break; break;
@ -379,26 +387,28 @@ SDL_EVDEV_Poll(void)
case EV_REL: case EV_REL:
switch(events[i].code) { switch(events[i].code) {
case REL_X: case REL_X:
SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_TRUE, events[i].value, 0); if (item->relative_mouse)
item->mouse_x += events[i].value;
break; break;
case REL_Y: case REL_Y:
SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_TRUE, 0, events[i].value); if (item->relative_mouse)
item->mouse_y += events[i].value;
break; break;
case REL_WHEEL: case REL_WHEEL:
if (!item->high_res_wheel) if (!item->high_res_wheel)
SDL_SendMouseWheel(mouse->focus, mouse->mouseID, 0, events[i].value, SDL_MOUSEWHEEL_NORMAL); item->mouse_wheel += events[i].value;
break; break;
case REL_WHEEL_HI_RES: case REL_WHEEL_HI_RES:
SDL_assert(item->high_res_wheel); SDL_assert(item->high_res_wheel);
SDL_SendMouseWheel(mouse->focus, mouse->mouseID, 0, events[i].value / 120.0f, SDL_MOUSEWHEEL_NORMAL); item->mouse_wheel += events[i].value;
break; break;
case REL_HWHEEL: case REL_HWHEEL:
if (!item->high_res_hwheel) if (!item->high_res_hwheel)
SDL_SendMouseWheel(mouse->focus, mouse->mouseID, events[i].value, 0, SDL_MOUSEWHEEL_NORMAL); item->mouse_hwheel += events[i].value;
break; break;
case REL_HWHEEL_HI_RES: case REL_HWHEEL_HI_RES:
SDL_assert(item->high_res_hwheel); SDL_assert(item->high_res_hwheel);
SDL_SendMouseWheel(mouse->focus, mouse->mouseID, events[i].value / 120.0f, 0, SDL_MOUSEWHEEL_NORMAL); item->mouse_hwheel += events[i].value;
break; break;
default: default:
break; break;
@ -407,6 +417,19 @@ SDL_EVDEV_Poll(void)
case EV_SYN: case EV_SYN:
switch (events[i].code) { switch (events[i].code) {
case SYN_REPORT: case SYN_REPORT:
/* Send mouse axis changes together to ensure consistency and reduce event processing overhead */
if (item->mouse_x != 0 || item->mouse_y != 0) {
SDL_SendMouseMotion(mouse->focus, mouse->mouseID, item->relative_mouse, item->mouse_x, item->mouse_y);
item->mouse_x = item->mouse_y = 0;
}
if (item->mouse_wheel != 0 || item->mouse_hwheel != 0) {
SDL_SendMouseWheel(mouse->focus, mouse->mouseID,
item->mouse_hwheel / (item->high_res_hwheel ? 120.0f : 1.0f),
item->mouse_wheel / (item->high_res_wheel ? 120.0f : 1.0f),
SDL_MOUSEWHEEL_NORMAL);
item->mouse_wheel = item->mouse_hwheel = 0;
}
if (!item->is_touchscreen) /* FIXME: temp hack */ if (!item->is_touchscreen) /* FIXME: temp hack */
break; break;
@ -760,6 +783,7 @@ SDL_EVDEV_device_added(const char *dev_path, int udev_class)
} }
if (ioctl(item->fd, EVIOCGBIT(EV_REL, sizeof(relbit)), relbit) >= 0) { if (ioctl(item->fd, EVIOCGBIT(EV_REL, sizeof(relbit)), relbit) >= 0) {
item->relative_mouse = test_bit(REL_X, relbit) && test_bit(REL_Y, relbit);
item->high_res_wheel = test_bit(REL_WHEEL_HI_RES, relbit); item->high_res_wheel = test_bit(REL_WHEEL_HI_RES, relbit);
item->high_res_hwheel = test_bit(REL_HWHEEL_HI_RES, relbit); item->high_res_hwheel = test_bit(REL_HWHEEL_HI_RES, relbit);
} }