summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <RedSoxFan@users.noreply.github.com>2018-12-01 14:33:36 -0500
committerLibravatar GitHub <noreply@github.com>2018-12-01 14:33:36 -0500
commit7702943e58286818425287e9d4be3284adbcbd3e (patch)
treeb288d78fb0815d2267c24cf6e8f0d699692fa85e
parentMerge pull request #3226 from CameronNemo/musl (diff)
parentsway.5: Improve documentation (diff)
downloadsway-7702943e58286818425287e9d4be3284adbcbd3e.tar.gz
sway-7702943e58286818425287e9d4be3284adbcbd3e.tar.zst
sway-7702943e58286818425287e9d4be3284adbcbd3e.zip
Merge pull request #3229 from mwenzkowski/fix-fullscreen-cmd
Fix fullscreen command and improve documentation
-rw-r--r--sway/commands/fullscreen.c4
-rw-r--r--sway/sway.5.scd5
2 files changed, 5 insertions, 4 deletions
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index ff7cbba7..b78187d9 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -13,14 +13,14 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
13 return error; 13 return error;
14 } 14 }
15 if (!root->outputs->length) { 15 if (!root->outputs->length) {
16 return cmd_results_new(CMD_INVALID, "fullscreen", 16 return cmd_results_new(CMD_FAILURE, "fullscreen",
17 "Can't run this command while there's no outputs connected."); 17 "Can't run this command while there's no outputs connected.");
18 } 18 }
19 struct sway_node *node = config->handler_context.node; 19 struct sway_node *node = config->handler_context.node;
20 struct sway_container *container = config->handler_context.container; 20 struct sway_container *container = config->handler_context.container;
21 struct sway_workspace *workspace = config->handler_context.workspace; 21 struct sway_workspace *workspace = config->handler_context.workspace;
22 if (node->type == N_WORKSPACE && workspace->tiling->length == 0) { 22 if (node->type == N_WORKSPACE && workspace->tiling->length == 0) {
23 return cmd_results_new(CMD_INVALID, "fullscreen", 23 return cmd_results_new(CMD_FAILURE, "fullscreen",
24 "Can't fullscreen an empty workspace"); 24 "Can't fullscreen an empty workspace");
25 } 25 }
26 if (node->type == N_WORKSPACE) { 26 if (node->type == N_WORKSPACE) {
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 4edd16bf..651c2302 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -130,8 +130,9 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
130*focus* mode\_toggle 130*focus* mode\_toggle
131 Moves focus between the floating and tiled layers. 131 Moves focus between the floating and tiled layers.
132 132
133*fullscreen* 133*fullscreen* [enable|disable|toggle]
134 Toggles fullscreen for the focused view. 134 Makes focused view fullscreen, non-fullscreen, or the opposite of what it
135 is now. If no argument is given, it does the same as _toggle_.
135 136
136*gaps* inner|outer|horizontal|vertical|top|right|bottom|left all|current 137*gaps* inner|outer|horizontal|vertical|top|right|bottom|left all|current
137set|plus|minus <amount> 138set|plus|minus <amount>