diff options
| author | Daniel Stone <daniels@collabora.com> | 2023-03-30 17:49:17 +0100 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2023-04-03 20:58:06 +0300 |
| commit | 6f9c27ac077e6bf17dc85934d35d3fc3097eae69 (patch) | |
| tree | e0f12477dafc6aef7386dc0a87a6e746b4543a7c | |
| parent | 7c9c545b4e9a591221548b59b298a4a7d96f6018 (diff) | |
| download | weston-6f9c27ac077e6bf17dc85934d35d3fc3097eae69.tar.gz | |
input: Consistently use enums for modifier/axis/state
For some reason we'd managed to have a mismatching header prototype and
implementation. Fix this up to consistently use enums everywhere.
Signed-off-by: Daniel Stone <daniels@collabora.com>
| -rw-r--r-- | include/libweston/libweston.h | 5 | ||||
| -rw-r--r-- | libweston/bindings.c | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h index 0506c618..04002e53 100644 --- a/include/libweston/libweston.h +++ b/include/libweston/libweston.h @@ -947,14 +947,15 @@ weston_pointer_has_focus_resource(struct weston_pointer *pointer); void weston_pointer_send_button(struct weston_pointer *pointer, const struct timespec *time, - uint32_t button, uint32_t state_w); + uint32_t button, + enum wl_pointer_button_state state); void weston_pointer_send_axis(struct weston_pointer *pointer, const struct timespec *time, struct weston_pointer_axis_event *event); void weston_pointer_send_axis_source(struct weston_pointer *pointer, - uint32_t source); + enum wl_pointer_axis_source source); void weston_pointer_send_frame(struct weston_pointer *pointer); diff --git a/libweston/bindings.c b/libweston/bindings.c index f5040934..2f6ce215 100644 --- a/libweston/bindings.c +++ b/libweston/bindings.c @@ -68,7 +68,8 @@ weston_compositor_add_binding(struct weston_compositor *compositor, WL_EXPORT struct weston_binding * weston_compositor_add_key_binding(struct weston_compositor *compositor, - uint32_t key, uint32_t modifier, + uint32_t key, + enum weston_keyboard_modifier modifier, weston_key_binding_handler_t handler, void *data) { @@ -86,7 +87,7 @@ weston_compositor_add_key_binding(struct weston_compositor *compositor, WL_EXPORT struct weston_binding * weston_compositor_add_modifier_binding(struct weston_compositor *compositor, - uint32_t modifier, + enum weston_keyboard_modifier modifier, weston_modifier_binding_handler_t handler, void *data) { @@ -104,7 +105,8 @@ weston_compositor_add_modifier_binding(struct weston_compositor *compositor, WL_EXPORT struct weston_binding * weston_compositor_add_button_binding(struct weston_compositor *compositor, - uint32_t button, uint32_t modifier, + uint32_t button, + enum weston_keyboard_modifier modifier, weston_button_binding_handler_t handler, void *data) { @@ -122,7 +124,7 @@ weston_compositor_add_button_binding(struct weston_compositor *compositor, WL_EXPORT struct weston_binding * weston_compositor_add_touch_binding(struct weston_compositor *compositor, - uint32_t modifier, + enum weston_keyboard_modifier modifier, weston_touch_binding_handler_t handler, void *data) { @@ -158,7 +160,8 @@ weston_compositor_add_tablet_tool_binding(struct weston_compositor *compositor, WL_EXPORT struct weston_binding * weston_compositor_add_axis_binding(struct weston_compositor *compositor, - uint32_t axis, uint32_t modifier, + uint32_t axis, + enum weston_keyboard_modifier modifier, weston_axis_binding_handler_t handler, void *data) { |