diff options
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/types/wlr_pointer.h | 7 | ||||
| -rw-r--r-- | include/wlr/types/wlr_seat.h | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h index b3b0f056..2fa85138 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -66,18 +66,13 @@ struct wlr_pointer_button_event { enum wl_pointer_button_state state; }; -enum wlr_axis_orientation { - WLR_AXIS_ORIENTATION_VERTICAL, - WLR_AXIS_ORIENTATION_HORIZONTAL, -}; - #define WLR_POINTER_AXIS_DISCRETE_STEP 120 struct wlr_pointer_axis_event { struct wlr_pointer *pointer; uint32_t time_msec; enum wl_pointer_axis_source source; - enum wlr_axis_orientation orientation; + enum wl_pointer_axis orientation; 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 ec2c439b..0318b0f1 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -100,7 +100,7 @@ struct wlr_pointer_grab_interface { uint32_t (*button)(struct wlr_seat_pointer_grab *grab, uint32_t time_msec, uint32_t button, enum wl_pointer_button_state state); void (*axis)(struct wlr_seat_pointer_grab *grab, uint32_t time_msec, - enum wlr_axis_orientation orientation, double value, + enum wl_pointer_axis orientation, double value, int32_t value_discrete, enum wl_pointer_axis_source source, enum wl_pointer_axis_relative_direction relative_direction); void (*frame)(struct wlr_seat_pointer_grab *grab); @@ -407,7 +407,7 @@ uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, * instead. */ void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time_msec, - enum wlr_axis_orientation orientation, double value, + enum wl_pointer_axis orientation, double value, int32_t value_discrete, enum wl_pointer_axis_source source, enum wl_pointer_axis_relative_direction relative_direction); @@ -459,7 +459,7 @@ uint32_t wlr_seat_pointer_notify_button(struct wlr_seat *wlr_seat, * Notify the seat of an axis event. Defers to any grab of the pointer. */ void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time_msec, - enum wlr_axis_orientation orientation, double value, + enum wl_pointer_axis orientation, double value, int32_t value_discrete, enum wl_pointer_axis_source source, enum wl_pointer_axis_relative_direction relative_direction); |