pointer: drop enum wlr_axis_relative_direction

Instead, use enum wl_pointer_axis_relative_direction from the
Wayland protocol.

7 files changed, 12 insertions, 17 deletions

diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index 57a2f4a3..36ade694 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -129,9 +129,9 @@ void handle_pointer_axis(struct libinput_event *event,
 		wlr_event.delta_discrete =
 			libinput_event_pointer_get_axis_value_discrete(pevent, axes[i]);
 		wlr_event.delta_discrete *= WLR_POINTER_AXIS_DISCRETE_STEP;
-		wlr_event.relative_direction = WLR_AXIS_RELATIVE_DIRECTION_IDENTICAL;
+		wlr_event.relative_direction = WL_POINTER_AXIS_RELATIVE_DIRECTION_IDENTICAL;
 		if (libinput_device_config_scroll_get_natural_scroll_enabled(libinput_event_get_device(event))) {
-			wlr_event.relative_direction = WLR_AXIS_RELATIVE_DIRECTION_INVERTED;
+			wlr_event.relative_direction = WL_POINTER_AXIS_RELATIVE_DIRECTION_INVERTED;
 		}
 		wl_signal_emit_mutable(&pointer->events.axis, &wlr_event);
 	}
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index 273aa4f7..a0bffcd4 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -109,7 +109,7 @@ struct wlr_wl_pointer {
 	enum wl_pointer_axis_source axis_source;
 	int32_t axis_discrete;
 	uint32_t fingers; // trackpad gesture
-	enum wlr_axis_relative_direction axis_relative_direction;
+	enum wl_pointer_axis_relative_direction axis_relative_direction;
 
 	struct wl_listener output_destroy;
 
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h
index 931bc046..b3b0f056 100644
--- a/include/wlr/types/wlr_pointer.h
+++ b/include/wlr/types/wlr_pointer.h
@@ -71,11 +71,6 @@ enum wlr_axis_orientation {
 	WLR_AXIS_ORIENTATION_HORIZONTAL,
 };
 
-enum wlr_axis_relative_direction {
-	WLR_AXIS_RELATIVE_DIRECTION_IDENTICAL,
-	WLR_AXIS_RELATIVE_DIRECTION_INVERTED,
-};
-
 #define WLR_POINTER_AXIS_DISCRETE_STEP 120
 
 struct wlr_pointer_axis_event {
@@ -83,7 +78,7 @@ struct wlr_pointer_axis_event {
 	uint32_t time_msec;
 	enum wl_pointer_axis_source source;
 	enum wlr_axis_orientation orientation;
-	enum wlr_axis_relative_direction relative_direction;
+	enum wl_pointer_axis_relative_direction relative_direction;
 	double delta;
 	int32_t delta_discrete;
 };
diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h
index 0c1f0689..ec2c439b 100644
--- a/include/wlr/types/wlr_seat.h
+++ b/include/wlr/types/wlr_seat.h
@@ -102,7 +102,7 @@ struct wlr_pointer_grab_interface {
 	void (*axis)(struct wlr_seat_pointer_grab *grab, uint32_t time_msec,
 			enum wlr_axis_orientation orientation, double value,
 			int32_t value_discrete, enum wl_pointer_axis_source source,
-			enum wlr_axis_relative_direction relative_direction);
+			enum wl_pointer_axis_relative_direction relative_direction);
 	void (*frame)(struct wlr_seat_pointer_grab *grab);
 	void (*cancel)(struct wlr_seat_pointer_grab *grab);
 };
@@ -409,7 +409,7 @@ uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat,
 void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time_msec,
 		enum wlr_axis_orientation orientation, double value,
 		int32_t value_discrete, enum wl_pointer_axis_source source,
-		enum wlr_axis_relative_direction relative_direction);
+		enum wl_pointer_axis_relative_direction relative_direction);
 
 /**
  * Send a frame event to the surface with pointer focus. This function does not
@@ -461,7 +461,7 @@ uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat,
 void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time_msec,
 		enum wlr_axis_orientation orientation, double value,
 		int32_t value_discrete, enum wl_pointer_axis_source source,
-		enum wlr_axis_relative_direction relative_direction);
+		enum wl_pointer_axis_relative_direction relative_direction);
 
 /**
  * Notify the seat of a frame event. Frame events are sent to end a group of
diff --git a/types/data_device/wlr_drag.c b/types/data_device/wlr_drag.c
index 55db414e..9b0b12a9 100644
--- a/types/data_device/wlr_drag.c
+++ b/types/data_device/wlr_drag.c
@@ -236,7 +236,7 @@ static uint32_t drag_handle_pointer_button(struct wlr_seat_pointer_grab *grab,
 static void drag_handle_pointer_axis(struct wlr_seat_pointer_grab *grab,
 		uint32_t time, enum wlr_axis_orientation orientation, double value,
 		int32_t value_discrete, enum wl_pointer_axis_source source,
-		enum wlr_axis_relative_direction relative_direction) {
+		enum wl_pointer_axis_relative_direction relative_direction) {
 	// This space is intentionally left blank
 }
 
diff --git a/types/seat/wlr_seat_pointer.c b/types/seat/wlr_seat_pointer.c
index 72acb4b7..eb5e1d94 100644
--- a/types/seat/wlr_seat_pointer.c
+++ b/types/seat/wlr_seat_pointer.c
@@ -30,7 +30,7 @@ static uint32_t default_pointer_button(struct wlr_seat_pointer_grab *grab,
 static void default_pointer_axis(struct wlr_seat_pointer_grab *grab,
 		uint32_t time, enum wlr_axis_orientation orientation, double value,
 		int32_t value_discrete, enum wl_pointer_axis_source source,
-		enum wlr_axis_relative_direction relative_direction) {
+		enum wl_pointer_axis_relative_direction relative_direction) {
 	wlr_seat_pointer_send_axis(grab->seat, time, orientation, value,
 		value_discrete, source, relative_direction);
 }
@@ -322,7 +322,7 @@ static void update_value120_accumulators(struct wlr_seat_client *client,
 void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time,
 		enum wlr_axis_orientation orientation, double value,
 		int32_t value_discrete, enum wl_pointer_axis_source source,
-		enum wlr_axis_relative_direction relative_direction) {
+		enum wl_pointer_axis_relative_direction relative_direction) {
 	struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client;
 	if (client == NULL) {
 		return;
@@ -485,7 +485,7 @@ uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat,
 void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time,
 		enum wlr_axis_orientation orientation, double value,
 		int32_t value_discrete, enum wl_pointer_axis_source source,
-		enum wlr_axis_relative_direction relative_direction) {
+		enum wl_pointer_axis_relative_direction relative_direction) {
 	clock_gettime(CLOCK_MONOTONIC, &wlr_seat->last_event);
 	struct wlr_seat_pointer_grab *grab = wlr_seat->pointer_state.grab;
 	grab->interface->axis(grab, time, orientation, value, value_discrete,
diff --git a/types/xdg_shell/wlr_xdg_popup.c b/types/xdg_shell/wlr_xdg_popup.c
index 6cc235f8..0ed71e7a 100644
--- a/types/xdg_shell/wlr_xdg_popup.c
+++ b/types/xdg_shell/wlr_xdg_popup.c
@@ -83,7 +83,7 @@ static uint32_t xdg_pointer_grab_button(struct wlr_seat_pointer_grab *grab,
 static void xdg_pointer_grab_axis(struct wlr_seat_pointer_grab *grab,
 		uint32_t time, enum wlr_axis_orientation orientation, double value,
 		int32_t value_discrete, enum wl_pointer_axis_source source,
-		enum wlr_axis_relative_direction relative_direction) {
+		enum wl_pointer_axis_relative_direction relative_direction) {
 	wlr_seat_pointer_send_axis(grab->seat, time, orientation, value,
 		value_discrete, source, relative_direction);
 }