aboutsummaryrefslogtreecommitdiffstats
path: root/sway/server.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/server.c b/sway/server.c
index 180d3a6b..4b48e8e5 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -56,7 +56,7 @@
56#include "sway/input/cursor.h" 56#include "sway/input/cursor.h"
57#include "sway/tree/root.h" 57#include "sway/tree/root.h"
58 58
59#if HAVE_XWAYLAND 59#if WLR_HAS_XWAYLAND
60#include <wlr/xwayland/shell.h> 60#include <wlr/xwayland/shell.h>
61#include "sway/xwayland.h" 61#include "sway/xwayland.h"
62#endif 62#endif
@@ -118,7 +118,7 @@ static bool is_privileged(const struct wl_global *global) {
118 118
119static bool filter_global(const struct wl_client *client, 119static bool filter_global(const struct wl_client *client,
120 const struct wl_global *global, void *data) { 120 const struct wl_global *global, void *data) {
121#if HAVE_XWAYLAND 121#if WLR_HAS_XWAYLAND
122 struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland; 122 struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
123 if (xwayland && global == xwayland->shell_v1->global) { 123 if (xwayland && global == xwayland->shell_v1->global) {
124 return xwayland->server != NULL && client == xwayland->server->client; 124 return xwayland->server != NULL && client == xwayland->server->client;
@@ -437,7 +437,7 @@ bool server_init(struct sway_server *server) {
437 437
438void server_fini(struct sway_server *server) { 438void server_fini(struct sway_server *server) {
439 // TODO: free sway-specific resources 439 // TODO: free sway-specific resources
440#if HAVE_XWAYLAND 440#if WLR_HAS_XWAYLAND
441 wlr_xwayland_destroy(server->xwayland.wlr_xwayland); 441 wlr_xwayland_destroy(server->xwayland.wlr_xwayland);
442#endif 442#endif
443 wl_display_destroy_clients(server->wl_display); 443 wl_display_destroy_clients(server->wl_display);
@@ -447,7 +447,7 @@ void server_fini(struct sway_server *server) {
447} 447}
448 448
449bool server_start(struct sway_server *server) { 449bool server_start(struct sway_server *server) {
450#if HAVE_XWAYLAND 450#if WLR_HAS_XWAYLAND
451 if (config->xwayland != XWAYLAND_MODE_DISABLED) { 451 if (config->xwayland != XWAYLAND_MODE_DISABLED) {
452 sway_log(SWAY_DEBUG, "Initializing Xwayland (lazy=%d)", 452 sway_log(SWAY_DEBUG, "Initializing Xwayland (lazy=%d)",
453 config->xwayland == XWAYLAND_MODE_LAZY); 453 config->xwayland == XWAYLAND_MODE_LAZY);