diff options
| author | Simon Ser <contact@emersion.fr> | 2019-08-18 23:16:00 +0300 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-08-20 10:57:20 +0900 |
| commit | 7488d33d42cfc29c5fbeb02888b1d718bd84d4d0 (patch) | |
| tree | 502ba754b642d98c6b4413fe545ea31b061180c1 /sway/tree | |
| parent | 06c36f8435bacefa1a7a06c475dd5fff9b7b97e0 (diff) | |
| download | sway-7488d33d42cfc29c5fbeb02888b1d718bd84d4d0.tar.xz | |
Remove xdg-shell v6 support
All major toolkits and apps have gained xdg-shell stable support.
Closes: https://github.com/swaywm/sway/issues/3690
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/container.c | 20 | ||||
| -rw-r--r-- | sway/tree/view.c | 7 |
2 files changed, 0 insertions, 27 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 7068e166..6620921f 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -6,8 +6,6 @@ #include <strings.h> #include <wayland-server-core.h> #include <wlr/types/wlr_output_layout.h> -#include <wlr/types/wlr_xdg_shell_v6.h> -#include <wlr/types/wlr_xdg_shell.h> #include "cairo.h" #include "pango.h" #include "sway/config.h" @@ -187,11 +185,6 @@ static struct sway_container *surface_at_view(struct sway_container *con, double view_sx, view_sy, &_sx, &_sy); break; #endif - case SWAY_VIEW_XDG_SHELL_V6: - _surface = wlr_xdg_surface_v6_surface_at( - view->wlr_xdg_surface_v6, - view_sx, view_sy, &_sx, &_sy); - break; case SWAY_VIEW_XDG_SHELL: _surface = wlr_xdg_surface_surface_at( view->wlr_xdg_surface, @@ -358,19 +351,6 @@ static bool surface_is_popup(struct wlr_surface *surface) { return false; } - if (wlr_surface_is_xdg_surface_v6(surface)) { - struct wlr_xdg_surface_v6 *xdg_surface_v6 = - wlr_xdg_surface_v6_from_wlr_surface(surface); - while (xdg_surface_v6 && - xdg_surface_v6->role != WLR_XDG_SURFACE_V6_ROLE_NONE) { - if (xdg_surface_v6->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) { - return true; - } - xdg_surface_v6 = xdg_surface_v6->toplevel->parent; - } - return false; - } - return false; } diff --git a/sway/tree/view.c b/sway/tree/view.c index 0f35d970..1d9cbec7 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -132,8 +132,6 @@ uint32_t view_get_window_type(struct sway_view *view) { const char *view_get_shell(struct sway_view *view) { switch(view->type) { - case SWAY_VIEW_XDG_SHELL_V6: - return "xdg_shell_v6"; case SWAY_VIEW_XDG_SHELL: return "xdg_shell"; #if HAVE_XWAYLAND @@ -933,11 +931,6 @@ struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) { wlr_xdg_surface_from_wlr_surface(wlr_surface); return view_from_wlr_xdg_surface(xdg_surface); } - if (wlr_surface_is_xdg_surface_v6(wlr_surface)) { - struct wlr_xdg_surface_v6 *xdg_surface_v6 = - wlr_xdg_surface_v6_from_wlr_surface(wlr_surface); - return view_from_wlr_xdg_surface_v6(xdg_surface_v6); - } #if HAVE_XWAYLAND if (wlr_surface_is_xwayland_surface(wlr_surface)) { struct wlr_xwayland_surface *xsurface = |