aboutsummaryrefslogtreecommitdiff
path: root/backend/x11
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-02-12 10:36:43 +0100
committeremersion <contact@emersion.fr>2018-02-12 10:36:43 +0100
commit10ecf871f27ddd7170b6fb9ee7bd055b9cb3423c (patch)
tree6f7fd24b33ae1cf0e2b83c55778d1b2bafb08b6f /backend/x11
parent5e58d46cc1a90810e3ee76203cee8ca2f14fb462 (diff)
Remove wlr_backend.events.{output_remove,device_remove}
Diffstat (limited to 'backend/x11')
-rw-r--r--backend/x11/backend.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 2417810a..5608a2ea 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -230,9 +230,9 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) {
xcb_flush(x11->xcb_conn);
wlr_output_update_enabled(&output->wlr_output, true);
- wlr_signal_emit_safe(&x11->backend.events.output_add, output);
- wlr_signal_emit_safe(&x11->backend.events.input_add, &x11->keyboard_dev);
- wlr_signal_emit_safe(&x11->backend.events.input_add, &x11->pointer_dev);
+ wlr_signal_emit_safe(&x11->backend.events.new_output, output);
+ wlr_signal_emit_safe(&x11->backend.events.new_input, &x11->keyboard_dev);
+ wlr_signal_emit_safe(&x11->backend.events.new_input, &x11->pointer_dev);
wl_event_source_timer_update(x11->frame_timer, 16);
@@ -249,8 +249,8 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) {
struct wlr_x11_output *output = &x11->output;
wlr_output_destroy(&output->wlr_output);
- wlr_signal_emit_safe(&backend->events.input_remove, &x11->pointer_dev);
- wlr_signal_emit_safe(&backend->events.input_remove, &x11->keyboard_dev);
+ wlr_signal_emit_safe(&x11->pointer_dev.events.destroy, &x11->pointer_dev);
+ wlr_signal_emit_safe(&x11->keyboard_dev.events.destroy, &x11->keyboard_dev);
// TODO probably need to use wlr_keyboard_destroy, but the devices need to
// be malloced for that to work
if (x11->keyboard_dev.keyboard->keymap) {