Remove wlr_backend.events.{output_remove,device_remove}

6 files changed, 10 insertions, 10 deletions

diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 1232121a..a2121701 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -39,8 +39,7 @@ struct roots_desktop {
 	struct wlr_primary_selection_device_manager *primary_selection_device_manager;
 	struct wlr_idle *idle;
 
-	struct wl_listener output_add;
-	struct wl_listener output_remove;
+	struct wl_listener new_output;
 	struct wl_listener layout_change;
 	struct wl_listener xdg_shell_v6_surface;
 	struct wl_listener wl_shell_surface;
diff --git a/include/rootston/input.h b/include/rootston/input.h
index 726dda24..d05cbb0a 100644
--- a/include/rootston/input.h
+++ b/include/rootston/input.h
@@ -13,8 +13,7 @@ struct roots_input {
 	struct roots_config *config;
 	struct roots_server *server;
 
-	struct wl_listener input_add;
-	struct wl_listener input_remove;
+	struct wl_listener new_input;
 
 	struct wl_list seats;
 };
diff --git a/include/rootston/keyboard.h b/include/rootston/keyboard.h
index 39650d7c..4548f4a7 100644
--- a/include/rootston/keyboard.h
+++ b/include/rootston/keyboard.h
@@ -13,6 +13,7 @@ struct roots_keyboard {
 	struct roots_keyboard_config *config;
 	struct wl_list link;
 
+	struct wl_listener device_destroy;
 	struct wl_listener keyboard_key;
 	struct wl_listener keyboard_modifiers;
 
diff --git a/include/rootston/output.h b/include/rootston/output.h
index 7f42904f..8396e7c5 100644
--- a/include/rootston/output.h
+++ b/include/rootston/output.h
@@ -18,11 +18,11 @@ struct roots_output {
 	struct timespec last_frame;
 	struct wlr_output_damage *damage;
 
+	struct wl_listener destroy;
 	struct wl_listener frame;
 };
 
-void output_add_notify(struct wl_listener *listener, void *data);
-void output_remove_notify(struct wl_listener *listener, void *data);
+void handle_new_output(struct wl_listener *listener, void *data);
 
 struct roots_view;
 struct roots_drag_icon;
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index 0047522c..cd819076 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -56,18 +56,21 @@ struct roots_drag_icon {
 struct roots_pointer {
 	struct roots_seat *seat;
 	struct wlr_input_device *device;
+	struct wl_listener device_destroy;
 	struct wl_list link;
 };
 
 struct roots_touch {
 	struct roots_seat *seat;
 	struct wlr_input_device *device;
+	struct wl_listener device_destroy;
 	struct wl_list link;
 };
 
 struct roots_tablet_tool {
 	struct roots_seat *seat;
 	struct wlr_input_device *device;
+	struct wl_listener device_destroy;
 	struct wl_listener axis;
 	struct wl_listener proximity;
 	struct wl_listener tip;
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;
 };