diff options
| -rw-r--r-- | backend/x11/backend.c | 4 | ||||
| -rw-r--r-- | backend/x11/input_device.c | 24 | ||||
| -rw-r--r-- | include/backend/x11.h | 2 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_keyboard.h | 3 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_pointer.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_keyboard.h | 3 | ||||
| -rw-r--r-- | include/wlr/types/wlr_pointer.h | 2 | ||||
| -rw-r--r-- | types/wlr_keyboard.c | 2 | ||||
| -rw-r--r-- | types/wlr_pointer.c | 2 |
9 files changed, 34 insertions, 10 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index f64515ca..f14bbbe6 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -317,12 +317,12 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, wlr_input_device_init(&x11->keyboard_dev, WLR_INPUT_DEVICE_KEYBOARD, &input_device_impl, "X11 keyboard", 0, 0); - wlr_keyboard_init(&x11->keyboard, NULL); + wlr_keyboard_init(&x11->keyboard, &keyboard_impl); x11->keyboard_dev.keyboard = &x11->keyboard; wlr_input_device_init(&x11->pointer_dev, WLR_INPUT_DEVICE_POINTER, &input_device_impl, "X11 pointer", 0, 0); - wlr_pointer_init(&x11->pointer, NULL); + wlr_pointer_init(&x11->pointer, &pointer_impl); x11->pointer_dev.pointer = &x11->pointer; x11->display_destroy.notify = handle_display_destroy; diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c index 5de5b4c2..42b703cf 100644 --- a/backend/x11/input_device.c +++ b/backend/x11/input_device.c @@ -136,7 +136,29 @@ void handle_x11_input_event(struct wlr_x11_backend *x11, } } -const struct wlr_input_device_impl input_device_impl = { 0 }; +static void input_device_destroy(struct wlr_input_device *wlr_device) { + // Don't free the input device, it's on the stack +} + +const struct wlr_input_device_impl input_device_impl = { + .destroy = input_device_destroy, +}; + +static void keyboard_destroy(struct wlr_keyboard *wlr_keyboard) { + // Don't free the keyboard, it's on the stack +} + +const struct wlr_keyboard_impl keyboard_impl = { + .destroy = keyboard_destroy, +}; + +static void pointer_destroy(struct wlr_pointer *wlr_pointer) { + // Don't free the pointer, it's on the stack +} + +const struct wlr_pointer_impl pointer_impl = { + .destroy = pointer_destroy, +}; void update_x11_pointer_position(struct wlr_x11_output *output, xcb_timestamp_t time) { diff --git a/include/backend/x11.h b/include/backend/x11.h index 6ab1cec6..1d56fbe8 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -77,6 +77,8 @@ struct wlr_x11_output *get_x11_output_from_window_id(struct wlr_x11_backend *x11 void get_x11_output_layout_box(struct wlr_x11_backend *backend, struct wlr_box *box); +extern const struct wlr_keyboard_impl keyboard_impl; +extern const struct wlr_pointer_impl pointer_impl; extern const struct wlr_input_device_impl input_device_impl; void handle_x11_input_event(struct wlr_x11_backend *x11, diff --git a/include/wlr/interfaces/wlr_keyboard.h b/include/wlr/interfaces/wlr_keyboard.h index 6960ea87..c9a13fd7 100644 --- a/include/wlr/interfaces/wlr_keyboard.h +++ b/include/wlr/interfaces/wlr_keyboard.h @@ -9,7 +9,8 @@ struct wlr_keyboard_impl { void (*led_update)(struct wlr_keyboard *keyboard, uint32_t leds); }; -void wlr_keyboard_init(struct wlr_keyboard *keyboard, struct wlr_keyboard_impl *impl); +void wlr_keyboard_init(struct wlr_keyboard *keyboard, + const struct wlr_keyboard_impl *impl); void wlr_keyboard_destroy(struct wlr_keyboard *keyboard); void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard, struct wlr_event_keyboard_key *event); diff --git a/include/wlr/interfaces/wlr_pointer.h b/include/wlr/interfaces/wlr_pointer.h index af677b97..f0cf9081 100644 --- a/include/wlr/interfaces/wlr_pointer.h +++ b/include/wlr/interfaces/wlr_pointer.h @@ -8,7 +8,7 @@ struct wlr_pointer_impl { }; void wlr_pointer_init(struct wlr_pointer *pointer, - struct wlr_pointer_impl *impl); + const struct wlr_pointer_impl *impl); void wlr_pointer_destroy(struct wlr_pointer *pointer); #endif diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h index ed0427e8..bfb4e611 100644 --- a/include/wlr/types/wlr_keyboard.h +++ b/include/wlr/types/wlr_keyboard.h @@ -40,8 +40,7 @@ struct wlr_keyboard_modifiers { }; struct wlr_keyboard { - struct wlr_keyboard_impl *impl; - // TODO: Should this store key repeat info too? + const struct wlr_keyboard_impl *impl; int keymap_fd; size_t keymap_size; diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h index a8969b9e..45619e0a 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -8,7 +8,7 @@ struct wlr_pointer_impl; struct wlr_pointer { - struct wlr_pointer_impl *impl; + const struct wlr_pointer_impl *impl; struct { struct wl_signal motion; diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c index 1d173d7a..0f0cb1cf 100644 --- a/types/wlr_keyboard.c +++ b/types/wlr_keyboard.c @@ -138,7 +138,7 @@ void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard, } void wlr_keyboard_init(struct wlr_keyboard *kb, - struct wlr_keyboard_impl *impl) { + const struct wlr_keyboard_impl *impl) { kb->impl = impl; wl_signal_init(&kb->events.key); wl_signal_init(&kb->events.modifiers); diff --git a/types/wlr_pointer.c b/types/wlr_pointer.c index 9d5dc08c..20e75731 100644 --- a/types/wlr_pointer.c +++ b/types/wlr_pointer.c @@ -5,7 +5,7 @@ #include <wlr/types/wlr_pointer.h> void wlr_pointer_init(struct wlr_pointer *pointer, - struct wlr_pointer_impl *impl) { + const struct wlr_pointer_impl *impl) { pointer->impl = impl; wl_signal_init(&pointer->events.motion); wl_signal_init(&pointer->events.motion_absolute); |