diff options
author | Connor E <38229097+c-edw@users.noreply.github.com> | 2018-11-10 12:55:06 +0000 |
---|---|---|
committer | Connor E <38229097+c-edw@users.noreply.github.com> | 2018-11-10 12:55:06 +0000 |
commit | b865dabebab717fea75f91e8ccebabc99e36bdd9 (patch) | |
tree | df51bf83b899933f1347508b9f1bd55aefa21ae5 /sway/commands/bar | |
parent | Merge pull request #3085 from 7415963987456321/master (diff) | |
download | sway-b865dabebab717fea75f91e8ccebabc99e36bdd9.tar.gz sway-b865dabebab717fea75f91e8ccebabc99e36bdd9.tar.zst sway-b865dabebab717fea75f91e8ccebabc99e36bdd9.zip |
Use parse_boolean where possible.
Diffstat (limited to 'sway/commands/bar')
-rw-r--r-- | sway/commands/bar/binding_mode_indicator.c | 12 | ||||
-rw-r--r-- | sway/commands/bar/pango_markup.c | 13 | ||||
-rw-r--r-- | sway/commands/bar/workspace_buttons.c | 12 | ||||
-rw-r--r-- | sway/commands/bar/wrap_scroll.c | 14 |
4 files changed, 21 insertions, 30 deletions
diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c index f18b8d7c..b048b7b9 100644 --- a/sway/commands/bar/binding_mode_indicator.c +++ b/sway/commands/bar/binding_mode_indicator.c | |||
@@ -2,6 +2,7 @@ | |||
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
4 | #include "log.h" | 4 | #include "log.h" |
5 | #include "util.h" | ||
5 | 6 | ||
6 | struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) { | 7 | struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) { |
7 | struct cmd_results *error = NULL; | 8 | struct cmd_results *error = NULL; |
@@ -13,17 +14,14 @@ struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) { | |||
13 | return cmd_results_new(CMD_FAILURE, | 14 | return cmd_results_new(CMD_FAILURE, |
14 | "binding_mode_indicator", "No bar defined."); | 15 | "binding_mode_indicator", "No bar defined."); |
15 | } | 16 | } |
16 | if (strcasecmp("yes", argv[0]) == 0) { | 17 | config->current_bar->binding_mode_indicator = |
17 | config->current_bar->binding_mode_indicator = true; | 18 | parse_boolean(argv[0], config->current_bar->binding_mode_indicator); |
19 | if (config->current_bar->binding_mode_indicator) { | ||
18 | wlr_log(WLR_DEBUG, "Enabling binding mode indicator on bar: %s", | 20 | wlr_log(WLR_DEBUG, "Enabling binding mode indicator on bar: %s", |
19 | config->current_bar->id); | 21 | config->current_bar->id); |
20 | } else if (strcasecmp("no", argv[0]) == 0) { | 22 | } else { |
21 | config->current_bar->binding_mode_indicator = false; | ||
22 | wlr_log(WLR_DEBUG, "Disabling binding mode indicator on bar: %s", | 23 | wlr_log(WLR_DEBUG, "Disabling binding mode indicator on bar: %s", |
23 | config->current_bar->id); | 24 | config->current_bar->id); |
24 | } else { | ||
25 | return cmd_results_new(CMD_INVALID, "binding_mode_indicator", | ||
26 | "Invalid value %s", argv[0]); | ||
27 | } | 25 | } |
28 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 26 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
29 | } | 27 | } |
diff --git a/sway/commands/bar/pango_markup.c b/sway/commands/bar/pango_markup.c index 857571fb..d57cc45c 100644 --- a/sway/commands/bar/pango_markup.c +++ b/sway/commands/bar/pango_markup.c | |||
@@ -2,6 +2,7 @@ | |||
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
4 | #include "log.h" | 4 | #include "log.h" |
5 | #include "util.h" | ||
5 | 6 | ||
6 | struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) { | 7 | struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) { |
7 | struct cmd_results *error = NULL; | 8 | struct cmd_results *error = NULL; |
@@ -11,18 +12,14 @@ struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) { | |||
11 | if (!config->current_bar) { | 12 | if (!config->current_bar) { |
12 | return cmd_results_new(CMD_FAILURE, "pango_markup", "No bar defined."); | 13 | return cmd_results_new(CMD_FAILURE, "pango_markup", "No bar defined."); |
13 | } | 14 | } |
14 | if (strcasecmp("enabled", argv[0]) == 0) { | 15 | config->current_bar->pango_markup |
15 | config->current_bar->pango_markup = true; | 16 | = parse_boolean(argv[0], config->current_bar->pango_markup); |
17 | if (config->current_bar->pango_markup) { | ||
16 | wlr_log(WLR_DEBUG, "Enabling pango markup for bar: %s", | 18 | wlr_log(WLR_DEBUG, "Enabling pango markup for bar: %s", |
17 | config->current_bar->id); | 19 | config->current_bar->id); |
18 | } else if (strcasecmp("disabled", argv[0]) == 0) { | 20 | } else { |
19 | config->current_bar->pango_markup = false; | ||
20 | wlr_log(WLR_DEBUG, "Disabling pango markup for bar: %s", | 21 | wlr_log(WLR_DEBUG, "Disabling pango markup for bar: %s", |
21 | config->current_bar->id); | 22 | config->current_bar->id); |
22 | } else { | ||
23 | error = cmd_results_new(CMD_INVALID, "pango_markup", | ||
24 | "Invalid value %s", argv[0]); | ||
25 | return error; | ||
26 | } | 23 | } |
27 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
28 | } | 25 | } |
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c index a4079b2a..cd001e20 100644 --- a/sway/commands/bar/workspace_buttons.c +++ b/sway/commands/bar/workspace_buttons.c | |||
@@ -2,6 +2,7 @@ | |||
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
4 | #include "log.h" | 4 | #include "log.h" |
5 | #include "util.h" | ||
5 | 6 | ||
6 | struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) { | 7 | struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) { |
7 | struct cmd_results *error = NULL; | 8 | struct cmd_results *error = NULL; |
@@ -12,17 +13,14 @@ struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) { | |||
12 | return cmd_results_new(CMD_FAILURE, | 13 | return cmd_results_new(CMD_FAILURE, |
13 | "workspace_buttons", "No bar defined."); | 14 | "workspace_buttons", "No bar defined."); |
14 | } | 15 | } |
15 | if (strcasecmp("yes", argv[0]) == 0) { | 16 | config->current_bar->workspace_buttons = |
16 | config->current_bar->workspace_buttons = true; | 17 | parse_boolean(argv[0], config->current_bar->workspace_buttons); |
18 | if (config->current_bar->workspace_buttons) { | ||
17 | wlr_log(WLR_DEBUG, "Enabling workspace buttons on bar: %s", | 19 | wlr_log(WLR_DEBUG, "Enabling workspace buttons on bar: %s", |
18 | config->current_bar->id); | 20 | config->current_bar->id); |
19 | } else if (strcasecmp("no", argv[0]) == 0) { | 21 | } else { |
20 | config->current_bar->workspace_buttons = false; | ||
21 | wlr_log(WLR_DEBUG, "Disabling workspace buttons on bar: %s", | 22 | wlr_log(WLR_DEBUG, "Disabling workspace buttons on bar: %s", |
22 | config->current_bar->id); | 23 | config->current_bar->id); |
23 | } else { | ||
24 | return cmd_results_new(CMD_INVALID, "workspace_buttons", | ||
25 | "Invalid value %s", argv[0]); | ||
26 | } | 24 | } |
27 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
28 | } | 26 | } |
diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c index 701de00a..04a4e6b8 100644 --- a/sway/commands/bar/wrap_scroll.c +++ b/sway/commands/bar/wrap_scroll.c | |||
@@ -2,6 +2,7 @@ | |||
2 | #include <strings.h> | 2 | #include <strings.h> |
3 | #include "sway/commands.h" | 3 | #include "sway/commands.h" |
4 | #include "log.h" | 4 | #include "log.h" |
5 | #include "util.h" | ||
5 | 6 | ||
6 | struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) { | 7 | struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) { |
7 | struct cmd_results *error = NULL; | 8 | struct cmd_results *error = NULL; |
@@ -11,17 +12,14 @@ struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) { | |||
11 | if (!config->current_bar) { | 12 | if (!config->current_bar) { |
12 | return cmd_results_new(CMD_FAILURE, "wrap_scroll", "No bar defined."); | 13 | return cmd_results_new(CMD_FAILURE, "wrap_scroll", "No bar defined."); |
13 | } | 14 | } |
14 | if (strcasecmp("yes", argv[0]) == 0) { | 15 | config->current_bar->wrap_scroll = |
15 | config->current_bar->wrap_scroll = true; | 16 | parse_boolean(argv[0], config->current_bar->wrap_scroll); |
17 | if (config->current_bar->wrap_scroll) { | ||
16 | wlr_log(WLR_DEBUG, "Enabling wrap scroll on bar: %s", | 18 | wlr_log(WLR_DEBUG, "Enabling wrap scroll on bar: %s", |
17 | config->current_bar->id); | 19 | config->current_bar->id); |
18 | } else if (strcasecmp("no", argv[0]) == 0) { | 20 | } else { |
19 | config->current_bar->wrap_scroll = false; | ||
20 | wlr_log(WLR_DEBUG, "Disabling wrap scroll on bar: %s", | 21 | wlr_log(WLR_DEBUG, "Disabling wrap scroll on bar: %s", |
21 | config->current_bar->id); | 22 | config->current_bar->id); |
22 | } else { | ||
23 | return cmd_results_new(CMD_INVALID, | ||
24 | "wrap_scroll", "Invalid value %s", argv[0]); | ||
25 | } | 23 | } |
26 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
27 | } | 25 | } |