Use events instead of callbacks for capability registration

This commit also introduces a new requirement to
libinput_device_destroy() - libinput_device_terminate() must be called
before libinput_device_destroy() in order to allow the user to dispatch
the events related to a terminating input devices while the device is
still valid.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>

diff --git a/src/evdev.c b/src/evdev.c
index 4f107ea571952faab533088b48c5ee6ce5c0dd00..0316c6fc4e674f9e7b6328ae664de310a29da965 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -585,21 +585,18 @@ evdev_configure_device(struct evdev_device *device)
 {
        if ((device->caps & (EVDEV_MOTION_ABS | EVDEV_MOTION_REL)) &&
            (device->caps & EVDEV_BUTTON)) {
-               device->base.device_interface->register_capability(
-                       LIBINPUT_DEVICE_CAP_POINTER,
-                       device->base.device_interface_data);
+               device_register_capability(&device->base,
+                                          LIBINPUT_DEVICE_CAP_POINTER);
                device->seat_caps |= EVDEV_DEVICE_POINTER;
        }
        if ((device->caps & EVDEV_KEYBOARD)) {
-               device->base.device_interface->register_capability(
-                       LIBINPUT_DEVICE_CAP_KEYBOARD,
-                       device->base.device_interface_data);
+               device_register_capability(&device->base,
+                                          LIBINPUT_DEVICE_CAP_KEYBOARD);
                device->seat_caps |= EVDEV_DEVICE_KEYBOARD;
        }
        if ((device->caps & EVDEV_TOUCH)) {
-               device->base.device_interface->register_capability(
-                       LIBINPUT_DEVICE_CAP_TOUCH,
-                       device->base.device_interface_data);
+               device_register_capability(&device->base,
+                                          LIBINPUT_DEVICE_CAP_TOUCH);
                device->seat_caps |= EVDEV_DEVICE_TOUCH;
        }
 
@@ -681,25 +678,26 @@ evdev_device_calibrate(struct evdev_device *device, float calibration[6])
 }
 
 void
