Merge pull request #627 from emersion/wlr-signal-emit-safe

Remove wlr_backend.events.{output_remove,device_remove} 

29 files changed, 50 insertions, 54 deletions

diff --git a/include/wlr/backend.h b/include/wlr/backend.h
index d4b1f773..00dc9fdc 100644
--- a/include/wlr/backend.h
+++ b/include/wlr/backend.h
@@ -12,10 +12,8 @@ struct wlr_backend {
 
 	struct {
 		struct wl_signal destroy;
-		struct wl_signal input_add;
-		struct wl_signal input_remove;
-		struct wl_signal output_add;
-		struct wl_signal output_remove;
+		struct wl_signal new_input;
+		struct wl_signal new_output;
 	} events;
 };
 
diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h
index 133e4f69..90460647 100644
--- a/include/wlr/backend/drm.h
+++ b/include/wlr/backend/drm.h
@@ -2,8 +2,8 @@
 #define WLR_BACKEND_DRM_H
 
 #include <wayland-server.h>
-#include <wlr/backend/session.h>
 #include <wlr/backend.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_output.h>
 
 struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
diff --git a/include/wlr/backend/libinput.h b/include/wlr/backend/libinput.h
index af873628..c7cfe894 100644
--- a/include/wlr/backend/libinput.h
+++ b/include/wlr/backend/libinput.h
@@ -3,8 +3,8 @@
 
 #include <libinput.h>
 #include <wayland-server.h>
-#include <wlr/backend/session.h>
 #include <wlr/backend.h>
+#include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
 
 struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
diff --git a/include/wlr/backend/multi.h b/include/wlr/backend/multi.h
index d9914efc..2dee7403 100644
--- a/include/wlr/backend/multi.h
+++ b/include/wlr/backend/multi.h
@@ -5,17 +5,12 @@
 #include <wlr/backend/session.h>
 
 struct wlr_backend *wlr_multi_backend_create(struct wl_display *display);
-
 void wlr_multi_backend_add(struct wlr_backend *multi,
 	struct wlr_backend *backend);
-
 void wlr_multi_backend_remove(struct wlr_backend *multi,
 	struct wlr_backend *backend);
-
 bool wlr_backend_is_multi(struct wlr_backend *backend);
-
 struct wlr_session *wlr_multi_get_session(struct wlr_backend *base);
-
 bool wlr_multi_is_empty(struct wlr_backend *backend);
 
 #endif
diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h
index 3242a13f..7ff9691f 100644
--- a/include/wlr/backend/session.h
+++ b/include/wlr/backend/session.h
@@ -1,10 +1,10 @@
 #ifndef WLR_BACKEND_SESSION_H
 #define WLR_BACKEND_SESSION_H
 
-#include <stdbool.h>
-#include <wayland-server.h>
 #include <libudev.h>
+#include <stdbool.h>
 #include <sys/types.h>
+#include <wayland-server.h>
 
 struct session_impl;
 
diff --git a/include/wlr/backend/wayland.h b/include/wlr/backend/wayland.h
index f89a6383..e28ffff5 100644
--- a/include/wlr/backend/wayland.h
+++ b/include/wlr/backend/wayland.h
@@ -1,12 +1,12 @@
 #ifndef WLR_BACKEND_WAYLAND_H
 #define WLR_BACKEND_WAYLAND_H
 
+#include <stdbool.h>
 #include <wayland-client.h>
 #include <wayland-server.h>
 #include <wlr/backend.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_output.h>
