blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1086 from acrisci/input-inhibit-emit-safe 

input-inhibit: use wlr_signal_emit_safe
This commit is contained in:
Drew DeVault 2018-06-24 16:44:53 -07:00 committed by GitHub
parent 4c6d80606d a2ff144429
commit 253a88f030
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
types/wlr_input_inhibitor.c
View File

@ -4,6 +4,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include "wlr/types/wlr_input_inhibitor.h" #include "wlr/types/wlr_input_inhibitor.h"
#include "wlr-input-inhibitor-unstable-v1-protocol.h" #include "wlr-input-inhibitor-unstable-v1-protocol.h"
#include "util/signal.h"
static const struct zwlr_input_inhibit_manager_v1_interface inhibit_manager_implementation; static const struct zwlr_input_inhibit_manager_v1_interface inhibit_manager_implementation;
static struct zwlr_input_inhibitor_v1_interface input_inhibitor_implementation; static struct zwlr_input_inhibitor_v1_interface input_inhibitor_implementation;
@ -26,7 +27,7 @@ static void input_inhibit_manager_deactivate(
} }
manager->active_client = NULL; manager->active_client = NULL;
manager->active_inhibitor = NULL; manager->active_inhibitor = NULL;
wl_signal_emit(&manager->events.deactivate, manager); wlr_signal_emit_safe(&manager->events.deactivate, manager);
} }
static void input_inhibitor_destroy(struct wl_client *client, static void input_inhibitor_destroy(struct wl_client *client,
@ -70,7 +71,7 @@ static void inhibit_manager_get_inhibitor(struct wl_client *client,
manager->active_client = client; manager->active_client = client;
manager->active_inhibitor = wl_resource; manager->active_inhibitor = wl_resource;
wl_signal_emit(&manager->events.activate, manager); wlr_signal_emit_safe(&manager->events.activate, manager);
} }
static const struct zwlr_input_inhibit_manager_v1_interface inhibit_manager_implementation = { static const struct zwlr_input_inhibit_manager_v1_interface inhibit_manager_implementation = {