summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-05-14 08:33:55 -0400
committerLibravatar GitHub <noreply@github.com>2018-05-14 08:33:55 -0400
commit1837756dbed222a6233366f186693e1aeefc2439 (patch)
tree9793561e72a8d1b1f948080b5e36f98dbfa89619 /include
parentMerge pull request #1968 from RyanDwyer/fix-criteria (diff)
parentKill wl_shell (diff)
downloadsway-1837756dbed222a6233366f186693e1aeefc2439.tar.gz
sway-1837756dbed222a6233366f186693e1aeefc2439.tar.zst
sway-1837756dbed222a6233366f186693e1aeefc2439.zip
Merge pull request #1871 from emersion/kill-wl-shell
Kill wl_shell
Diffstat (limited to 'include')
-rw-r--r--include/sway/server.h1
-rw-r--r--include/sway/tree/view.h15
2 files changed, 0 insertions, 16 deletions
diff --git a/include/sway/server.h b/include/sway/server.h
index d04ea896..c95ee0f3 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -58,6 +58,5 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data);
58void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); 58void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
59void handle_xdg_shell_surface(struct wl_listener *listener, void *data); 59void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
60void handle_xwayland_surface(struct wl_listener *listener, void *data); 60void handle_xwayland_surface(struct wl_listener *listener, void *data);
61void handle_wl_shell_surface(struct wl_listener *listener, void *data);
62 61
63#endif 62#endif
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 7c07842b..9af13004 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -10,7 +10,6 @@
10struct sway_container; 10struct sway_container;
11 11
12enum sway_view_type { 12enum sway_view_type {
13 SWAY_VIEW_WL_SHELL,
14 SWAY_VIEW_XDG_SHELL_V6, 13 SWAY_VIEW_XDG_SHELL_V6,
15 SWAY_VIEW_XDG_SHELL, 14 SWAY_VIEW_XDG_SHELL,
16 SWAY_VIEW_XWAYLAND, 15 SWAY_VIEW_XWAYLAND,
@@ -139,20 +138,6 @@ struct sway_xwayland_unmanaged {
139 struct wl_listener destroy; 138 struct wl_listener destroy;
140}; 139};
141 140
142struct sway_wl_shell_view {
143 struct sway_view view;
144
145 struct wl_listener commit;
146 struct wl_listener request_move;
147 struct wl_listener request_resize;
148 struct wl_listener request_maximize;
149 struct wl_listener request_fullscreen;
150 struct wl_listener set_state;
151 struct wl_listener destroy;
152
153 int pending_width, pending_height;
154};
155
156struct sway_view_child; 141struct sway_view_child;
157 142
158struct sway_view_child_impl { 143struct sway_view_child_impl {