diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-25 09:26:23 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-01 23:14:58 +1000 |
commit | aaba7642b3e4e9a63aea49412b10221f399b17af (patch) | |
tree | 7e7c2f6fcd80a6a48e07e07e03c5f2dc0d248240 /sway/commands | |
parent | Use L_FLOATING instead of reapable boolean (diff) | |
download | sway-aaba7642b3e4e9a63aea49412b10221f399b17af.tar.gz sway-aaba7642b3e4e9a63aea49412b10221f399b17af.tar.zst sway-aaba7642b3e4e9a63aea49412b10221f399b17af.zip |
Replace is_floating boolean with function
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/floating.c | 2 | ||||
-rw-r--r-- | sway/commands/layout.c | 10 | ||||
-rw-r--r-- | sway/commands/sticky.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/sway/commands/floating.c b/sway/commands/floating.c index 38a4e1da..46b761da 100644 --- a/sway/commands/floating.c +++ b/sway/commands/floating.c | |||
@@ -28,7 +28,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) { | |||
28 | } else if (strcasecmp(argv[0], "disable") == 0) { | 28 | } else if (strcasecmp(argv[0], "disable") == 0) { |
29 | wants_floating = false; | 29 | wants_floating = false; |
30 | } else if (strcasecmp(argv[0], "toggle") == 0) { | 30 | } else if (strcasecmp(argv[0], "toggle") == 0) { |
31 | wants_floating = !container->is_floating; | 31 | wants_floating = !container_is_floating(container); |
32 | } else { | 32 | } else { |
33 | return cmd_results_new(CMD_FAILURE, "floating", | 33 | return cmd_results_new(CMD_FAILURE, "floating", |
34 | "Expected 'floating <enable|disable|toggle>'"); | 34 | "Expected 'floating <enable|disable|toggle>'"); |
diff --git a/sway/commands/layout.c b/sway/commands/layout.c index 6b44b001..a009e38f 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c | |||
@@ -12,19 +12,15 @@ struct cmd_results *cmd_layout(int argc, char **argv) { | |||
12 | } | 12 | } |
13 | struct sway_container *parent = config->handler_context.current_container; | 13 | struct sway_container *parent = config->handler_context.current_container; |
14 | 14 | ||
15 | // TODO: floating | 15 | if (container_is_floating(parent)) { |
16 | /* | 16 | return cmd_results_new(CMD_FAILURE, "layout", |
17 | if (parent->is_floating) { | 17 | "Unable to change layout of floating windows"); |
18 | return cmd_results_new(CMD_FAILURE, "layout", "Unable to change layout of floating windows"); | ||
19 | } | 18 | } |
20 | */ | ||
21 | 19 | ||
22 | while (parent->type == C_VIEW) { | 20 | while (parent->type == C_VIEW) { |
23 | parent = parent->parent; | 21 | parent = parent->parent; |
24 | } | 22 | } |
25 | 23 | ||
26 | // TODO: stacks and tabs | ||
27 | |||
28 | if (strcasecmp(argv[0], "default") == 0) { | 24 | if (strcasecmp(argv[0], "default") == 0) { |
29 | parent->layout = parent->prev_layout; | 25 | parent->layout = parent->prev_layout; |
30 | if (parent->layout == L_NONE) { | 26 | if (parent->layout == L_NONE) { |
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c index 4bb4bd39..732ccb98 100644 --- a/sway/commands/sticky.c +++ b/sway/commands/sticky.c | |||
@@ -17,7 +17,7 @@ struct cmd_results *cmd_sticky(int argc, char **argv) { | |||
17 | } | 17 | } |
18 | struct sway_container *container = | 18 | struct sway_container *container = |
19 | config->handler_context.current_container; | 19 | config->handler_context.current_container; |
20 | if (!container->is_floating) { | 20 | if (!container_is_floating(container)) { |
21 | return cmd_results_new(CMD_FAILURE, "sticky", | 21 | return cmd_results_new(CMD_FAILURE, "sticky", |
22 | "Can't set sticky on a tiled container"); | 22 | "Can't set sticky on a tiled container"); |
23 | } | 23 | } |