aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway/tree/view.h
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 /include/sway/tree/view.h
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 'include/sway/tree/view.h')
-rw-r--r--include/sway/tree/view.h30
1 files changed, 0 insertions, 30 deletions
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 @@
2#define _SWAY_VIEW_H 2#define _SWAY_VIEW_H
3#include <wayland-server-core.h> 3#include <wayland-server-core.h>
4#include <wlr/types/wlr_surface.h> 4#include <wlr/types/wlr_surface.h>
5#include <wlr/types/wlr_xdg_shell_v6.h>
6#include "config.h" 5#include "config.h"
7#if HAVE_XWAYLAND 6#if HAVE_XWAYLAND
8#include <wlr/xwayland.h> 7#include <wlr/xwayland.h>
@@ -14,7 +13,6 @@ struct sway_container;
14struct sway_xdg_decoration; 13struct sway_xdg_decoration;
15 14
16enum sway_view_type { 15enum sway_view_type {
17 SWAY_VIEW_XDG_SHELL_V6,
18 SWAY_VIEW_XDG_SHELL, 16 SWAY_VIEW_XDG_SHELL,
19#if HAVE_XWAYLAND 17#if HAVE_XWAYLAND
20 SWAY_VIEW_XWAYLAND, 18 SWAY_VIEW_XWAYLAND,
@@ -98,7 +96,6 @@ struct sway_view {
98 list_t *executed_criteria; // struct criteria * 96 list_t *executed_criteria; // struct criteria *
99 97
100 union { 98 union {
101 struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
102 struct wlr_xdg_surface *wlr_xdg_surface; 99 struct wlr_xdg_surface *wlr_xdg_surface;
103#if HAVE_XWAYLAND 100#if HAVE_XWAYLAND
104 struct wlr_xwayland_surface *wlr_xwayland_surface; 101 struct wlr_xwayland_surface *wlr_xwayland_surface;
@@ -113,22 +110,6 @@ struct sway_view {
113 struct wl_listener surface_new_subsurface; 110 struct wl_listener surface_new_subsurface;
114}; 111};
115 112
116struct sway_xdg_shell_v6_view {
117 struct sway_view view;
118
119 struct wl_listener commit;
120 struct wl_listener request_move;
121 struct wl_listener request_resize;
122 struct wl_listener request_maximize;
123 struct wl_listener request_fullscreen;
124 struct wl_listener set_title;
125 struct wl_listener set_app_id;
126 struct wl_listener new_popup;
127 struct wl_listener map;
128 struct wl_listener unmap;
129 struct wl_listener destroy;
130};
131
132struct sway_xdg_shell_view { 113struct sway_xdg_shell_view {
133 struct sway_view view; 114 struct sway_view view;
134 115
@@ -214,15 +195,6 @@ struct sway_subsurface {
214 struct wl_listener destroy; 195 struct wl_listener destroy;
215}; 196};
216 197
217struct sway_xdg_popup_v6 {
218 struct sway_view_child child;
219
220 struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
221
222 struct wl_listener new_popup;
223 struct wl_listener destroy;
224};
225
226struct sway_xdg_popup { 198struct sway_xdg_popup {
227 struct sway_view_child child; 199 struct sway_view_child child;
228 200
@@ -332,8 +304,6 @@ void view_child_destroy(struct sway_view_child *child);
332 304
333struct sway_view *view_from_wlr_xdg_surface( 305struct sway_view *view_from_wlr_xdg_surface(
334 struct wlr_xdg_surface *xdg_surface); 306 struct wlr_xdg_surface *xdg_surface);
335struct sway_view *view_from_wlr_xdg_surface_v6(
336 struct wlr_xdg_surface_v6 *xdg_surface_v6);
337#if HAVE_XWAYLAND 307#if HAVE_XWAYLAND
338struct sway_view *view_from_wlr_xwayland_surface( 308struct sway_view *view_from_wlr_xwayland_surface(
339 struct wlr_xwayland_surface *xsurface); 309 struct wlr_xwayland_surface *xsurface);