diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-05-14 00:28:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-14 00:28:21 -0400 |
| commit | 34b864fb1752fde2528db6aa86d53c23412a8f43 (patch) | |
| tree | b387f1e1eb8f8fc16faeb4bf24a0ab6e8ba5787c /include/sway/server.h | |
| parent | 6ff7c5273659061ec4ff2f6c79c69af2d4d165a5 (diff) | |
| parent | 270c1ee7e507f1d2960920a7f4f0cc70f4e13d26 (diff) | |
Merge branch 'master' into fix-1975
Diffstat (limited to 'include/sway/server.h')
| -rw-r--r-- | include/sway/server.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 296fbf22..d04ea896 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -8,6 +8,7 @@ #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_layer_shell.h> #include <wlr/types/wlr_xdg_shell_v6.h> +#include <wlr/types/wlr_xdg_shell.h> #include <wlr/render/wlr_renderer.h> // TODO WLR: make Xwayland optional #include <wlr/xwayland.h> @@ -21,6 +22,7 @@ struct sway_server { struct wlr_compositor *compositor; struct wlr_data_device_manager *data_device_manager; + struct wlr_idle *idle; struct sway_input_manager *input; @@ -32,6 +34,9 @@ struct sway_server { struct wlr_xdg_shell_v6 *xdg_shell_v6; struct wl_listener xdg_shell_v6_surface; + struct wlr_xdg_shell *xdg_shell; + struct wl_listener xdg_shell_surface; + struct wlr_xwayland *xwayland; struct wlr_xcursor_manager *xcursor_manager; struct wl_listener xwayland_surface; @@ -51,6 +56,7 @@ void handle_new_output(struct wl_listener *listener, void *data); void handle_layer_shell_surface(struct wl_listener *listener, void *data); void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data); +void handle_xdg_shell_surface(struct wl_listener *listener, void *data); void handle_xwayland_surface(struct wl_listener *listener, void *data); void handle_wl_shell_surface(struct wl_listener *listener, void *data); |