diff options
author | emersion <contact@emersion.fr> | 2018-11-17 12:29:59 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-11-19 17:38:37 +0100 |
commit | 311c7db7e300bc9e749a582a56805150180138e0 (patch) | |
tree | a695f7af6143e47c8b7bb8afe32e2e8f59c39958 /include | |
parent | Merge pull request #3152 from camoz/master (diff) | |
download | sway-311c7db7e300bc9e749a582a56805150180138e0.tar.gz sway-311c7db7e300bc9e749a582a56805150180138e0.tar.zst sway-311c7db7e300bc9e749a582a56805150180138e0.zip |
Add xwayland command
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/commands.h | 3 | ||||
-rw-r--r-- | include/sway/config.h | 1 | ||||
-rw-r--r-- | include/sway/server.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 2fe8a631..32925369 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -176,8 +176,9 @@ sway_cmd cmd_title_format; | |||
176 | sway_cmd cmd_unmark; | 176 | sway_cmd cmd_unmark; |
177 | sway_cmd cmd_urgent; | 177 | sway_cmd cmd_urgent; |
178 | sway_cmd cmd_workspace; | 178 | sway_cmd cmd_workspace; |
179 | sway_cmd cmd_ws_auto_back_and_forth; | ||
180 | sway_cmd cmd_workspace_layout; | 179 | sway_cmd cmd_workspace_layout; |
180 | sway_cmd cmd_ws_auto_back_and_forth; | ||
181 | sway_cmd cmd_xwayland; | ||
181 | 182 | ||
182 | sway_cmd bar_cmd_activate_button; | 183 | sway_cmd bar_cmd_activate_button; |
183 | sway_cmd bar_cmd_binding_mode_indicator; | 184 | sway_cmd bar_cmd_binding_mode_indicator; |
diff --git a/include/sway/config.h b/include/sway/config.h index 658b4a01..c44533ee 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -393,6 +393,7 @@ struct sway_config { | |||
393 | size_t urgent_timeout; | 393 | size_t urgent_timeout; |
394 | enum sway_fowa focus_on_window_activation; | 394 | enum sway_fowa focus_on_window_activation; |
395 | enum sway_popup_during_fullscreen popup_during_fullscreen; | 395 | enum sway_popup_during_fullscreen popup_during_fullscreen; |
396 | bool xwayland; | ||
396 | 397 | ||
397 | // Flags | 398 | // Flags |
398 | enum focus_follows_mouse_mode focus_follows_mouse; | 399 | 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; | |||
71 | bool server_privileged_prepare(struct sway_server *server); | 71 | bool server_privileged_prepare(struct sway_server *server); |
72 | bool server_init(struct sway_server *server); | 72 | bool server_init(struct sway_server *server); |
73 | void server_fini(struct sway_server *server); | 73 | void server_fini(struct sway_server *server); |
74 | bool server_start_backend(struct sway_server *server); | 74 | bool server_start(struct sway_server *server); |
75 | void server_run(struct sway_server *server); | 75 | void server_run(struct sway_server *server); |
76 | 76 | ||
77 | void handle_new_output(struct wl_listener *listener, void *data); | 77 | void handle_new_output(struct wl_listener *listener, void *data); |