summaryrefslogtreecommitdiffstats
path: root/sway/commands/floating.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-01-14 11:44:18 -0500
committerLibravatar GitHub <noreply@github.com>2019-01-14 11:44:18 -0500
commit15cd8b6a86295a445a1037afd0028b1226a14c82 (patch)
tree56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/floating.c
parentMerge pull request #3418 from RyanDwyer/remove-resize-axis (diff)
parentRemove now-unused "input" argument of cmd_results_new (diff)
downloadsway-15cd8b6a86295a445a1037afd0028b1226a14c82.tar.gz
sway-15cd8b6a86295a445a1037afd0028b1226a14c82.tar.zst
sway-15cd8b6a86295a445a1037afd0028b1226a14c82.zip
Merge pull request #3403 from mstoeckl/ipcleanup
Remove 'input' field of IPC command return json
Diffstat (limited to 'sway/commands/floating.c')
-rw-r--r--sway/commands/floating.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sway/commands/floating.c b/sway/commands/floating.c
index 4b82921c..e95f3185 100644
--- a/sway/commands/floating.c
+++ b/sway/commands/floating.c
@@ -17,14 +17,13 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
17 return error; 17 return error;
18 } 18 }
19 if (!root->outputs->length) { 19 if (!root->outputs->length) {
20 return cmd_results_new(CMD_INVALID, "floating", 20 return cmd_results_new(CMD_INVALID,
21 "Can't run this command while there's no outputs connected."); 21 "Can't run this command while there's no outputs connected.");
22 } 22 }
23 struct sway_container *container = config->handler_context.container; 23 struct sway_container *container = config->handler_context.container;
24 struct sway_workspace *workspace = config->handler_context.workspace; 24 struct sway_workspace *workspace = config->handler_context.workspace;
25 if (!container && workspace->tiling->length == 0) { 25 if (!container && workspace->tiling->length == 0) {
26 return cmd_results_new(CMD_INVALID, "floating", 26 return cmd_results_new(CMD_INVALID, "Can't float an empty workspace");
27 "Can't float an empty workspace");
28 } 27 }
29 if (!container) { 28 if (!container) {
30 // Wrap the workspace's children in a container so we can float it 29 // Wrap the workspace's children in a container so we can float it
@@ -48,5 +47,5 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
48 47
49 arrange_workspace(container->workspace); 48 arrange_workspace(container->workspace);
50 49
51 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 50 return cmd_results_new(CMD_SUCCESS, NULL);
52} 51}