Remove wlr_wl_shell

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);
 

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);

include/wlr/types/meson.build

@@ -45,7 +45,6 @@ install_headers(
 	'wlr_text_input_v3.h',
 	'wlr_touch.h',
 	'wlr_virtual_keyboard_v1.h',
-	'wlr_wl_shell.h',
 	'wlr_xcursor_manager.h',
 	'wlr_xdg_decoration_v1.h',
 	'wlr_xdg_output_v1.h',

rootston/desktop.c

@@ -21,7 +21,6 @@
 #include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
 #include <wlr/types/wlr_tablet_v2.h>
-#include <wlr/types/wlr_wl_shell.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
@@ -38,13 +37,6 @@
 
 static bool view_at(struct roots_view *view, double lx, double ly,
 		struct wlr_surface **surface, double *sx, double *sy) {
-	if (view->type == ROOTS_WL_SHELL_VIEW) {
-		struct wlr_wl_shell_surface *wl_shell_surface =
-			roots_wl_shell_surface_from_view(view)->wl_shell_surface;
-		if (wl_shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_POPUP) {
-			return false;
-		}
-	}
 	if (view->wlr_surface == NULL) {
 		return false;
 	}
@@ -69,12 +61,6 @@ static bool view_at(struct roots_view *view, double lx, double ly,
 		_surface = wlr_xdg_surface_surface_at(xdg_surface->xdg_surface,
 			view_sx, view_sy, &_sx, &_sy);
 		break;
-	case ROOTS_WL_SHELL_VIEW:;
-		struct roots_wl_shell_surface *wl_shell_surface =
-			roots_wl_shell_surface_from_view(view);
-		_surface = wlr_wl_shell_surface_surface_at(
-			wl_shell_surface->wl_shell_surface, view_sx, view_sy, &_sx, &_sy);
-		break;
 #if WLR_HAS_XWAYLAND
 	case ROOTS_XWAYLAND_VIEW:
 		_surface = wlr_surface_surface_at(view->wlr_surface,
@@ -330,11 +316,6 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 		&desktop->xdg_shell_surface);
 	desktop->xdg_shell_surface.notify = handle_xdg_shell_surface;
 
-	desktop->wl_shell = wlr_wl_shell_create(server->wl_display);
-	wl_signal_add(&desktop->wl_shell->events.new_surface,
-		&desktop->wl_shell_surface);
-	desktop->wl_shell_surface.notify = handle_wl_shell_surface;
-
 	desktop->layer_shell = wlr_layer_shell_v1_create(server->wl_display);
 	wl_signal_add(&desktop->layer_shell->events.new_surface,
 		&desktop->layer_shell_surface);

rootston/meson.build

@@ -15,7 +15,6 @@ sources = [
 	'text_input.c',
 	'view.c',
 	'virtual_keyboard.c',
-	'wl_shell.c',
 	'xdg_shell_v6.c',
 	'xdg_shell.c',
 ]

rootston/output.c

@@ -8,7 +8,6 @@
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_presentation_time.h>
-#include <wlr/types/wlr_wl_shell.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>