-evdev_device_destroy(struct evdev_device *device)
+evdev_device_terminate(struct evdev_device *device)
 {
-       struct evdev_dispatch *dispatch;
-
        if (device->seat_caps & EVDEV_DEVICE_POINTER) {
-               device->base.device_interface->unregister_capability(
-                       LIBINPUT_DEVICE_CAP_POINTER,
-                       device->base.device_interface_data);
+               device_unregister_capability(&device->base,
+                                            LIBINPUT_DEVICE_CAP_POINTER);
        }
        if (device->seat_caps & EVDEV_DEVICE_KEYBOARD) {
-               device->base.device_interface->unregister_capability(
-                       LIBINPUT_DEVICE_CAP_KEYBOARD,
-                       device->base.device_interface_data);
+               device_unregister_capability(&device->base,
+                                            LIBINPUT_DEVICE_CAP_KEYBOARD);
        }
        if (device->seat_caps & EVDEV_DEVICE_TOUCH) {
-               device->base.device_interface->unregister_capability(
-                       LIBINPUT_DEVICE_CAP_TOUCH,
-                       device->base.device_interface_data);
+               device_unregister_capability(&device->base,
+                                            LIBINPUT_DEVICE_CAP_TOUCH);
        }
+}
+
+void
+evdev_device_destroy(struct evdev_device *device)
+{
+       struct evdev_dispatch *dispatch;
 
        dispatch = device->dispatch;
        if (dispatch)

diff --git a/src/evdev.h b/src/evdev.h
index 1b45aed0b52990cb8da47fcc1ee74849c87c44eb..c8cb405400a72e1401cb42692329f503a480a6f5 100644 (file)
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -144,6 +144,9 @@ evdev_device_get_keys(struct evdev_device *device, char *keys, size_t size);
 void
 evdev_device_calibrate(struct evdev_device *device, float calibration[6]);
 
+void
+evdev_device_terminate(struct evdev_device *terminate);
+
 void
 evdev_device_destroy(struct evdev_device *device);
 

diff --git a/src/libinput-private.h b/src/libinput-private.h
index 6796ccfae815dfb6630ff683b88603079b845a27..e9a5aaa9361853d975259471c36d0b2444c93147 100644 (file)
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -41,6 +41,7 @@ struct libinput_device {
        struct libinput *libinput;
        const struct libinput_device_interface *device_interface;
        void *device_interface_data;
+       int terminated;
 };
 
 typedef void (*libinput_source_dispatch_t)(void *data);
@@ -61,6 +62,14 @@ void
 libinput_post_event(struct libinput *libinput,
                    struct libinput_event *event);
 
+void
+device_register_capability(struct libinput_device *device,
+                          enum libinput_device_capability capability);
+
+void
+device_unregister_capability(struct libinput_device *device,
+                            enum libinput_device_capability capability);
+
 void
 keyboard_notify_key(struct libinput_device *device,
                    uint32_t time,

diff --git a/src/libinput.c b/src/libinput.c
index af00725db8dbadf336d9f8fa6224d5bcf24efb85..0226b81c6d8dabbf21d62727abc86bdcfcb94a6c 100644 (file)
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <sys/epoll.h>
 #include <unistd.h>
+#include <assert.h>
 
 #include "libinput.h"
 #include "evdev.h"
@@ -160,6 +161,40 @@ post_device_event(struct libinput_device *device,
        libinput_post_event(device->libinput, event);
 }
 
+void
+device_register_capability(struct libinput_device *device,
+                          enum libinput_device_capability capability)
+{
+       struct libinput_event_device_register_capability *capability_event;
+
+       capability_event = malloc(sizeof *capability_event);
+
+       *capability_event = (struct libinput_event_device_register_capability) {
+               .capability = capability,
+       };
+
+       post_device_event(device,
+                         LIBINPUT_EVENT_DEVICE_REGISTER_CAPABILITY,
+                         &capability_event->base);
+}
+
+void
+device_unregister_capability(struct libinput_device *device,
+                            enum libinput_device_capability capability)
+{
+       struct libinput_event_device_unregister_capability *capability_event;
+
+       capability_event = malloc(sizeof *capability_event);
+
+       *capability_event = (struct libinput_event_device_unregister_capability) {
+               .capability = capability,
+       };
+
+       post_device_event(device,
+                         LIBINPUT_EVENT_DEVICE_UNREGISTER_CAPABILITY,
+                         &capability_event->base);
+}
+
 void
 keyboard_notify_key(struct libinput_device *device,
                    uint32_t time,
@@ -362,9 +397,17 @@ libinput_get_event(struct libinput *libinput)
        return event;
 }
 
+LIBINPUT_EXPORT void
+libinput_device_terminate(struct libinput_device *device)
+{
+       evdev_device_terminate((struct evdev_device *) device);
+       device->terminated = 1;
+}
+
 LIBINPUT_EXPORT void
 libinput_device_destroy(struct libinput_device *device)
 {
+       assert(device->terminated);
        evdev_device_destroy((struct evdev_device *) device);
 }
 

diff --git a/src/libinput.h b/src/libinput.h
index 67b7c1e2273389b96afed812c4e7047a1f4a0685..ee6b98aee2159e61dda9d600a2d6f97ed2462a1f 100644 (file)
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -64,6 +64,8 @@ enum libinput_touch_type {
 };
 
 enum libinput_event_type {
+       LIBINPUT_EVENT_DEVICE_REGISTER_CAPABILITY = 200,
+       LIBINPUT_EVENT_DEVICE_UNREGISTER_CAPABILITY,
 
        LIBINPUT_EVENT_KEYBOARD_KEY = 300,
 
@@ -80,6 +82,16 @@ struct libinput_event {
        struct libinput_device *device;
 };
 
+struct libinput_event_device_register_capability {
+       struct libinput_event base;
+       enum libinput_device_capability capability;
+};
+
+struct libinput_event_device_unregister_capability {
+       struct libinput_event base;
+       enum libinput_device_capability capability;
+};
+
 struct libinput_event_keyboard_key {
        struct libinput_event base;
        uint32_t time;
@@ -129,13 +141,6 @@ struct libinput_fd_handle;
 typedef void (*libinput_fd_callback)(int fd, void *data);
 
 struct libinput_device_interface {
-       /* */
-       void (*register_capability)(enum libinput_device_capability capability,
-                                   void *data);
-       void (*unregister_capability)(enum libinput_device_capability capability,
-                                     void *data);
-
-       /* */
        void (*get_current_screen_dimensions)(int *width,
                                              int *height,
                                              void *data);
@@ -166,6 +171,9 @@ libinput_device_create_evdev(struct libinput *libinput,
                             const struct libinput_device_interface *interface,
                             void *user_data);
 
+void
+libinput_device_terminate(struct libinput_device *device);
+
 void
 libinput_device_destroy(struct libinput_device *device);