nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-22 07:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

backend/wayland: populate pointer axis relative direction

Browse Source
This commit is contained in:
Simon Ser 2023-02-11 19:16:22 +01:00 committed by Kirill Primak
parent 7a58f41416
commit 98c708618e
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/wayland/backend.c
View File

@ -355,8 +355,8 @@ static void registry_global(void *data, struct wl_registry *registry,
if (version < 5) { if (version < 5) {
target_version = 5; target_version = 5;
} }
if (version > 8) { if (version > 9) {
target_version = 8; target_version = 9;
} }
struct wl_seat *wl_seat = wl_registry_bind(registry, name, struct wl_seat *wl_seat = wl_registry_bind(registry, name,
&wl_seat_interface, target_version); &wl_seat_interface, target_version);

13
backend/wayland/pointer.c
View File

@ -132,6 +132,7 @@ static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
.orientation = axis, .orientation = axis,
.time_msec = time, .time_msec = time,
.source = pointer->axis_source, .source = pointer->axis_source,
.relative_direction = pointer->axis_relative_direction,
}; };
wl_signal_emit_mutable(&pointer->wlr_pointer.events.axis, &event); wl_signal_emit_mutable(&pointer->wlr_pointer.events.axis, &event);
@ -201,6 +202,17 @@ static void pointer_handle_axis_value120(void *data,
pointer->axis_discrete = value120; pointer->axis_discrete = value120;
} }
static void pointer_handle_axis_relative_direction(void *data,
struct wl_pointer *wl_pointer, uint32_t axis, uint32_t direction) {
struct wlr_wl_seat *seat = data;
struct wlr_wl_pointer *pointer = seat->active_pointer;
if (pointer == NULL) {
return;
}
pointer->axis_relative_direction = direction;
}
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,
@ -212,6 +224,7 @@ static const struct wl_pointer_listener pointer_listener = {
.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, .axis_value120 = pointer_handle_axis_value120,
.axis_relative_direction = pointer_handle_axis_relative_direction,
}; };
static void gesture_swipe_begin(void *data, static void gesture_swipe_begin(void *data,

1
include/backend/wayland.h
View File

@ -109,6 +109,7 @@ struct wlr_wl_pointer {
enum wlr_axis_source axis_source; enum wlr_axis_source axis_source;
int32_t axis_discrete; int32_t axis_discrete;
uint32_t fingers; // trackpad gesture uint32_t fingers; // trackpad gesture
enum wlr_axis_relative_direction axis_relative_direction;
struct wl_listener output_destroy; struct wl_listener output_destroy;