diff options
| author | Simon Ser <contact@emersion.fr> | 2024-02-28 10:33:39 +0100 |
|---|---|---|
| committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2024-02-28 16:39:18 +0000 |
| commit | 488a23c16908a83041cf28e134a6f149d831598d (patch) | |
| tree | 494c03a7b703c959ac87bee6d60af5ee2281c96d /backend | |
| parent | ec5263e6b7b069da6d32fe302771f006f6b5ac22 (diff) | |
| download | wlroots-488a23c16908a83041cf28e134a6f149d831598d.tar.xz | |
pointer: drop enum wlr_axis_orientation
Instead, use enum wl_pointer_axis from the Wayland protocol.
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/libinput/pointer.c | 8 | ||||
| -rw-r--r-- | backend/x11/input_device.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c index 36ade694..f808e1f0 100644 --- a/backend/libinput/pointer.c +++ b/backend/libinput/pointer.c @@ -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 = diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c index 82d9c151..c3536531 100644 --- a/backend/x11/input_device.c +++ b/backend/x11/input_device.c @@ -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, |