aboutsummaryrefslogtreecommitdiff
path: root/include/wlr
diff options
context:
space:
mode:
Diffstat (limited to 'include/wlr')
-rw-r--r--include/wlr/types/wlr_pointer.h7
-rw-r--r--include/wlr/types/wlr_seat.h6
2 files changed, 4 insertions, 9 deletions
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