Merge pull request #3144 from emersion/cmd-xwayland

Add xwayland command

3 files changed, 4 insertions, 2 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index ec21f4e1..5d45d78b 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -180,8 +180,9 @@ sway_cmd cmd_titlebar_padding;
 sway_cmd cmd_unmark;
 sway_cmd cmd_urgent;
 sway_cmd cmd_workspace;
-sway_cmd cmd_ws_auto_back_and_forth;
 sway_cmd cmd_workspace_layout;
+sway_cmd cmd_ws_auto_back_and_forth;
+sway_cmd cmd_xwayland;
 
 sway_cmd bar_cmd_bindcode;
 sway_cmd bar_cmd_binding_mode_indicator;
diff --git a/include/sway/config.h b/include/sway/config.h
index a667984d..96fe899b 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -416,6 +416,7 @@ struct sway_config {
         size_t urgent_timeout;
         enum sway_fowa focus_on_window_activation;
         enum sway_popup_during_fullscreen popup_during_fullscreen;
+        bool xwayland;
 
         // Flags
         enum focus_follows_mouse_mode focus_follows_mouse;
diff --git a/include/sway/server.h b/include/sway/server.h
index a3233d66..0f30653f 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -71,7 +71,7 @@ struct sway_server server;
 bool server_privileged_prepare(struct sway_server *server);
 bool server_init(struct sway_server *server);
 void server_fini(struct sway_server *server);
-bool server_start_backend(struct sway_server *server);
+bool server_start(struct sway_server *server);
 void server_run(struct sway_server *server);
 
 void handle_new_output(struct wl_listener *listener, void *data);