Wayland has 3 types of scrolling events:
- axis. Used for e.g., touchpad 2 finger smooth scrolling - axis_discrete. Used for mouse scroll wheels (i.e., notches) - axis_value120. Used for high resolution input devices
Wine currently only supports axis_discrete, meaning that 2 finger scroll events get ignored.
This commit tries to add basic support for axis scrolling events, by translating the smooth motion in scroll increments using some primitive assumptions about line height and number of lines to scroll.
-- v7: wip! winewayland.drv: Try to support smooth scroll events
From: Ray Strode rstrode@redhat.com
Wayland has 3 types of scrolling events:
- axis. Used for e.g., touchpad 2 finger smooth scrolling - axis_discrete. Used for mouse scroll wheels (i.e., notches) - axis_value120. Used for high resolution input devices
Wine currently only supports axis_discrete, meaning that 2 finger scroll events get ignored.
This commit tries to add basic support for axis scrolling events, by translating the smooth motion in scroll increments using some primitive assumptions about line height and number of lines to scroll. --- dlls/winewayland.drv/wayland_pointer.c | 96 ++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 4 ++ 2 files changed, 100 insertions(+)
diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index fad75c8506c..4c8f3f20a8d 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -191,10 +191,99 @@ static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer, uint32_t time, uint32_t axis, wl_fixed_t value) { + struct wayland_pointer *pointer = &process_wayland.pointer; + INPUT input = {0}; + HWND hwnd; + /* Windows wheel events aren't in pixel units but a fractional unit + * proportional to the number of lines to scroll. By default a value of + * WHEEL_DELTA means scroll the application content by 3 lines. + * + * When smooth scrolling with two fingers on a touchpad instead of with a + * wheel, we don't want to scroll by 3 lines, since that makes it hard to + * scroll to a precise line, and any lost speed can be made up for by doing + * a bigger swipe anyway. It's better to scroll a line at a time for small + * swipes. + * + * We also don't know exactly how big a "line" is in pixel units, which is + * what gets reported to this event handler. We can approximate it by + * saying a line is 18 pixels, and we're probably in the right ballpark + * most of the time. + * + * We also don't want to scroll the full swipe value in one go, because if + * it's a big swipe, it's likely to be several lines which can look + * discontinuous and jarring. For it to scroll relatively smoothly, we + * should report intermediate events at least every line. + */ + const double pixels_per_line = 18.0; + const double lines_per_wheel_spin = 3.0; + const double wheel_delta_per_line = (WHEEL_DELTA / lines_per_wheel_spin); + bool invert = false; + double lines_to_scroll; + double wheel_delta_for_value; + + double pixels_scrolled; + double residual_pixels; + + if (!(hwnd = wayland_pointer_get_focused_hwnd())) return; + + if (pointer->scroll_frame_number == pointer->next_frame_number) return; + + input.type = INPUT_MOUSE; + + switch (axis) + { + case WL_POINTER_AXIS_VERTICAL_SCROLL: + input.mi.dwFlags = MOUSEEVENTF_WHEEL; + value += pointer->incomplete_vertical_scroll_value; + invert = true; + break; + case WL_POINTER_AXIS_HORIZONTAL_SCROLL: + input.mi.dwFlags = MOUSEEVENTF_HWHEEL; + value += pointer->incomplete_horizontal_scroll_value; + break; + default: break; + } + + pixels_scrolled = wl_fixed_to_double(value); + + lines_to_scroll = pixels_scrolled / pixels_per_line; + wheel_delta_for_value = lines_to_scroll * wheel_delta_per_line; + + TRACE("hwnd=%p axis=%u value=%lf\n", hwnd, axis, pixels_scrolled); + + for (int32_t i = 0; i < (int32_t) lines_to_scroll; i++) + { + input.mi.mouseData = (int32_t) wheel_delta_per_line; + wheel_delta_for_value -= input.mi.mouseData; + + if (invert) + input.mi.mouseData *= -1; + + __wine_send_input(hwnd, &input, NULL); + } + + residual_pixels = (wheel_delta_for_value / wheel_delta_per_line) * pixels_per_line; + + if (pixels_scrolled < 0) + residual_pixels *= -1; + + switch (axis) + { + case WL_POINTER_AXIS_VERTICAL_SCROLL: + pointer->incomplete_vertical_scroll_value = wl_fixed_from_double(residual_pixels); + break; + case WL_POINTER_AXIS_HORIZONTAL_SCROLL: + pointer->incomplete_horizontal_scroll_value = wl_fixed_from_double(residual_pixels); + break; + default: break; + } }
static void pointer_handle_frame(void *data, struct wl_pointer *wl_pointer) { + struct wayland_pointer *pointer = &process_wayland.pointer; + + pointer->next_frame_number++; }
static void pointer_handle_axis_source(void *data, struct wl_pointer *wl_pointer, @@ -210,6 +299,7 @@ static void pointer_handle_axis_stop(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_axis_discrete(void *data, struct wl_pointer *wl_pointer, uint32_t axis, int32_t discrete) { + struct wayland_pointer *pointer = &process_wayland.pointer; INPUT input = {0}; HWND hwnd;
@@ -233,6 +323,7 @@ static void pointer_handle_axis_discrete(void *data, struct wl_pointer *wl_point TRACE("hwnd=%p axis=%u discrete=%d\n", hwnd, axis, discrete);
__wine_send_input(hwnd, &input, NULL); + pointer->scroll_frame_number = pointer->next_frame_number; }
static const struct wl_pointer_listener pointer_listener = @@ -333,6 +424,10 @@ void wayland_pointer_init(struct wl_pointer *wl_pointer) pointer->wl_pointer = wl_pointer; pointer->focused_hwnd = NULL; pointer->enter_serial = 0; + pointer->scroll_frame_number = 0; + pointer->next_frame_number = 0; + pointer->incomplete_horizontal_scroll_value = 0; + pointer->incomplete_vertical_scroll_value = 0; pthread_mutex_unlock(&pointer->mutex); wl_pointer_add_listener(pointer->wl_pointer, &pointer_listener, NULL); } @@ -361,6 +456,7 @@ void wayland_pointer_deinit(void) pointer->wl_pointer = NULL; pointer->focused_hwnd = NULL; pointer->enter_serial = 0; + pointer->next_frame_number = 0; pthread_mutex_unlock(&pointer->mutex); }
diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 0883c43f1ff..d174ddd08ed 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -99,6 +99,10 @@ struct wayland_pointer HWND constraint_hwnd; uint32_t enter_serial; uint32_t button_serial; + uint32_t scroll_frame_number; + uint32_t next_frame_number; + wl_fixed_t incomplete_horizontal_scroll_value; + wl_fixed_t incomplete_vertical_scroll_value; struct wayland_cursor cursor; pthread_mutex_t mutex; };
On Tue Jan 9 07:56:10 2024 +0000, Ícar N. S. wrote:
If you have an Apple device with macOS, I encourage you to try it. They do non-linearly and in my opinion is fantastic.
ah i don't.
On Tue Jan 9 15:16:24 2024 +0000, Warren Togami wrote:
It works. Not sure how sensitivity is supposed to work. It currently is a LOT LESS SENSITIVE than the equivalent touchpad scrolling behavior with XWayland. Here's a test:
- Create a directory with 2433 files. Run wine explorer.exe with
XWayland and native Wayland then navigate to that directory.
- XWayland: Touchpad two-finger scroll requires 18 full sweeps to get
from the top to the bottom.
- Wayland: Touchpad two-finger scroll requires 100 full sweeps to get
from the top to the bottom. Notably half swipe does nothing. It requires a full swipe to get it to scroll at all.
so this just ended up being a bug... Playing with gdb and looking at the R8 register (i can't figure out how to get TRACE to print anything or gdb to show source code, but R8 register should be the axis value), it seems that rather than sending one big event for a big swipe, mutter chunks up the swipe into a series of ~11 pixels smaller events. 11 pixels is less than my defined 18 pixel line, so a casting bug was making it discard the event entirely most of the time. I added an accumulator to coalesce those 11 pixel strokes into line sized chunks. i'm doing a local test build now, we'll see if this fixes it.
-
Ray Strode -
Ray Strode (＠halfline)