Remove wlr_wl_shell

2 files changed, 0 insertions, 33 deletions

diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index fdd3abe0..bc582334 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -24,7 +24,6 @@
 #include <wlr/types/wlr_screenshooter.h>
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
-#include <wlr/types/wlr_wl_shell.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/types/wlr_xdg_decoration_v1.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
@@ -46,7 +45,6 @@ struct roots_desktop {
 	struct wlr_xcursor_manager *xcursor_manager;
 
 	struct wlr_compositor *compositor;
-	struct wlr_wl_shell *wl_shell;
 	struct wlr_xdg_shell_v6 *xdg_shell_v6;
 	struct wlr_xdg_shell *xdg_shell;
 	struct wlr_gamma_control_manager *gamma_control_manager;
@@ -76,7 +74,6 @@ struct roots_desktop {
 	struct wl_listener layout_change;
 	struct wl_listener xdg_shell_v6_surface;
 	struct wl_listener xdg_shell_surface;
-	struct wl_listener wl_shell_surface;
 	struct wl_listener layer_shell_surface;
 	struct wl_listener xdg_toplevel_decoration;
 	struct wl_listener input_inhibit_activate;
@@ -107,7 +104,6 @@ struct wlr_surface *desktop_surface_at(struct roots_desktop *desktop,
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
 void handle_xdg_toplevel_decoration(struct wl_listener *listener, void *data);
-void handle_wl_shell_surface(struct wl_listener *listener, void *data);
 void handle_layer_shell_surface(struct wl_listener *listener, void *data);
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
 
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 531c615b..1a56de4b 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -26,7 +26,6 @@ struct roots_view_interface {
 };
 
 enum roots_view_type {
-	ROOTS_WL_SHELL_VIEW,
 	ROOTS_XDG_SHELL_V6_VIEW,
 	ROOTS_XDG_SHELL_VIEW,
 #if WLR_HAS_XWAYLAND
@@ -78,24 +77,6 @@ struct roots_view {
 	} events;
 };
 
-struct roots_wl_shell_surface {
-	struct roots_view view;
-
-	struct wlr_wl_shell_surface *wl_shell_surface;
-
-	struct wl_listener destroy;
-	struct wl_listener new_popup;
-	struct wl_listener request_move;
-	struct wl_listener request_resize;
-	struct wl_listener request_maximize;
-	struct wl_listener request_fullscreen;
-	struct wl_listener set_state;
-	struct wl_listener set_title;
-	struct wl_listener set_class;
-
-	struct wl_listener surface_commit;
-};
-
 struct roots_xdg_surface_v6 {
 	struct roots_view view;
 
@@ -187,14 +168,6 @@ struct roots_subsurface {
 	struct wl_listener unmap;
 };
 
-struct roots_wl_shell_popup {
-	struct roots_view_child view_child;
-	struct wlr_wl_shell_surface *wlr_wl_shell_surface;
-	struct wl_listener destroy;
-	struct wl_listener set_state;
-	struct wl_listener new_popup;
-};
-
 struct roots_xdg_popup_v6 {
 	struct roots_view_child view_child;
 	struct wlr_xdg_popup_v6 *wlr_popup;
@@ -255,8 +228,6 @@ void view_get_deco_box(const struct roots_view *view, struct wlr_box *box);
 void view_for_each_surface(struct roots_view *view,
 	wlr_surface_iterator_func_t iterator, void *user_data);
 
-struct roots_wl_shell_surface *roots_wl_shell_surface_from_view(
-	struct roots_view *view);
 struct roots_xdg_surface *roots_xdg_surface_from_view(struct roots_view *view);
 struct roots_xdg_surface_v6 *roots_xdg_surface_v6_from_view(
 	struct roots_view *view);