From d5480efc7a03641600df411dea93308e5edc8b27 Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Mon, 31 Jan 2022 10:20:01 -0500 Subject: types/wlr_pointer: add base wlr_input_device wlr_pointer owns its wlr_input_device. It will be initialized when the pointer is initialized, and finished when the pointer is destroyed. --- include/wlr/interfaces/wlr_pointer.h | 2 +- include/wlr/types/wlr_pointer.h | 2 ++ include/wlr/types/wlr_virtual_pointer_v1.h | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'include/wlr') diff --git a/include/wlr/interfaces/wlr_pointer.h b/include/wlr/interfaces/wlr_pointer.h index fd3ab102..e3950017 100644 --- a/include/wlr/interfaces/wlr_pointer.h +++ b/include/wlr/interfaces/wlr_pointer.h @@ -16,7 +16,7 @@ struct wlr_pointer_impl { }; void wlr_pointer_init(struct wlr_pointer *pointer, - const struct wlr_pointer_impl *impl); + const struct wlr_pointer_impl *impl, const char *name); 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 bcfb2ad3..a5850718 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -17,6 +17,8 @@ struct wlr_pointer_impl; struct wlr_pointer { + struct wlr_input_device base; + const struct wlr_pointer_impl *impl; struct { diff --git a/include/wlr/types/wlr_virtual_pointer_v1.h b/include/wlr/types/wlr_virtual_pointer_v1.h index ede9bebf..307d6158 100644 --- a/include/wlr/types/wlr_virtual_pointer_v1.h +++ b/include/wlr/types/wlr_virtual_pointer_v1.h @@ -11,7 +11,6 @@ #include #include -#include #include #include @@ -28,7 +27,7 @@ struct wlr_virtual_pointer_manager_v1 { }; struct wlr_virtual_pointer_v1 { - struct wlr_input_device input_device; + struct wlr_pointer pointer; struct wl_resource *resource; /* Vertical and horizontal */ struct wlr_event_pointer_axis axis_event[2]; -- cgit v1.2.3