diff options
author | Dominique Martinet <asmadeus@codewreck.org> | 2017-08-14 14:54:53 +0200 |
---|---|---|
committer | Dominique Martinet <asmadeus@codewreck.org> | 2017-08-14 16:22:31 +0200 |
commit | e6ad67911bffcd804549bd1812a77a305cc14eb4 (patch) | |
tree | 5d1b75712562400db539ebd5e529d5d7892d62d0 /backend/libinput | |
parent | 1e1e9887fba15291256a806aca6cc6f94a8f671e (diff) |
Refactor out wlr_input_device_state
Diffstat (limited to 'backend/libinput')
-rw-r--r-- | backend/libinput/backend.c | 5 | ||||
-rw-r--r-- | backend/libinput/events.c | 19 |
2 files changed, 13 insertions, 11 deletions
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c index 18e4826c..a8f43fbc 100644 --- a/backend/libinput/backend.c +++ b/backend/libinput/backend.c @@ -151,6 +151,7 @@ error_backend: return NULL; } -struct libinput_device *wlr_libinput_get_device_handle(struct wlr_input_device *dev) { - return dev->state->handle; +struct libinput_device *wlr_libinput_get_device_handle(struct wlr_input_device *_dev) { + struct wlr_libinput_input_device *dev = (struct wlr_libinput_input_device *)_dev; + return dev->handle; } diff --git a/backend/libinput/events.c b/backend/libinput/events.c index a7c781c2..0e434b7c 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -23,9 +23,10 @@ struct wlr_input_device *get_appropriate_device( return NULL; } -static void wlr_libinput_device_destroy(struct wlr_input_device_state *state) { - libinput_device_unref(state->handle); - free(state); +static void wlr_libinput_device_destroy(struct wlr_input_device *_dev) { + struct wlr_libinput_input_device *dev = (struct wlr_libinput_input_device *)_dev; + libinput_device_unref(dev->handle); + free(dev); } static struct wlr_input_device_impl input_device_impl = { @@ -38,13 +39,13 @@ static struct wlr_input_device *allocate_device( int vendor = libinput_device_get_id_vendor(libinput_dev); int product = libinput_device_get_id_product(libinput_dev); const char *name = libinput_device_get_name(libinput_dev); - struct wlr_input_device_state *devstate = - calloc(1, sizeof(struct wlr_input_device_state)); - devstate->handle = libinput_dev; + struct wlr_libinput_input_device *wlr_libinput_dev = + calloc(1, sizeof(struct wlr_libinput_input_device)); + struct wlr_input_device *wlr_dev = &wlr_libinput_dev->wlr_input_device; + wlr_libinput_dev->handle = libinput_dev; libinput_device_ref(libinput_dev); - struct wlr_input_device *wlr_dev = wlr_input_device_create( - type, &input_device_impl, devstate, - name, vendor, product); + wlr_input_device_init(wlr_dev, type, &input_device_impl, + name, vendor, product); list_add(wlr_devices, wlr_dev); return wlr_dev; } |