From 36ead80cd19b4c1773b894750ecf7fcec63f9b9b Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 12 Feb 2018 19:45:58 +0100 Subject: [PATCH] Make wlr_signal_emit_safe private --- backend/drm/backend.c | 2 +- backend/drm/drm.c | 2 +- backend/headless/backend.c | 2 +- backend/headless/input_device.c | 2 +- backend/headless/output.c | 2 +- backend/libinput/backend.c | 2 +- backend/libinput/events.c | 2 +- backend/libinput/pointer.c | 2 +- backend/libinput/tablet_pad.c | 2 +- backend/libinput/tablet_tool.c | 2 +- backend/libinput/touch.c | 2 +- backend/multi/backend.c | 2 +- backend/session/direct-freebsd.c | 2 +- backend/session/direct.c | 2 +- backend/session/logind.c | 2 +- backend/session/session.c | 2 +- backend/wayland/backend.c | 2 +- backend/wayland/output.c | 2 +- backend/wayland/wl_seat.c | 2 +- backend/x11/backend.c | 2 +- include/{wlr => }/util/signal.h | 0 render/gles2/texture.c | 2 +- rootston/desktop.c | 3 +-- types/wlr_compositor.c | 2 +- types/wlr_cursor.c | 2 +- types/wlr_data_device.c | 2 +- types/wlr_gamma_control.c | 2 +- types/wlr_idle.c | 2 +- types/wlr_input_device.c | 2 +- types/wlr_keyboard.c | 2 +- types/wlr_output.c | 2 +- types/wlr_output_damage.c | 2 +- types/wlr_output_layout.c | 2 +- types/wlr_primary_selection.c | 2 +- types/wlr_seat.c | 2 +- types/wlr_server_decoration.c | 2 +- types/wlr_surface.c | 2 +- types/wlr_wl_shell.c | 2 +- types/wlr_xdg_shell_v6.c | 2 +- util/signal.c | 2 +- xwayland/xwayland.c | 2 +- xwayland/xwm.c | 2 +- 42 files changed, 41 insertions(+), 42 deletions(-) rename include/{wlr => }/util/signal.h (100%) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 4d09e078..682e8c85 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include "backend/drm/drm.h" diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 7af242bc..5189ec90 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include #include diff --git a/backend/headless/backend.c b/backend/headless/backend.c index 703dc8cd..a79e4af8 100644 --- a/backend/headless/backend.c +++ b/backend/headless/backend.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include #include "backend/headless.h" diff --git a/backend/headless/input_device.c b/backend/headless/input_device.c index 6b2bc4e7..5d7ca34b 100644 --- a/backend/headless/input_device.c +++ b/backend/headless/input_device.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/headless.h" static void input_device_destroy(struct wlr_input_device *wlr_dev) { diff --git a/backend/headless/output.c b/backend/headless/output.c index f31b7d37..63f0b6b4 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/headless.h" static EGLSurface egl_create_surface(struct wlr_egl *egl, unsigned int width, diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c index 5b815a0c..1ec73009 100644 --- a/backend/libinput/backend.c +++ b/backend/libinput/backend.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/libinput.h" static int wlr_libinput_open_restricted(const char *path, diff --git a/backend/libinput/events.c b/backend/libinput/events.c index 4bcfa539..248b8213 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/libinput.h" struct wlr_input_device *get_appropriate_device( diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c index f80f4f84..560e95b5 100644 --- a/backend/libinput/pointer.c +++ b/backend/libinput/pointer.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/libinput.h" struct wlr_pointer *wlr_libinput_pointer_create( diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c index 54315581..e8ffc6dd 100644 --- a/backend/libinput/tablet_pad.c +++ b/backend/libinput/tablet_pad.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/libinput.h" struct wlr_tablet_pad *wlr_libinput_tablet_pad_create( diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c index 2f28540b..0f2ea70a 100644 --- a/backend/libinput/tablet_tool.c +++ b/backend/libinput/tablet_tool.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/libinput.h" struct wlr_tablet_tool *wlr_libinput_tablet_tool_create( diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c index d496d792..fb2b8e3f 100644 --- a/backend/libinput/touch.c +++ b/backend/libinput/touch.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/libinput.h" struct wlr_touch *wlr_libinput_touch_create( diff --git a/backend/multi/backend.c b/backend/multi/backend.c index 02738f59..1005e6b7 100644 --- a/backend/multi/backend.c +++ b/backend/multi/backend.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/multi.h" #include "backend/drm/drm.h" diff --git a/backend/session/direct-freebsd.c b/backend/session/direct-freebsd.c index fe4ff653..ceaae2be 100644 --- a/backend/session/direct-freebsd.c +++ b/backend/session/direct-freebsd.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/session/direct-ipc.h" const struct session_impl session_direct; diff --git a/backend/session/direct.c b/backend/session/direct.c index 245683ea..1f60ed23 100644 --- a/backend/session/direct.c +++ b/backend/session/direct.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/session/direct-ipc.h" enum { DRM_MAJOR = 226 }; diff --git a/backend/session/logind.c b/backend/session/logind.c index f6150817..b2206e15 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include "util/signal.h" #ifdef WLR_HAS_SYSTEMD #include diff --git a/backend/session/session.c b/backend/session/session.c index 4b81e230..ac55a191 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include "util/signal.h" extern const struct session_impl session_logind; extern const struct session_impl session_direct; diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 2907057c..60c8ede9 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/wayland.h" #include "xdg-shell-unstable-v6-client-protocol.h" diff --git a/backend/wayland/output.c b/backend/wayland/output.c index b1cc6836..fed4c63a 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/wayland.h" #include "xdg-shell-unstable-v6-client-protocol.h" diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c index 18114119..f6328106 100644 --- a/backend/wayland/wl_seat.c +++ b/backend/wayland/wl_seat.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/wayland.h" static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 5608a2ea..2715b366 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include "util/signal.h" #include "backend/x11.h" static struct wlr_backend_impl backend_impl; diff --git a/include/wlr/util/signal.h b/include/util/signal.h similarity index 100% rename from include/wlr/util/signal.h rename to include/util/signal.h diff --git a/render/gles2/texture.c b/render/gles2/texture.c index 54cee627..a594f23e 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include "util/signal.h" #include "render/gles2.h" static struct pixel_format external_pixel_format = { diff --git a/rootston/desktop.c b/rootston/desktop.c index 753a85e5..68da45e0 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -16,7 +16,6 @@ #include #include #include -#include #include "rootston/server.h" #include "rootston/seat.h" #include "rootston/xcursor.h" @@ -384,7 +383,7 @@ struct roots_subsurface *subsurface_create(struct roots_view *view, void view_finish(struct roots_view *view) { view_damage_whole(view); - wlr_signal_emit_safe(&view->events.destroy, view); + wl_signal_emit(&view->events.destroy, view); wl_list_remove(&view->new_subsurface.link); diff --git a/types/wlr_compositor.c b/types/wlr_compositor.c index bab41b85..bd56b0fb 100644 --- a/types/wlr_compositor.c +++ b/types/wlr_compositor.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include #include diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c index 564ead46..4f3d8727 100644 --- a/types/wlr_cursor.c +++ b/types/wlr_cursor.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include #include diff --git a/types/wlr_data_device.c b/types/wlr_data_device.c index ae3219f1..7153dd53 100644 --- a/types/wlr_data_device.c +++ b/types/wlr_data_device.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include diff --git a/types/wlr_gamma_control.c b/types/wlr_gamma_control.c index f7644230..214dfd21 100644 --- a/types/wlr_gamma_control.c +++ b/types/wlr_gamma_control.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include "util/signal.h" #include "gamma-control-protocol.h" static void resource_destroy(struct wl_client *client, diff --git a/types/wlr_idle.c b/types/wlr_idle.c index b30bb9d7..1976004f 100644 --- a/types/wlr_idle.c +++ b/types/wlr_idle.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include "util/signal.h" #include "idle-protocol.h" static void idle_timeout_destroy(struct wlr_idle_timeout *timer) { diff --git a/types/wlr_input_device.c b/types/wlr_input_device.c index f88b7197..372b3a7b 100644 --- a/types/wlr_input_device.c +++ b/types/wlr_input_device.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include "util/signal.h" void wlr_input_device_init(struct wlr_input_device *dev, enum wlr_input_device_type type, diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c index 9fac1843..6f09d599 100644 --- a/types/wlr_keyboard.c +++ b/types/wlr_keyboard.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include "util/signal.h" int os_create_anonymous_file(off_t size); diff --git a/types/wlr_output.c b/types/wlr_output.c index bac8b7ce..7dcf4c78 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include "util/signal.h" static void wl_output_send_to_resource(struct wl_resource *resource) { assert(resource); diff --git a/types/wlr_output_damage.c b/types/wlr_output_damage.c index 2c6e24f0..c231a900 100644 --- a/types/wlr_output_damage.c +++ b/types/wlr_output_damage.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include #include diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c index ea8581b3..ea7b81c5 100644 --- a/types/wlr_output_layout.c +++ b/types/wlr_output_layout.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include #include diff --git a/types/wlr_primary_selection.c b/types/wlr_primary_selection.c index 7eb5d97a..45d71f19 100644 --- a/types/wlr_primary_selection.c +++ b/types/wlr_primary_selection.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include "util/signal.h" static void offer_handle_receive(struct wl_client *client, struct wl_resource *resource, const char *mime_type, int32_t fd) { diff --git a/types/wlr_seat.c b/types/wlr_seat.c index b9d8b1b8..3ad4d81d 100644 --- a/types/wlr_seat.c +++ b/types/wlr_seat.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include diff --git a/types/wlr_server_decoration.c b/types/wlr_server_decoration.c index f648cce7..ffa0477c 100644 --- a/types/wlr_server_decoration.c +++ b/types/wlr_server_decoration.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include "util/signal.h" static void server_decoration_handle_release(struct wl_client *client, struct wl_resource *resource) { diff --git a/types/wlr_surface.c b/types/wlr_surface.c index e430339b..b761bab5 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include #include diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 0c4e01fd..e9d52cc9 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include #include diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index b6eee875..30870d3b 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include "util/signal.h" #include "xdg-shell-unstable-v6-protocol.h" static const char *wlr_desktop_xdg_toplevel_role = "xdg_toplevel"; diff --git a/util/signal.c b/util/signal.c index 91c4f571..39618465 100644 --- a/util/signal.c +++ b/util/signal.c @@ -1,4 +1,4 @@ -#include +#include "util/signal.h" static void handle_noop(struct wl_listener *listener, void *data) { // Do nothing diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index 7c57b6c0..74555edb 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include "util/signal.h" #include "sockets.h" #include "wlr/xwm.h" diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 86d8bde7..425188c7 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include "util/signal.h" #include #include #include