aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/layout.c
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-01-14 11:44:18 -0500
committerGitHub <noreply@github.com>2019-01-14 11:44:18 -0500
commit15cd8b6a86295a445a1037afd0028b1226a14c82 (patch)
tree56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/layout.c
parent64ef9366733d6d332a24897f72eba90ba2adca1e (diff)
parent2a684cad5fc8e12a8e47a7fd00e2b7c66b43afb0 (diff)
Merge pull request #3403 from mstoeckl/ipcleanup
Remove 'input' field of IPC command return json
Diffstat (limited to 'sway/commands/layout.c')
-rw-r--r--sway/commands/layout.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/commands/layout.c b/sway/commands/layout.c
index 8fde1776..2aca31dc 100644
--- a/sway/commands/layout.c
+++ b/sway/commands/layout.c
@@ -20,7 +20,7 @@ static enum sway_container_layout parse_layout_string(char *s) {
return L_NONE;
}
-static const char* expected_syntax =
+static const char expected_syntax[] =
"Expected 'layout default|tabbed|stacking|splitv|splith' or "
"'layout toggle [split|all]' or "
"'layout toggle [split|tabbed|stacking|splitv|splith] [split|tabbed|stacking|splitv|splith]...'";
@@ -100,14 +100,14 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
return error;
}
if (!root->outputs->length) {
- return cmd_results_new(CMD_INVALID, "layout",
+ return cmd_results_new(CMD_INVALID,
"Can't run this command while there's no outputs connected.");
}
struct sway_container *container = config->handler_context.container;
struct sway_workspace *workspace = config->handler_context.workspace;
if (container && container_is_floating(container)) {
- return cmd_results_new(CMD_FAILURE, "layout",
+ return cmd_results_new(CMD_FAILURE,
"Unable to change layout of floating windows");
}
@@ -133,7 +133,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
workspace->layout, workspace->prev_split_layout);
}
if (new_layout == L_NONE) {
- return cmd_results_new(CMD_INVALID, "layout", expected_syntax);
+ return cmd_results_new(CMD_INVALID, expected_syntax);
}
if (new_layout != old_layout) {
if (container) {
@@ -152,5 +152,5 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
arrange_workspace(workspace);
}
- return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+ return cmd_results_new(CMD_SUCCESS, NULL);
}