-#include <stdbool.h>
 
 /**
  * Creates a new wlr_wl_backend. This backend will be created with no outputs;
diff --git a/include/wlr/interfaces/wlr_keyboard.h b/include/wlr/interfaces/wlr_keyboard.h
index 570f5721..6960ea87 100644
--- a/include/wlr/interfaces/wlr_keyboard.h
+++ b/include/wlr/interfaces/wlr_keyboard.h
@@ -1,8 +1,8 @@
 #ifndef WLR_INTERFACES_WLR_KEYBOARD_H
 #define WLR_INTERFACES_WLR_KEYBOARD_H
 
-#include <wlr/types/wlr_keyboard.h>
 #include <stdint.h>
+#include <wlr/types/wlr_keyboard.h>
 
 struct wlr_keyboard_impl {
 	void (*destroy)(struct wlr_keyboard *keyboard);
diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h
index a01f8901..5edd1ae1 100644
--- a/include/wlr/interfaces/wlr_output.h
+++ b/include/wlr/interfaces/wlr_output.h
@@ -2,9 +2,9 @@
 #define WLR_INTERFACES_WLR_OUTPUT_H
 
 #include <stdbool.h>
+#include <wlr/backend.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
-#include <wlr/backend.h>
 
 struct wlr_output_impl {
 	void (*enable)(struct wlr_output *output, bool enable);
diff --git a/include/wlr/render.h b/include/wlr/render.h
index ccc66d36..3743482b 100644
--- a/include/wlr/render.h
+++ b/include/wlr/render.h
@@ -1,9 +1,9 @@
 #ifndef WLR_RENDER_H
 #define WLR_RENDER_H
 
-#include <stdint.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
+#include <stdint.h>
 #include <wayland-server-protocol.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
index 1facc6b8..97a28016 100644
--- a/include/wlr/render/egl.h
+++ b/include/wlr/render/egl.h
@@ -1,10 +1,10 @@
-#ifndef WLR_EGL_H
-#define WLR_EGL_H
+#ifndef WLR_RENDER_EGL_H
+#define WLR_RENDER_EGL_H
 
-#include <stdbool.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <pixman.h>
+#include <stdbool.h>
 #include <wayland-server.h>
 
 struct wlr_egl {
diff --git a/include/wlr/render/gles2.h b/include/wlr/render/gles2.h
index 25e760d5..a924a065 100644
--- a/include/wlr/render/gles2.h
+++ b/include/wlr/render/gles2.h
@@ -1,8 +1,8 @@
 #ifndef WLR_RENDER_GLES2_H
 #define WLR_RENDER_GLES2_H
 
-#include <wlr/render.h>
 #include <wlr/backend.h>
+#include <wlr/render.h>
 
 struct wlr_egl;
 struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_backend *backend);
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index b8e99898..b989e399 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -1,10 +1,10 @@
 #ifndef WLR_RENDER_INTERFACE_H
 #define WLR_RENDER_INTERFACE_H
 
-#include <wayland-server-protocol.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <stdbool.h>
+#include <wayland-server-protocol.h>
 #include <wlr/render.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
diff --git a/include/wlr/types/wlr_cursor.h b/include/wlr/types/wlr_cursor.h
index e072ca05..da010972 100644
--- a/include/wlr/types/wlr_cursor.h
+++ b/include/wlr/types/wlr_cursor.h
@@ -2,10 +2,10 @@
 #define WLR_TYPES_WLR_CURSOR_H
 
 #include <wayland-server.h>
-#include <wlr/types/wlr_output.h>
-#include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_box.h>
+#include <wlr/types/wlr_input_device.h>
+#include <wlr/types/wlr_output_layout.h>
+#include <wlr/types/wlr_output.h>
 
 struct wlr_cursor_state;
 
diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index c67cc4c2..ed0427e8 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/include/wlr/types/wlr_keyboard.h
@@ -1,9 +1,9 @@
 #ifndef WLR_TYPES_WLR_KEYBOARD_H
 #define WLR_TYPES_WLR_KEYBOARD_H
 
-#include <wayland-server.h>
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
+#include <wayland-server.h>
 #include <wayland-server.h>
 #include <xkbcommon/xkbcommon.h>
 
diff --git a/include/wlr/types/wlr_list.h b/include/wlr/types/wlr_list.h
index 78a30995..23bf53b7 100644
--- a/include/wlr/types/wlr_list.h
+++ b/include/wlr/types/wlr_list.h
@@ -1,8 +1,8 @@
-#ifndef WLR_UTIL_LIST_H
-#define WLR_UTIL_LIST_H
+#ifndef WLR_TYPES_WLR_LIST_H
+#define WLR_TYPES_WLR_LIST_H
 
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 struct wlr_list {
 	size_t capacity;
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 8eed06fe..5c2ffee0 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -1,11 +1,11 @@
 #ifndef WLR_TYPES_WLR_OUTPUT_H
 #define WLR_TYPES_WLR_OUTPUT_H
 
+#include <pixman.h>
 #include <stdbool.h>
 #include <time.h>
-#include <pixman.h>
-#include <wayland-util.h>
 #include <wayland-server.h>
+#include <wayland-util.h>
 
 struct wlr_output_mode {
 	uint32_t flags; // enum wl_output_mode
diff --git a/include/wlr/types/wlr_output_damage.h b/include/wlr/types/wlr_output_damage.h
index 52cbce78..6682f942 100644
--- a/include/wlr/types/wlr_output_damage.h
+++ b/include/wlr/types/wlr_output_damage.h
@@ -1,8 +1,8 @@
 #ifndef WLR_TYPES_WLR_OUTPUT_DAMAGE_H
 #define WLR_TYPES_WLR_OUTPUT_DAMAGE_H
 
-#include <time.h>
 #include <pixman.h>
+#include <time.h>
 #include <wlr/types/wlr_output.h>
 
 /**
diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h
index 9187b377..7dd2b16a 100644
--- a/include/wlr/types/wlr_output_layout.h
+++ b/include/wlr/types/wlr_output_layout.h
@@ -1,10 +1,10 @@
 #ifndef WLR_TYPES_WLR_OUTPUT_LAYOUT_H
 #define WLR_TYPES_WLR_OUTPUT_LAYOUT_H
 
+#include <stdbool.h>
+#include <wayland-util.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
-#include <wayland-util.h>
-#include <stdbool.h>
 
 struct wlr_output_layout_state;
 
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h
index 3a6d2175..e7ac9b46 100644
--- a/include/wlr/types/wlr_pointer.h
+++ b/include/wlr/types/wlr_pointer.h
@@ -1,9 +1,9 @@
 #ifndef WLR_TYPES_WLR_POINTER_H
 #define WLR_TYPES_WLR_POINTER_H
 
-#include <wlr/types/wlr_input_device.h>
-#include <wayland-server.h>
 #include <stdint.h>
+#include <wayland-server.h>
+#include <wlr/types/wlr_input_device.h>
 
 struct wlr_pointer_impl;
 
diff --git a/include/wlr/types/wlr_primary_selection.h b/include/wlr/types/wlr_primary_selection.h
index da3c096a..78f23ad6 100644
--- a/include/wlr/types/wlr_primary_selection.h
+++ b/include/wlr/types/wlr_primary_selection.h
@@ -1,8 +1,8 @@
 #ifndef WLR_TYPES_WLR_PRIMARY_SELECTION_H
 #define WLR_TYPES_WLR_PRIMARY_SELECTION_H
 
-#include <wlr/types/wlr_seat.h>
 #include <wayland-server.h>
+#include <wlr/types/wlr_seat.h>
 
 struct wlr_primary_selection_device_manager {
 	struct wl_global *global;
diff --git a/include/wlr/types/wlr_screenshooter.h b/include/wlr/types/wlr_screenshooter.h
index cfe7742d..680d86f0 100644
--- a/include/wlr/types/wlr_screenshooter.h
+++ b/include/wlr/types/wlr_screenshooter.h
@@ -1,5 +1,6 @@
-#ifndef _WLR_SCREENSHOOTER_H
-#define _WLR_SCREENSHOOTER_H
+#ifndef WLR_TYPES_WLR_SCREENSHOOTER_H
+#define WLR_TYPES_WLR_SCREENSHOOTER_H
+
 #include <wayland-server.h>
 
 struct wlr_screenshooter {
diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h
index ffdabd98..b03cab6e 100644
--- a/include/wlr/types/wlr_seat.h
+++ b/include/wlr/types/wlr_seat.h
@@ -1,10 +1,11 @@
 #ifndef WLR_TYPES_WLR_SEAT_H
 #define WLR_TYPES_WLR_SEAT_H
+
 #include <time.h>
-#include <wlr/types/wlr_surface.h>
+#include <wayland-server.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
-#include <wayland-server.h>
+#include <wlr/types/wlr_surface.h>
 
 /**
  * Contains state for a single client's bound wl_seat resource and can be used
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index 50316abc..998b5ae5 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -1,9 +1,10 @@
 #ifndef WLR_TYPES_WLR_SURFACE_H
 #define WLR_TYPES_WLR_SURFACE_H
-#include <stdint.h>
+
+#include <pixman.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <time.h>
-#include <pixman.h>
 #include <wayland-server.h>
 #include <wlr/types/wlr_output.h>
 
diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h
index 51a65dd1..e70db516 100644
--- a/include/wlr/types/wlr_tablet_pad.h
+++ b/include/wlr/types/wlr_tablet_pad.h
@@ -1,9 +1,9 @@
 #ifndef WLR_TYPES_WLR_TABLET_PAD_H
 #define WLR_TYPES_WLR_TABLET_PAD_H
 
-#include <wlr/types/wlr_input_device.h>
-#include <wayland-server.h>
 #include <stdint.h>
+#include <wayland-server.h>
+#include <wlr/types/wlr_input_device.h>
 
 /*
  * NOTE: the wlr tablet pad implementation does not currently support tablets
diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h
index c6984d4d..59e49ef8 100644
--- a/include/wlr/types/wlr_tablet_tool.h
+++ b/include/wlr/types/wlr_tablet_tool.h
@@ -1,9 +1,9 @@
 #ifndef WLR_TYPES_TABLET_TOOL_H
 #define WLR_TYPES_TABLET_TOOL_H
 
-#include <wlr/types/wlr_input_device.h>
-#include <wayland-server.h>
 #include <stdint.h>
+#include <wayland-server.h>
+#include <wlr/types/wlr_input_device.h>
 
 struct wlr_tablet_tool_impl;
 
diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h
index 2925fd01..8ea293eb 100644
--- a/include/wlr/types/wlr_touch.h
+++ b/include/wlr/types/wlr_touch.h
@@ -1,8 +1,8 @@
 #ifndef WLR_TYPES_WLR_TOUCH_H
 #define WLR_TYPES_WLR_TOUCH_H
 
-#include <wayland-server.h>
 #include <stdint.h>
+#include <wayland-server.h>
 
 struct wlr_touch_impl;
 
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index c7b1a24b..7dc746ce 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -1,9 +1,9 @@
 #ifndef WLR_TYPES_WLR_XDG_SHELL_V6_H
 #define WLR_TYPES_WLR_XDG_SHELL_V6_H
 
+#include <wayland-server.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_seat.h>
-#include <wayland-server.h>
 
 struct wlr_xdg_shell_v6 {
 	struct wl_global *wl_global;
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index c0135943..ad7ceb83 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -1,8 +1,8 @@
 #ifndef WLR_XWAYLAND_H
 #define WLR_XWAYLAND_H
 
-#include <time.h>
 #include <stdbool.h>
+#include <time.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_seat.h>
diff --git a/include/wlr/xwm.h b/include/wlr/xwm.h
index 35c43b18..242ff9cc 100644
--- a/include/wlr/xwm.h
+++ b/include/wlr/xwm.h
@@ -1,9 +1,9 @@
-#ifndef XWAYLAND_INTERNALS_H
-#define XWAYLAND_INTERNALS_H
+#ifndef WLR_XWM_H
+#define WLR_XWM_H
 
-#include <xcb/render.h>
 #include <wayland-server-core.h>
 #include <wlr/xwayland.h>
+#include <xcb/render.h>
 
 enum atom_name {
 	WL_SURFACE_ID,