aboutsummaryrefslogtreecommitdiff
path: root/backend/multi
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-02-12 09:12:31 +0100
committeremersion <contact@emersion.fr>2018-02-12 09:12:31 +0100
commit5e58d46cc1a90810e3ee76203cee8ca2f14fb462 (patch)
treea5019d87cdc121842ab7cf867fbcac0fde4ccff0 /backend/multi
parent3497e53516d96ad67b26115e2e06218f68e1114d (diff)
Add wlr_signal_emit_safe
Diffstat (limited to 'backend/multi')
-rw-r--r--backend/multi/backend.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/backend/multi/backend.c b/backend/multi/backend.c
index 78f5c63b..14f774d0 100644
--- a/backend/multi/backend.c
+++ b/backend/multi/backend.c
@@ -4,6 +4,7 @@
#include <wlr/backend/interface.h>
#include <wlr/backend/session.h>
#include <wlr/util/log.h>
+#include <wlr/util/signal.h>
#include "backend/multi.h"
#include "backend/drm/drm.h"
@@ -51,7 +52,7 @@ static void multi_backend_destroy(struct wlr_backend *wlr_backend) {
}
// Destroy this backend only after removing all sub-backends
- wl_signal_emit(&wlr_backend->events.destroy, backend);
+ wlr_signal_emit_safe(&wlr_backend->events.destroy, backend);
free(backend);
}
@@ -120,25 +121,25 @@ bool wlr_backend_is_multi(struct wlr_backend *b) {
static void input_add_reemit(struct wl_listener *listener, void *data) {
struct subbackend_state *state = wl_container_of(listener,
state, input_add);
- wl_signal_emit(&state->container->events.input_add, data);
+ wlr_signal_emit_safe(&state->container->events.input_add, data);
}
static void input_remove_reemit(struct wl_listener *listener, void *data) {
struct subbackend_state *state = wl_container_of(listener,
state, input_remove);
- wl_signal_emit(&state->container->events.input_remove, data);
+ wlr_signal_emit_safe(&state->container->events.input_remove, data);
}
static void output_add_reemit(struct wl_listener *listener, void *data) {
struct subbackend_state *state = wl_container_of(listener,
state, output_add);
- wl_signal_emit(&state->container->events.output_add, data);
+ wlr_signal_emit_safe(&state->container->events.output_add, data);
}
static void output_remove_reemit(struct wl_listener *listener, void *data) {
struct subbackend_state *state = wl_container_of(listener,
state, output_remove);
- wl_signal_emit(&state->container->events.output_remove, data);
+ wlr_signal_emit_safe(&state->container->events.output_remove, data);
}
static void handle_subbackend_destroy(struct wl_listener *listener,
@@ -194,7 +195,7 @@ void wlr_multi_backend_add(struct wlr_backend *_multi,
wl_signal_add(&backend->events.output_remove, &sub->output_remove);
sub->output_remove.notify = output_remove_reemit;
- wl_signal_emit(&multi->events.backend_add, backend);
+ wlr_signal_emit_safe(&multi->events.backend_add, backend);
}
void wlr_multi_backend_remove(struct wlr_backend *_multi,
@@ -206,7 +207,7 @@ void wlr_multi_backend_remove(struct wlr_backend *_multi,
multi_backend_get_subbackend(multi, backend);
if (sub) {
- wl_signal_emit(&multi->events.backend_remove, backend);
+ wlr_signal_emit_safe(&multi->events.backend_remove, backend);
subbackend_state_destroy(sub);
}
}