diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/libinput/events.c | 6 | ||||
| -rw-r--r-- | backend/libinput/pointer.c | 12 | ||||
| -rw-r--r-- | backend/x11/input_device.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/backend/libinput/events.c b/backend/libinput/events.c index dcc65137..1bf70ce2 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -180,15 +180,15 @@ void handle_libinput_event(struct wlr_libinput_backend *backend, #if HAVE_LIBINPUT_SCROLL_VALUE120 case LIBINPUT_EVENT_POINTER_SCROLL_WHEEL: handle_pointer_axis_value120(event, &dev->pointer, - WLR_AXIS_SOURCE_WHEEL); + WL_POINTER_AXIS_SOURCE_WHEEL); break; case LIBINPUT_EVENT_POINTER_SCROLL_FINGER: handle_pointer_axis_value120(event, &dev->pointer, - WLR_AXIS_SOURCE_FINGER); + WL_POINTER_AXIS_SOURCE_FINGER); break; case LIBINPUT_EVENT_POINTER_SCROLL_CONTINUOUS: handle_pointer_axis_value120(event, &dev->pointer, - WLR_AXIS_SOURCE_CONTINUOUS); + WL_POINTER_AXIS_SOURCE_CONTINUOUS); break; #endif case LIBINPUT_EVENT_TOUCH_DOWN: diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c index b124c663..01bfc190 100644 --- a/backend/libinput/pointer.c +++ b/backend/libinput/pointer.c @@ -95,16 +95,16 @@ void handle_pointer_axis(struct libinput_event *event, }; switch (libinput_event_pointer_get_axis_source(pevent)) { case LIBINPUT_POINTER_AXIS_SOURCE_WHEEL: - wlr_event.source = WLR_AXIS_SOURCE_WHEEL; + wlr_event.source = WL_POINTER_AXIS_SOURCE_WHEEL; break; case LIBINPUT_POINTER_AXIS_SOURCE_FINGER: - wlr_event.source = WLR_AXIS_SOURCE_FINGER; + wlr_event.source = WL_POINTER_AXIS_SOURCE_FINGER; break; case LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS: - wlr_event.source = WLR_AXIS_SOURCE_CONTINUOUS; + wlr_event.source = WL_POINTER_AXIS_SOURCE_CONTINUOUS; break; case LIBINPUT_POINTER_AXIS_SOURCE_WHEEL_TILT: - wlr_event.source = WLR_AXIS_SOURCE_WHEEL_TILT; + wlr_event.source = WL_POINTER_AXIS_SOURCE_WHEEL_TILT; break; } const enum libinput_pointer_axis axes[] = { @@ -140,7 +140,7 @@ void handle_pointer_axis(struct libinput_event *event, #if HAVE_LIBINPUT_SCROLL_VALUE120 void handle_pointer_axis_value120(struct libinput_event *event, - struct wlr_pointer *pointer, enum wlr_axis_source source) { + struct wlr_pointer *pointer, enum wl_pointer_axis_source source) { struct libinput_event_pointer *pevent = libinput_event_get_pointer_event(event); struct wlr_pointer_axis_event wlr_event = { @@ -167,7 +167,7 @@ void handle_pointer_axis_value120(struct libinput_event *event, } wlr_event.delta = libinput_event_pointer_get_scroll_value(pevent, axes[i]); - if (source == WLR_AXIS_SOURCE_WHEEL) { + if (source == WL_POINTER_AXIS_SOURCE_WHEEL) { wlr_event.delta_discrete = libinput_event_pointer_get_scroll_value_v120(pevent, axes[i]); } diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c index 02d4210f..8526ae9b 100644 --- a/backend/x11/input_device.c +++ b/backend/x11/input_device.c @@ -45,7 +45,7 @@ static void send_axis_event(struct wlr_x11_output *output, int32_t delta, struct wlr_pointer_axis_event ev = { .pointer = &output->pointer, .time_msec = time, - .source = WLR_AXIS_SOURCE_WHEEL, + .source = WL_POINTER_AXIS_SOURCE_WHEEL, .orientation = WLR_AXIS_ORIENTATION_VERTICAL, // Most mice use a 15 degree angle per scroll click .delta = delta * 15, |