pointer: drop enum wlr_axis_relative_direction

Instead, use enum wl_pointer_axis_relative_direction from the
Wayland protocol.
This commit is contained in:
Simon Ser 2024-02-28 10:31:03 +01:00 committed by Simon Zeni
parent 812451cd8f
commit ec5263e6b7
7 changed files with 12 additions and 17 deletions

View file

@ -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;
};

View file

@ -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