From 7488d33d42cfc29c5fbeb02888b1d718bd84d4d0 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Sun, 18 Aug 2019 23:16:00 +0300 Subject: Remove xdg-shell v6 support All major toolkits and apps have gained xdg-shell stable support. Closes: https://github.com/swaywm/sway/issues/3690 --- include/sway/tree/view.h | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'include/sway/tree/view.h') 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 #include -#include #include "config.h" #if HAVE_XWAYLAND #include @@ -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); -- cgit v1.2.3