mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "input: Consistently use enums for modifier/axis/state" 

This reverts commit 9248340db0.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-03-30 17:57:14 +01:00
parent 94afcbcdc3
commit 28b3529ca8
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/libweston/libweston.h
View File

@ -855,15 +855,14 @@ 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,
enum wl_pointer_button_state state);
uint32_t button, uint32_t state_w);
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,
enum wl_pointer_axis_source source);
uint32_t source);
void
weston_pointer_send_frame(struct weston_pointer *pointer);

13
libweston/bindings.c
View File

@ -67,8 +67,7 @@ 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,
enum weston_keyboard_modifier modifier,
uint32_t key, uint32_t modifier,
weston_key_binding_handler_t handler,
void *data)
{
@ -86,7 +85,7 @@ weston_compositor_add_key_binding(struct weston_compositor *compositor,
WL_EXPORT struct weston_binding *
weston_compositor_add_modifier_binding(struct weston_compositor *compositor,
enum weston_keyboard_modifier modifier,
uint32_t modifier,
weston_modifier_binding_handler_t handler,
void *data)
{
@ -104,8 +103,7 @@ 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,
enum weston_keyboard_modifier modifier,
uint32_t button, uint32_t modifier,
weston_button_binding_handler_t handler,
void *data)
{
@ -123,7 +121,7 @@ weston_compositor_add_button_binding(struct weston_compositor *compositor,
WL_EXPORT struct weston_binding *
weston_compositor_add_touch_binding(struct weston_compositor *compositor,
enum weston_keyboard_modifier modifier,
uint32_t modifier,
weston_touch_binding_handler_t handler,
void *data)
{
@ -141,8 +139,7 @@ weston_compositor_add_touch_binding(struct weston_compositor *compositor,
WL_EXPORT struct weston_binding *
weston_compositor_add_axis_binding(struct weston_compositor *compositor,
uint32_t axis,
enum weston_keyboard_modifier modifier,
uint32_t axis, uint32_t modifier,
weston_axis_binding_handler_t handler,
void *data)
{