From 53e7bebd2381318b9edcbc8d305d4ec2bed9b3ce Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 14 Aug 2017 15:55:48 +0200 Subject: Refactor out wlr_pointer_state --- include/backend/wayland.h | 3 ++- include/wlr/interfaces/wlr_pointer.h | 6 +++--- include/wlr/types/wlr_pointer.h | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 6d4b0138..d930f21b 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -48,7 +48,8 @@ struct wlr_wl_input_device { void *resource; }; -struct wlr_pointer_state { +struct wlr_wl_pointer { + struct wlr_pointer wlr_pointer; enum wlr_axis_source axis_source; struct wlr_wl_backend_output *current_output; }; diff --git a/include/wlr/interfaces/wlr_pointer.h b/include/wlr/interfaces/wlr_pointer.h index 8c3f7e0d..8d4bf703 100644 --- a/include/wlr/interfaces/wlr_pointer.h +++ b/include/wlr/interfaces/wlr_pointer.h @@ -3,11 +3,11 @@ #include struct wlr_pointer_impl { - void (*destroy)(struct wlr_pointer_state *state); + void (*destroy)(struct wlr_pointer *pointer); }; -struct wlr_pointer *wlr_pointer_create(struct wlr_pointer_impl *impl, - struct wlr_pointer_state *state); +void wlr_pointer_init(struct wlr_pointer *pointer, + struct wlr_pointer_impl *impl); void wlr_pointer_destroy(struct wlr_pointer *pointer); #endif diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h index 139ba868..13a2d045 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -4,11 +4,9 @@ #include #include -struct wlr_pointer_state; struct wlr_pointer_impl; struct wlr_pointer { - struct wlr_pointer_state *state; struct wlr_pointer_impl *impl; struct { -- cgit v1.2.3