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 /include | |
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 'include')
-rw-r--r-- | include/sway/server.h | 5 | ||||
-rw-r--r-- | include/sway/tree/view.h | 30 |
2 files changed, 0 insertions, 35 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 7cbca4f2..a43cbf72 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <wlr/types/wlr_presentation_time.h> | 12 | #include <wlr/types/wlr_presentation_time.h> |
13 | #include <wlr/types/wlr_relative_pointer_v1.h> | 13 | #include <wlr/types/wlr_relative_pointer_v1.h> |
14 | #include <wlr/types/wlr_server_decoration.h> | 14 | #include <wlr/types/wlr_server_decoration.h> |
15 | #include <wlr/types/wlr_xdg_shell_v6.h> | ||
16 | #include <wlr/types/wlr_xdg_shell.h> | 15 | #include <wlr/types/wlr_xdg_shell.h> |
17 | #include "config.h" | 16 | #include "config.h" |
18 | #include "list.h" | 17 | #include "list.h" |
@@ -42,9 +41,6 @@ struct sway_server { | |||
42 | struct wlr_layer_shell_v1 *layer_shell; | 41 | struct wlr_layer_shell_v1 *layer_shell; |
43 | struct wl_listener layer_shell_surface; | 42 | struct wl_listener layer_shell_surface; |
44 | 43 | ||
45 | struct wlr_xdg_shell_v6 *xdg_shell_v6; | ||
46 | struct wl_listener xdg_shell_v6_surface; | ||
47 | |||
48 | struct wlr_xdg_shell *xdg_shell; | 44 | struct wlr_xdg_shell *xdg_shell; |
49 | struct wl_listener xdg_shell_surface; | 45 | struct wl_listener xdg_shell_surface; |
50 | 46 | ||
@@ -105,7 +101,6 @@ void handle_new_output(struct wl_listener *listener, void *data); | |||
105 | 101 | ||
106 | void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data); | 102 | void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data); |
107 | void handle_layer_shell_surface(struct wl_listener *listener, void *data); | 103 | void handle_layer_shell_surface(struct wl_listener *listener, void *data); |
108 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); | ||
109 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); | 104 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); |
110 | #if HAVE_XWAYLAND | 105 | #if HAVE_XWAYLAND |
111 | void handle_xwayland_surface(struct wl_listener *listener, void *data); | 106 | void handle_xwayland_surface(struct wl_listener *listener, void *data); |
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; | |||
14 | struct sway_xdg_decoration; | 13 | struct sway_xdg_decoration; |
15 | 14 | ||
16 | enum sway_view_type { | 15 | enum 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 | ||
116 | struct 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 | |||
132 | struct sway_xdg_shell_view { | 113 | struct 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 | ||
217 | struct 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 | |||
226 | struct sway_xdg_popup { | 198 | struct 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 | ||
333 | struct sway_view *view_from_wlr_xdg_surface( | 305 | struct sway_view *view_from_wlr_xdg_surface( |
334 | struct wlr_xdg_surface *xdg_surface); | 306 | struct wlr_xdg_surface *xdg_surface); |
335 | struct 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 |
338 | struct sway_view *view_from_wlr_xwayland_surface( | 308 | struct sway_view *view_from_wlr_xwayland_surface( |
339 | struct wlr_xwayland_surface *xsurface); | 309 | struct wlr_xwayland_surface *xsurface); |