diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-01-13 20:42:39 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-13 20:42:39 -0500 |
commit | 4879d40695047a4c493bd8871d810c543978a869 (patch) | |
tree | b043a9c62a8baeec8d62d06ece8c2f56d65b044a /include/sway | |
parent | Merge pull request #3344 from RedSoxFan/bar-mouse-bindings-improved (diff) | |
parent | Add xwayland command (diff) | |
download | sway-4879d40695047a4c493bd8871d810c543978a869.tar.gz sway-4879d40695047a4c493bd8871d810c543978a869.tar.zst sway-4879d40695047a4c493bd8871d810c543978a869.zip |
Merge pull request #3144 from emersion/cmd-xwayland
Add xwayland command
Diffstat (limited to 'include/sway')
-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 ec21f4e1..5d45d78b 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -180,8 +180,9 @@ sway_cmd cmd_titlebar_padding; | |||
180 | sway_cmd cmd_unmark; | 180 | sway_cmd cmd_unmark; |
181 | sway_cmd cmd_urgent; | 181 | sway_cmd cmd_urgent; |
182 | sway_cmd cmd_workspace; | 182 | sway_cmd cmd_workspace; |
183 | sway_cmd cmd_ws_auto_back_and_forth; | ||
184 | sway_cmd cmd_workspace_layout; | 183 | sway_cmd cmd_workspace_layout; |
184 | sway_cmd cmd_ws_auto_back_and_forth; | ||
185 | sway_cmd cmd_xwayland; | ||
185 | 186 | ||
186 | sway_cmd bar_cmd_bindcode; | 187 | sway_cmd bar_cmd_bindcode; |
187 | sway_cmd bar_cmd_binding_mode_indicator; | 188 | 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 { | |||
416 | size_t urgent_timeout; | 416 | size_t urgent_timeout; |
417 | enum sway_fowa focus_on_window_activation; | 417 | enum sway_fowa focus_on_window_activation; |
418 | enum sway_popup_during_fullscreen popup_during_fullscreen; | 418 | enum sway_popup_during_fullscreen popup_during_fullscreen; |
419 | bool xwayland; | ||
419 | 420 | ||
420 | // Flags | 421 | // Flags |
421 | enum focus_follows_mouse_mode focus_follows_mouse; | 422 | 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); |