diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-05-13 13:45:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-13 13:45:15 -0400 |
commit | b2dec1236837f0c441a9fd6162b6294c52fac5e0 (patch) | |
tree | 6710b0e9261285f22df2751a1404b05371cff000 /include/sway/server.h | |
parent | Add pixman to swayidle deps (diff) | |
parent | Add xdg-shell stable support (diff) | |
download | sway-b2dec1236837f0c441a9fd6162b6294c52fac5e0.tar.gz sway-b2dec1236837f0c441a9fd6162b6294c52fac5e0.tar.zst sway-b2dec1236837f0c441a9fd6162b6294c52fac5e0.zip |
Merge pull request #1970 from emersion/xdg-shell-stable
Add xdg-shell stable support
Diffstat (limited to 'include/sway/server.h')
-rw-r--r-- | include/sway/server.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index ac685bf8..d04ea896 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <wlr/types/wlr_data_device.h> | 8 | #include <wlr/types/wlr_data_device.h> |
9 | #include <wlr/types/wlr_layer_shell.h> | 9 | #include <wlr/types/wlr_layer_shell.h> |
10 | #include <wlr/types/wlr_xdg_shell_v6.h> | 10 | #include <wlr/types/wlr_xdg_shell_v6.h> |
11 | #include <wlr/types/wlr_xdg_shell.h> | ||
11 | #include <wlr/render/wlr_renderer.h> | 12 | #include <wlr/render/wlr_renderer.h> |
12 | // TODO WLR: make Xwayland optional | 13 | // TODO WLR: make Xwayland optional |
13 | #include <wlr/xwayland.h> | 14 | #include <wlr/xwayland.h> |
@@ -33,6 +34,9 @@ struct sway_server { | |||
33 | struct wlr_xdg_shell_v6 *xdg_shell_v6; | 34 | struct wlr_xdg_shell_v6 *xdg_shell_v6; |
34 | struct wl_listener xdg_shell_v6_surface; | 35 | struct wl_listener xdg_shell_v6_surface; |
35 | 36 | ||
37 | struct wlr_xdg_shell *xdg_shell; | ||
38 | struct wl_listener xdg_shell_surface; | ||
39 | |||
36 | struct wlr_xwayland *xwayland; | 40 | struct wlr_xwayland *xwayland; |
37 | struct wlr_xcursor_manager *xcursor_manager; | 41 | struct wlr_xcursor_manager *xcursor_manager; |
38 | struct wl_listener xwayland_surface; | 42 | struct wl_listener xwayland_surface; |
@@ -52,6 +56,7 @@ void handle_new_output(struct wl_listener *listener, void *data); | |||
52 | 56 | ||
53 | void handle_layer_shell_surface(struct wl_listener *listener, void *data); | 57 | void handle_layer_shell_surface(struct wl_listener *listener, void *data); |
54 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); | 58 | void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); |
59 | void handle_xdg_shell_surface(struct wl_listener *listener, void *data); | ||
55 | void handle_xwayland_surface(struct wl_listener *listener, void *data); | 60 | void handle_xwayland_surface(struct wl_listener *listener, void *data); |
56 | void handle_wl_shell_surface(struct wl_listener *listener, void *data); | 61 | void handle_wl_shell_surface(struct wl_listener *listener, void *data); |
57 | 62 | ||