diff options
| author | Brian Ashworth <[email protected]> | 2018-08-06 11:47:00 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-08-06 11:47:00 -0400 |
| commit | 639f3368e101b697aaf3715b1213ea30766ff4ed (patch) | |
| tree | 67dfb7bc19eb3dd27252d8b0f493436250b4fdea /include/sway/server.h | |
| parent | f57a3919cf5ad7c3edbf9e2e19051971a5f2d42f (diff) | |
| parent | d8b65193c493e5826383a08593395a598ce4b503 (diff) | |
Merge branch 'master' into workspace-move-to-output
Diffstat (limited to 'include/sway/server.h')
| -rw-r--r-- | include/sway/server.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index a3782f91..b93584b6 100644 --- a/include/sway/server.h +++ b/include/sway/server.h @@ -4,12 +4,13 @@ #include <wayland-server.h> #include <wlr/backend.h> #include <wlr/backend/session.h> +#include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_layer_shell.h> +#include <wlr/types/wlr_server_decoration.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 "list.h" #include "config.h" @@ -42,11 +43,17 @@ struct sway_server { struct wlr_xdg_shell *xdg_shell; struct wl_listener xdg_shell_surface; + #ifdef HAVE_XWAYLAND struct sway_xwayland xwayland; struct wl_listener xwayland_surface; struct wl_listener xwayland_ready; #endif + + struct wlr_server_decoration_manager *server_decoration_manager; + struct wl_listener server_decoration; + struct wl_list decorations; // sway_server_decoration::link + bool debug_txn_timings; list_t *transactions; @@ -71,4 +78,6 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data); #ifdef HAVE_XWAYLAND void handle_xwayland_surface(struct wl_listener *listener, void *data); #endif +void handle_server_decoration(struct wl_listener *listener, void *data); + #endif |