aboutsummaryrefslogtreecommitdiff
path: root/include/backend
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-08-14 10:33:46 -0400
committerGitHub <noreply@github.com>2017-08-14 10:33:46 -0400
commit53052b3f6e457f35d46fc3a71bd7eac96e55a484 (patch)
treec51bfcd472cf38df7528eab9330bb0e44981ffbb /include/backend
parent1e1e9887fba15291256a806aca6cc6f94a8f671e (diff)
parente922e62924314866620cce662756ff09c8092cc2 (diff)
Merge pull request #85 from martinetd/refactor_states
Refactor states
Diffstat (limited to 'include/backend')
-rw-r--r--include/backend/libinput.h5
-rw-r--r--include/backend/wayland.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index 3ff714c2..e0f762a7 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -2,6 +2,7 @@
#define _WLR_BACKEND_LIBINPUT_INTERNAL_H
#include <libinput.h>
#include <wayland-server-core.h>
+#include <wlr/types/wlr_input_device.h>
#include <wlr/backend/interface.h>
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/util/list.h>
@@ -22,7 +23,9 @@ struct wlr_libinput_backend {
list_t *wlr_device_lists;
};
-struct wlr_input_device_state {
+struct wlr_libinput_input_device {
+ struct wlr_input_device wlr_input_device;
+
struct libinput_device *handle;
};
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index da4465fa..d930f21b 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -41,13 +41,15 @@ struct wlr_wl_backend_output {
void *egl_surface;
};
-struct wlr_input_device_state {
+struct wlr_wl_input_device {
+ struct wlr_input_device wlr_input_device;
+
struct wlr_wl_backend *backend;
- struct wlr_input_device *wlr_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;
};