izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix low-res scrolling on Linux

Browse Source
This commit is contained in:
Cameron Gutman
2024-01-02 21:23:35 -06:00
parent 556d9586e9
commit 1bd45ca803
1 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/platform/linux/input.cpp
View File

@@ -847,6 +847,9 @@ namespace platf {
evdev_t mouse_dev; evdev_t mouse_dev;
evdev_t keyboard_dev; evdev_t keyboard_dev;
int accumulated_vscroll_delta = 0;
int accumulated_hscroll_delta = 0;
#ifdef SUNSHINE_BUILD_X11 #ifdef SUNSHINE_BUILD_X11
Display *display; Display *display;
#endif #endif
@@ -1296,17 +1299,24 @@ namespace platf {
*/ */
void void
scroll(input_t &input, int high_res_distance) { scroll(input_t &input, int high_res_distance) {
int distance = high_res_distance / 120; auto raw = ((input_raw_t *) input.get());
auto mouse = ((input_raw_t *) input.get())->mouse_input.get(); raw->accumulated_vscroll_delta += high_res_distance;
if (!mouse) { int full_ticks = raw->accumulated_vscroll_delta / 120;
x_scroll(input, distance, 4, 5);
return; auto mouse = raw->mouse_input.get();
if (mouse) {
if (full_ticks) {
libevdev_uinput_write_event(mouse, EV_REL, REL_WHEEL, full_ticks);
}
libevdev_uinput_write_event(mouse, EV_REL, REL_WHEEL_HI_RES, high_res_distance);
libevdev_uinput_write_event(mouse, EV_SYN, SYN_REPORT, 0);
}
else if (full_ticks) {
x_scroll(input, full_ticks, 4, 5);
} }
libevdev_uinput_write_event(mouse, EV_REL, REL_WHEEL, distance); raw->accumulated_vscroll_delta -= full_ticks * 120;
libevdev_uinput_write_event(mouse, EV_REL, REL_WHEEL_HI_RES, high_res_distance);
libevdev_uinput_write_event(mouse, EV_SYN, SYN_REPORT, 0);
} }
/** /**
@@ -1321,17 +1331,24 @@ namespace platf {
*/ */
void void
hscroll(input_t &input, int high_res_distance) { hscroll(input_t &input, int high_res_distance) {
int distance = high_res_distance / 120; auto raw = ((input_raw_t *) input.get());
auto mouse = ((input_raw_t *) input.get())->mouse_input.get(); raw->accumulated_hscroll_delta += high_res_distance;
if (!mouse) { int full_ticks = raw->accumulated_hscroll_delta / 120;
x_scroll(input, distance, 6, 7);
return; auto mouse = raw->mouse_input.get();
if (mouse) {
if (full_ticks) {
libevdev_uinput_write_event(mouse, EV_REL, REL_HWHEEL, full_ticks);
}
libevdev_uinput_write_event(mouse, EV_REL, REL_HWHEEL_HI_RES, high_res_distance);
libevdev_uinput_write_event(mouse, EV_SYN, SYN_REPORT, 0);
}
else if (full_ticks) {
x_scroll(input, full_ticks, 6, 7);
} }
libevdev_uinput_write_event(mouse, EV_REL, REL_HWHEEL, distance); raw->accumulated_hscroll_delta -= full_ticks * 120;
libevdev_uinput_write_event(mouse, EV_REL, REL_HWHEEL_HI_RES, high_res_distance);
libevdev_uinput_write_event(mouse, EV_SYN, SYN_REPORT, 0);
} }
static keycode_t static keycode_t