mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pointer: drop enum wlr_axis_orientation

Browse source 
Instead, use enum wl_pointer_axis from the Wayland protocol.
This commit is contained in:
Simon Ser 2024-02-28 10:33:39 +01:00 • committed by Simon Zeni
parent ec5263e6b7
commit 488a23c169
7 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/libinput/pointer.c
View file

@ -118,10 +118,10 @@ void handle_pointer_axis(struct libinput_event *event,
switch (axes[i]) {
case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL:
wlr_event.orientation = WLR_AXIS_ORIENTATION_VERTICAL;
wlr_event.orientation = WL_POINTER_AXIS_VERTICAL_SCROLL;
break;
case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL:
wlr_event.orientation = WLR_AXIS_ORIENTATION_HORIZONTAL;
wlr_event.orientation = WL_POINTER_AXIS_HORIZONTAL_SCROLL;
break;
}
wlr_event.delta =
@ -159,10 +159,10 @@ void handle_pointer_axis_value120(struct libinput_event *event,
}
switch (axes[i]) {
case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL:
wlr_event.orientation = WLR_AXIS_ORIENTATION_VERTICAL;
wlr_event.orientation = WL_POINTER_AXIS_VERTICAL_SCROLL;
break;
case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL:
wlr_event.orientation = WLR_AXIS_ORIENTATION_HORIZONTAL;
wlr_event.orientation = WL_POINTER_AXIS_HORIZONTAL_SCROLL;
break;
}
wlr_event.delta =

2
backend/x11/input_device.c
View file

@ -46,7 +46,7 @@ static void send_axis_event(struct wlr_x11_output *output, int32_t delta,
.pointer = &output->pointer,
.time_msec = time,
.source = WL_POINTER_AXIS_SOURCE_WHEEL,
.orientation = WLR_AXIS_ORIENTATION_VERTICAL,
.orientation = WL_POINTER_AXIS_VERTICAL_SCROLL,
// Most mice use a 15 degree angle per scroll click
.delta = delta * 15,
.delta_discrete = delta * WLR_POINTER_AXIS_DISCRETE_STEP,