mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-29 07:58:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/wayland: handle high-res scroll events

Browse source 
Receive high-resolution scroll events from the parent compositor using
a Wayland listiner and emit the appropiate wlr_pointer signal.
This commit is contained in:
José Expósito 2021-09-20 19:47:07 +02:00
parent d18b85c88a
commit e5932867f1
3 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/wayland/backend.c
View file

@ -211,7 +211,7 @@ static void registry_global(void *data, struct wl_registry *registry,
&wl_compositor_interface, 4); &wl_compositor_interface, 4);
} else if (strcmp(iface, wl_seat_interface.name) == 0) { } else if (strcmp(iface, wl_seat_interface.name) == 0) {
struct wl_seat *wl_seat = wl_registry_bind(registry, name, struct wl_seat *wl_seat = wl_registry_bind(registry, name,
&wl_seat_interface, 5); &wl_seat_interface, version < 8 ? version : 8);
if (!create_wl_seat(wl_seat, wl)) { if (!create_wl_seat(wl_seat, wl)) {
wl_seat_destroy(wl_seat); wl_seat_destroy(wl_seat);
} }

43
backend/wayland/seat.c
View file

@ -129,15 +129,28 @@ static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
return; return;
} }
struct wlr_event_pointer_axis event = { uint32_t seat_version = wl_seat_get_version(seat->wl_seat);
.device = &pointer->input_device->wlr_input_device, if (seat_version >= WL_POINTER_AXIS_VALUE120_SINCE_VERSION) {
.delta = wl_fixed_to_double(value), struct wlr_event_pointer_axis_value120 event = {
.delta_discrete = pointer->axis_discrete, .device = &pointer->input_device->wlr_input_device,
.orientation = axis, .delta = wl_fixed_to_double(value),
.time_msec = time, .delta_value120 = pointer->axis_value120,
.source = pointer->axis_source, .orientation = axis,
}; .time_msec = time,
wlr_signal_emit_safe(&pointer->wlr_pointer.events.axis, &event); .source = pointer->axis_source,
};
wlr_signal_emit_safe(&pointer->wlr_pointer.events.axis_value120, &event);
} else {
struct wlr_event_pointer_axis event = {
.device = &pointer->input_device->wlr_input_device,
.delta = wl_fixed_to_double(value),
.delta_discrete = pointer->axis_discrete,
.orientation = axis,
.time_msec = time,
.source = pointer->axis_source,
};
wlr_signal_emit_safe(&pointer->wlr_pointer.events.axis, &event);
}
pointer->axis_discrete = 0; pointer->axis_discrete = 0;
} }
@ -194,6 +207,17 @@ static void pointer_handle_axis_discrete(void *data,
pointer->axis_discrete = discrete; pointer->axis_discrete = discrete;
} }
static void pointer_handle_axis_value120(void *data, struct wl_pointer *wl_pointer,
uint32_t axis, int32_t value120) {
struct wlr_wl_seat *seat = data;
struct wlr_wl_pointer *pointer = seat->active_pointer;
if (pointer == NULL) {
return;
}
pointer->axis_value120 = value120;
}
static const struct wl_pointer_listener pointer_listener = { static const struct wl_pointer_listener pointer_listener = {
.enter = pointer_handle_enter, .enter = pointer_handle_enter,
.leave = pointer_handle_leave, .leave = pointer_handle_leave,
@ -204,6 +228,7 @@ static const struct wl_pointer_listener pointer_listener = {
.axis_source = pointer_handle_axis_source, .axis_source = pointer_handle_axis_source,
.axis_stop = pointer_handle_axis_stop, .axis_stop = pointer_handle_axis_stop,
.axis_discrete = pointer_handle_axis_discrete, .axis_discrete = pointer_handle_axis_discrete,
.axis_value120 = pointer_handle_axis_value120,
}; };
static void keyboard_handle_keymap(void *data, struct wl_keyboard *wl_keyboard, static void keyboard_handle_keymap(void *data, struct wl_keyboard *wl_keyboard,

1
include/backend/wayland.h
View file

@ -101,6 +101,7 @@ struct wlr_wl_pointer {
struct zwp_relative_pointer_v1 *relative_pointer; struct zwp_relative_pointer_v1 *relative_pointer;
enum wlr_axis_source axis_source; enum wlr_axis_source axis_source;
int32_t axis_discrete; int32_t axis_discrete;
int32_t axis_value120;
struct wlr_wl_output *output; struct wlr_wl_output *output;
struct wl_listener output_destroy; struct wl_listener output_destroy;