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/view.c | |
parent | properly check pixman_region32_contains_rectangle return (diff) | |
download | sway-7488d33d42cfc29c5fbeb02888b1d718bd84d4d0.tar.gz sway-7488d33d42cfc29c5fbeb02888b1d718bd84d4d0.tar.zst sway-7488d33d42cfc29c5fbeb02888b1d718bd84d4d0.zip |
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/view.c')
-rw-r--r-- | sway/tree/view.c | 7 |
1 files changed, 0 insertions, 7 deletions
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) { | |||
132 | 132 | ||
133 | const char *view_get_shell(struct sway_view *view) { | 133 | const char *view_get_shell(struct sway_view *view) { |
134 | switch(view->type) { | 134 | switch(view->type) { |
135 | case SWAY_VIEW_XDG_SHELL_V6: | ||
136 | return "xdg_shell_v6"; | ||
137 | case SWAY_VIEW_XDG_SHELL: | 135 | case SWAY_VIEW_XDG_SHELL: |
138 | return "xdg_shell"; | 136 | return "xdg_shell"; |
139 | #if HAVE_XWAYLAND | 137 | #if HAVE_XWAYLAND |
@@ -933,11 +931,6 @@ struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) { | |||
933 | wlr_xdg_surface_from_wlr_surface(wlr_surface); | 931 | wlr_xdg_surface_from_wlr_surface(wlr_surface); |
934 | return view_from_wlr_xdg_surface(xdg_surface); | 932 | return view_from_wlr_xdg_surface(xdg_surface); |
935 | } | 933 | } |
936 | if (wlr_surface_is_xdg_surface_v6(wlr_surface)) { | ||
937 | struct wlr_xdg_surface_v6 *xdg_surface_v6 = | ||
938 | wlr_xdg_surface_v6_from_wlr_surface(wlr_surface); | ||
939 | return view_from_wlr_xdg_surface_v6(xdg_surface_v6); | ||
940 | } | ||
941 | #if HAVE_XWAYLAND | 934 | #if HAVE_XWAYLAND |
942 | if (wlr_surface_is_xwayland_surface(wlr_surface)) { | 935 | if (wlr_surface_is_xwayland_surface(wlr_surface)) { |
943 | struct wlr_xwayland_surface *xsurface = | 936 | struct wlr_xwayland_surface *xsurface = |