2 files changed, 0 insertions, 35 deletions

diff --git a/include/sway/server.h b/include/sway/server.h
index 7cbca4f2..a43cbf72 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -12,7 +12,6 @@
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_relative_pointer_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
-#include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include "config.h"
 #include "list.h"
@@ -42,9 +41,6 @@ struct sway_server {
 	struct wlr_layer_shell_v1 *layer_shell;
 	struct wl_listener layer_shell_surface;
 
-	struct wlr_xdg_shell_v6 *xdg_shell_v6;
-	struct wl_listener xdg_shell_v6_surface;
-
 	struct wlr_xdg_shell *xdg_shell;
 	struct wl_listener xdg_shell_surface;
 
@@ -105,7 +101,6 @@ void handle_new_output(struct wl_listener *listener, void *data);
 
 void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data);
 void handle_layer_shell_surface(struct wl_listener *listener, void *data);
-void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
 #if HAVE_XWAYLAND
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index d9f5b8f2..44cd4a7b 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -2,7 +2,6 @@
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
 #include <wlr/types/wlr_surface.h>
-#include <wlr/types/wlr_xdg_shell_v6.h>
 #include "config.h"
 #if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
@@ -14,7 +13,6 @@ struct sway_container;
 struct sway_xdg_decoration;
 
 enum sway_view_type {
-	SWAY_VIEW_XDG_SHELL_V6,
 	SWAY_VIEW_XDG_SHELL,
 #if HAVE_XWAYLAND
 	SWAY_VIEW_XWAYLAND,
@@ -98,7 +96,6 @@ struct sway_view {
 	list_t *executed_criteria; // struct criteria *
 
 	union {
-		struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
 		struct wlr_xdg_surface *wlr_xdg_surface;
 #if HAVE_XWAYLAND
 		struct wlr_xwayland_surface *wlr_xwayland_surface;
@@ -113,22 +110,6 @@ struct sway_view {
 	struct wl_listener surface_new_subsurface;
 };
 
-struct sway_xdg_shell_v6_view {
-	struct sway_view view;
-
-	struct wl_listener commit;
-	struct wl_listener request_move;
-	struct wl_listener request_resize;
-	struct wl_listener request_maximize;
-	struct wl_listener request_fullscreen;
-	struct wl_listener set_title;
-	struct wl_listener set_app_id;
-	struct wl_listener new_popup;
-	struct wl_listener map;
-	struct wl_listener unmap;
-	struct wl_listener destroy;
-};
-
 struct sway_xdg_shell_view {
 	struct sway_view view;
 
@@ -214,15 +195,6 @@ struct sway_subsurface {
 	struct wl_listener destroy;
 };
 
-struct sway_xdg_popup_v6 {
-	struct sway_view_child child;
-
-	struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
-
-	struct wl_listener new_popup;
-	struct wl_listener destroy;
-};
-
 struct sway_xdg_popup {
 	struct sway_view_child child;
 
@@ -332,8 +304,6 @@ void view_child_destroy(struct sway_view_child *child);
 
 struct sway_view *view_from_wlr_xdg_surface(
 	struct wlr_xdg_surface *xdg_surface);
-struct sway_view *view_from_wlr_xdg_surface_v6(
-	struct wlr_xdg_surface_v6 *xdg_surface_v6);
 #if HAVE_XWAYLAND
 struct sway_view *view_from_wlr_xwayland_surface(
 	struct wlr_xwayland_surface *xsurface);