aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/container.c
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2019-08-18 23:16:00 +0300
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-08-20 10:57:20 +0900
commit7488d33d42cfc29c5fbeb02888b1d718bd84d4d0 (patch)
tree502ba754b642d98c6b4413fe545ea31b061180c1 /sway/tree/container.c
parentproperly check pixman_region32_contains_rectangle return (diff)
downloadsway-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/container.c')
-rw-r--r--sway/tree/container.c20
1 files changed, 0 insertions, 20 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 @@
6#include <strings.h> 6#include <strings.h>
7#include <wayland-server-core.h> 7#include <wayland-server-core.h>
8#include <wlr/types/wlr_output_layout.h> 8#include <wlr/types/wlr_output_layout.h>
9#include <wlr/types/wlr_xdg_shell_v6.h>
10#include <wlr/types/wlr_xdg_shell.h>
11#include "cairo.h" 9#include "cairo.h"
12#include "pango.h" 10#include "pango.h"
13#include "sway/config.h" 11#include "sway/config.h"
@@ -187,11 +185,6 @@ static struct sway_container *surface_at_view(struct sway_container *con, double
187 view_sx, view_sy, &_sx, &_sy); 185 view_sx, view_sy, &_sx, &_sy);
188 break; 186 break;
189#endif 187#endif
190 case SWAY_VIEW_XDG_SHELL_V6:
191 _surface = wlr_xdg_surface_v6_surface_at(
192 view->wlr_xdg_surface_v6,
193 view_sx, view_sy, &_sx, &_sy);
194 break;
195 case SWAY_VIEW_XDG_SHELL: 188 case SWAY_VIEW_XDG_SHELL:
196 _surface = wlr_xdg_surface_surface_at( 189 _surface = wlr_xdg_surface_surface_at(
197 view->wlr_xdg_surface, 190 view->wlr_xdg_surface,
@@ -358,19 +351,6 @@ static bool surface_is_popup(struct wlr_surface *surface) {
358 return false; 351 return false;
359 } 352 }
360 353
361 if (wlr_surface_is_xdg_surface_v6(surface)) {
362 struct wlr_xdg_surface_v6 *xdg_surface_v6 =
363 wlr_xdg_surface_v6_from_wlr_surface(surface);
364 while (xdg_surface_v6 &&
365 xdg_surface_v6->role != WLR_XDG_SURFACE_V6_ROLE_NONE) {
366 if (xdg_surface_v6->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) {
367 return true;
368 }
369 xdg_surface_v6 = xdg_surface_v6->toplevel->parent;
370 }
371 return false;
372 }
373
374 return false; 354 return false;
375} 355}
376 356