diff options
Diffstat (limited to 'sway/commands/bar')
26 files changed, 74 insertions, 85 deletions
diff --git a/sway/commands/bar/bind.c b/sway/commands/bar/bind.c index a4c65ec4..71adced8 100644 --- a/sway/commands/bar/bind.c +++ b/sway/commands/bar/bind.c | |||
@@ -16,13 +16,12 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code) { | |||
16 | return error; | 16 | return error; |
17 | } | 17 | } |
18 | if (!config->current_bar) { | 18 | if (!config->current_bar) { |
19 | return cmd_results_new(CMD_FAILURE, command, "No bar defined."); | 19 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
20 | } | 20 | } |
21 | 21 | ||
22 | struct bar_binding *binding = calloc(1, sizeof(struct bar_binding)); | 22 | struct bar_binding *binding = calloc(1, sizeof(struct bar_binding)); |
23 | if (!binding) { | 23 | if (!binding) { |
24 | return cmd_results_new(CMD_FAILURE, command, | 24 | return cmd_results_new(CMD_FAILURE, "Unable to allocate bar binding"); |
25 | "Unable to allocate bar binding"); | ||
26 | } | 25 | } |
27 | 26 | ||
28 | binding->release = false; | 27 | binding->release = false; |
@@ -40,13 +39,12 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code) { | |||
40 | } | 39 | } |
41 | if (message) { | 40 | if (message) { |
42 | free_bar_binding(binding); | 41 | free_bar_binding(binding); |
43 | error = cmd_results_new(CMD_INVALID, command, message); | 42 | error = cmd_results_new(CMD_INVALID, message); |
44 | free(message); | 43 | free(message); |
45 | return error; | 44 | return error; |
46 | } else if (!binding->button) { | 45 | } else if (!binding->button) { |
47 | free_bar_binding(binding); | 46 | free_bar_binding(binding); |
48 | return cmd_results_new(CMD_INVALID, command, | 47 | return cmd_results_new(CMD_INVALID, "Unknown button %s", argv[0]); |
49 | "Unknown button %s", argv[0]); | ||
50 | } | 48 | } |
51 | 49 | ||
52 | const char *name = libevdev_event_code_get_name(EV_KEY, binding->button); | 50 | const char *name = libevdev_event_code_get_name(EV_KEY, binding->button); |
@@ -94,7 +92,7 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code) { | |||
94 | binding->release ? " - release" : ""); | 92 | binding->release ? " - release" : ""); |
95 | } | 93 | } |
96 | 94 | ||
97 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 95 | return cmd_results_new(CMD_SUCCESS, NULL); |
98 | } | 96 | } |
99 | 97 | ||
100 | struct cmd_results *bar_cmd_bindcode(int argc, char **argv) { | 98 | struct cmd_results *bar_cmd_bindcode(int argc, char **argv) { |
diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c index b048b7b9..15acc309 100644 --- a/sway/commands/bar/binding_mode_indicator.c +++ b/sway/commands/bar/binding_mode_indicator.c | |||
@@ -11,8 +11,7 @@ struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) { | |||
11 | return error; | 11 | return error; |
12 | } | 12 | } |
13 | if (!config->current_bar) { | 13 | if (!config->current_bar) { |
14 | return cmd_results_new(CMD_FAILURE, | 14 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
15 | "binding_mode_indicator", "No bar defined."); | ||
16 | } | 15 | } |
17 | config->current_bar->binding_mode_indicator = | 16 | config->current_bar->binding_mode_indicator = |
18 | parse_boolean(argv[0], config->current_bar->binding_mode_indicator); | 17 | parse_boolean(argv[0], config->current_bar->binding_mode_indicator); |
@@ -23,5 +22,5 @@ struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) { | |||
23 | wlr_log(WLR_DEBUG, "Disabling binding mode indicator on bar: %s", | 22 | wlr_log(WLR_DEBUG, "Disabling binding mode indicator on bar: %s", |
24 | config->current_bar->id); | 23 | config->current_bar->id); |
25 | } | 24 | } |
26 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 25 | return cmd_results_new(CMD_SUCCESS, NULL); |
27 | } | 26 | } |
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c index ebf1e3e1..7921db0d 100644 --- a/sway/commands/bar/colors.c +++ b/sway/commands/bar/colors.c | |||
@@ -25,11 +25,11 @@ static struct cmd_results *parse_single_color(char **color, | |||
25 | if (!*color && !(*color = malloc(10))) { | 25 | if (!*color && !(*color = malloc(10))) { |
26 | return NULL; | 26 | return NULL; |
27 | } | 27 | } |
28 | error = add_color(cmd_name, *color, argv[0]); | 28 | error = add_color(*color, argv[0]); |
29 | if (error) { | 29 | if (error) { |
30 | return error; | 30 | return error; |
31 | } | 31 | } |
32 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 32 | return cmd_results_new(CMD_SUCCESS, NULL); |
33 | } | 33 | } |
34 | 34 | ||
35 | static struct cmd_results *parse_three_colors(char ***colors, | 35 | static struct cmd_results *parse_three_colors(char ***colors, |
@@ -37,18 +37,18 @@ static struct cmd_results *parse_three_colors(char ***colors, | |||
37 | struct cmd_results *error = NULL; | 37 | struct cmd_results *error = NULL; |
38 | if (argc != 3) { | 38 | if (argc != 3) { |
39 | return cmd_results_new(CMD_INVALID, | 39 | return cmd_results_new(CMD_INVALID, |
40 | cmd_name, "Requires exactly three color values"); | 40 | "Command '%s' requires exactly three color values", cmd_name); |
41 | } | 41 | } |
42 | for (size_t i = 0; i < 3; i++) { | 42 | for (size_t i = 0; i < 3; i++) { |
43 | if (!*colors[i] && !(*(colors[i]) = malloc(10))) { | 43 | if (!*colors[i] && !(*(colors[i]) = malloc(10))) { |
44 | return NULL; | 44 | return NULL; |
45 | } | 45 | } |
46 | error = add_color(cmd_name, *(colors[i]), argv[i]); | 46 | error = add_color(*(colors[i]), argv[i]); |
47 | if (error) { | 47 | if (error) { |
48 | return error; | 48 | return error; |
49 | } | 49 | } |
50 | } | 50 | } |
51 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 51 | return cmd_results_new(CMD_SUCCESS, NULL); |
52 | } | 52 | } |
53 | 53 | ||
54 | struct cmd_results *bar_cmd_colors(int argc, char **argv) { | 54 | struct cmd_results *bar_cmd_colors(int argc, char **argv) { |
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c index 2aa4e895..c6147e3d 100644 --- a/sway/commands/bar/font.c +++ b/sway/commands/bar/font.c | |||
@@ -10,12 +10,12 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) { | |||
10 | return error; | 10 | return error; |
11 | } | 11 | } |
12 | if (!config->current_bar) { | 12 | if (!config->current_bar) { |
13 | return cmd_results_new(CMD_FAILURE, "font", "No bar defined."); | 13 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
14 | } | 14 | } |
15 | char *font = join_args(argv, argc); | 15 | char *font = join_args(argv, argc); |
16 | free(config->current_bar->font); | 16 | free(config->current_bar->font); |
17 | config->current_bar->font = font; | 17 | config->current_bar->font = font; |
18 | wlr_log(WLR_DEBUG, "Settings font '%s' for bar: %s", | 18 | wlr_log(WLR_DEBUG, "Settings font '%s' for bar: %s", |
19 | config->current_bar->font, config->current_bar->id); | 19 | config->current_bar->font, config->current_bar->id); |
20 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 20 | return cmd_results_new(CMD_SUCCESS, NULL); |
21 | } | 21 | } |
diff --git a/sway/commands/bar/gaps.c b/sway/commands/bar/gaps.c index f78f3742..fabe12fc 100644 --- a/sway/commands/bar/gaps.c +++ b/sway/commands/bar/gaps.c | |||
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_gaps(int argc, char **argv) { | |||
14 | return error; | 14 | return error; |
15 | } | 15 | } |
16 | if (!config->current_bar) { | 16 | if (!config->current_bar) { |
17 | return cmd_results_new(CMD_FAILURE, "bar gaps", "No bar defined."); | 17 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
18 | } | 18 | } |
19 | 19 | ||
20 | int top = 0, right = 0, bottom = 0, left = 0; | 20 | int top = 0, right = 0, bottom = 0, left = 0; |
@@ -23,7 +23,7 @@ struct cmd_results *bar_cmd_gaps(int argc, char **argv) { | |||
23 | char *end; | 23 | char *end; |
24 | int amount = strtol(argv[i], &end, 10); | 24 | int amount = strtol(argv[i], &end, 10); |
25 | if (strlen(end) && strcasecmp(end, "px") != 0) { | 25 | if (strlen(end) && strcasecmp(end, "px") != 0) { |
26 | return cmd_results_new(CMD_INVALID, "bar gaps", | 26 | return cmd_results_new(CMD_INVALID, |
27 | "Expected 'bar [<bar-id>] gaps <all> | <horizonal> " | 27 | "Expected 'bar [<bar-id>] gaps <all> | <horizonal> " |
28 | "<vertical> | <top> <right> <bottom> <left>'"); | 28 | "<vertical> | <top> <right> <bottom> <left>'"); |
29 | } | 29 | } |
@@ -56,5 +56,5 @@ struct cmd_results *bar_cmd_gaps(int argc, char **argv) { | |||
56 | ipc_event_barconfig_update(config->current_bar); | 56 | ipc_event_barconfig_update(config->current_bar); |
57 | } | 57 | } |
58 | 58 | ||
59 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 59 | return cmd_results_new(CMD_SUCCESS, NULL); |
60 | } | 60 | } |
diff --git a/sway/commands/bar/height.c b/sway/commands/bar/height.c index 18258526..a2e72533 100644 --- a/sway/commands/bar/height.c +++ b/sway/commands/bar/height.c | |||
@@ -10,11 +10,11 @@ struct cmd_results *bar_cmd_height(int argc, char **argv) { | |||
10 | } | 10 | } |
11 | int height = atoi(argv[0]); | 11 | int height = atoi(argv[0]); |
12 | if (height < 0) { | 12 | if (height < 0) { |
13 | return cmd_results_new(CMD_INVALID, "height", | 13 | return cmd_results_new(CMD_INVALID, |
14 | "Invalid height value: %s", argv[0]); | 14 | "Invalid height value: %s", argv[0]); |
15 | } | 15 | } |
16 | config->current_bar->height = height; | 16 | config->current_bar->height = height; |
17 | wlr_log(WLR_DEBUG, "Setting bar height to %d on bar: %s", | 17 | wlr_log(WLR_DEBUG, "Setting bar height to %d on bar: %s", |
18 | height, config->current_bar->id); | 18 | height, config->current_bar->id); |
19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 19 | return cmd_results_new(CMD_SUCCESS, NULL); |
20 | } | 20 | } |
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c index 79eaf01c..3364ce70 100644 --- a/sway/commands/bar/hidden_state.c +++ b/sway/commands/bar/hidden_state.c | |||
@@ -20,8 +20,7 @@ static struct cmd_results *bar_set_hidden_state(struct bar_config *bar, | |||
20 | } else if (strcasecmp("show", hidden_state) == 0) { | 20 | } else if (strcasecmp("show", hidden_state) == 0) { |
21 | bar->hidden_state = strdup("show"); | 21 | bar->hidden_state = strdup("show"); |
22 | } else { | 22 | } else { |
23 | return cmd_results_new(CMD_INVALID, "hidden_state", | 23 | return cmd_results_new(CMD_INVALID, "Invalid value %s", hidden_state); |
24 | "Invalid value %s", hidden_state); | ||
25 | } | 24 | } |
26 | if (strcmp(old_state, bar->hidden_state) != 0) { | 25 | if (strcmp(old_state, bar->hidden_state) != 0) { |
27 | if (!config->reading) { | 26 | if (!config->reading) { |
@@ -44,7 +43,7 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) { | |||
44 | return error; | 43 | return error; |
45 | } | 44 | } |
46 | if (config->reading && argc > 1) { | 45 | if (config->reading && argc > 1) { |
47 | return cmd_results_new(CMD_INVALID, "hidden_state", | 46 | return cmd_results_new(CMD_INVALID, |
48 | "Unexpected value %s in config mode", argv[1]); | 47 | "Unexpected value %s in config mode", argv[1]); |
49 | } | 48 | } |
50 | 49 | ||
@@ -65,5 +64,5 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) { | |||
65 | } | 64 | } |
66 | } | 65 | } |
67 | } | 66 | } |
68 | return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL); | 67 | return error ? error : cmd_results_new(CMD_SUCCESS, NULL); |
69 | } | 68 | } |
diff --git a/sway/commands/bar/icon_theme.c b/sway/commands/bar/icon_theme.c index 9d3b6040..2d16f748 100644 --- a/sway/commands/bar/icon_theme.c +++ b/sway/commands/bar/icon_theme.c | |||
@@ -13,16 +13,16 @@ struct cmd_results *bar_cmd_icon_theme(int argc, char **argv) { | |||
13 | } | 13 | } |
14 | 14 | ||
15 | if (!config->current_bar) { | 15 | if (!config->current_bar) { |
16 | return cmd_results_new(CMD_FAILURE, "tray_padding", "No bar defined."); | 16 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
17 | } | 17 | } |
18 | 18 | ||
19 | wlr_log(WLR_DEBUG, "[Bar %s] Setting icon theme to %s", | 19 | wlr_log(WLR_DEBUG, "[Bar %s] Setting icon theme to %s", |
20 | config->current_bar->id, argv[0]); | 20 | config->current_bar->id, argv[0]); |
21 | free(config->current_bar->icon_theme); | 21 | free(config->current_bar->icon_theme); |
22 | config->current_bar->icon_theme = strdup(argv[0]); | 22 | config->current_bar->icon_theme = strdup(argv[0]); |
23 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 23 | return cmd_results_new(CMD_SUCCESS, NULL); |
24 | #else | 24 | #else |
25 | return cmd_results_new(CMD_INVALID, "icon_theme", | 25 | return cmd_results_new(CMD_INVALID, |
26 | "Sway has been compiled without tray support"); | 26 | "Sway has been compiled without tray support"); |
27 | #endif | 27 | #endif |
28 | } | 28 | } |
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c index 35509459..bef3023b 100644 --- a/sway/commands/bar/id.c +++ b/sway/commands/bar/id.c | |||
@@ -12,15 +12,15 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) { | |||
12 | const char *name = argv[0]; | 12 | const char *name = argv[0]; |
13 | const char *oldname = config->current_bar->id; | 13 | const char *oldname = config->current_bar->id; |
14 | if (strcmp(name, oldname) == 0) { | 14 | if (strcmp(name, oldname) == 0) { |
15 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); // NOP | 15 | return cmd_results_new(CMD_SUCCESS, NULL); // NOP |
16 | } else if (strcmp(name, "id") == 0) { | 16 | } else if (strcmp(name, "id") == 0) { |
17 | return cmd_results_new(CMD_INVALID, "id", "id cannot be 'id'"); | 17 | return cmd_results_new(CMD_INVALID, "id cannot be 'id'"); |
18 | } | 18 | } |
19 | // check if id is used by a previously defined bar | 19 | // check if id is used by a previously defined bar |
20 | for (int i = 0; i < config->bars->length; ++i) { | 20 | for (int i = 0; i < config->bars->length; ++i) { |
21 | struct bar_config *find = config->bars->items[i]; | 21 | struct bar_config *find = config->bars->items[i]; |
22 | if (strcmp(name, find->id) == 0 && config->current_bar != find) { | 22 | if (strcmp(name, find->id) == 0 && config->current_bar != find) { |
23 | return cmd_results_new(CMD_FAILURE, "id", | 23 | return cmd_results_new(CMD_FAILURE, |
24 | "Id '%s' already defined for another bar. Id unchanged (%s).", | 24 | "Id '%s' already defined for another bar. Id unchanged (%s).", |
25 | name, oldname); | 25 | name, oldname); |
26 | } | 26 | } |
@@ -31,5 +31,5 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) { | |||
31 | // free old bar id | 31 | // free old bar id |
32 | free(config->current_bar->id); | 32 | free(config->current_bar->id); |
33 | config->current_bar->id = strdup(name); | 33 | config->current_bar->id = strdup(name); |
34 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 34 | return cmd_results_new(CMD_SUCCESS, NULL); |
35 | } | 35 | } |
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c index dcaf6da9..1698db8d 100644 --- a/sway/commands/bar/mode.c +++ b/sway/commands/bar/mode.c | |||
@@ -21,7 +21,7 @@ static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode | |||
21 | } else if (strcasecmp("invisible", mode) == 0) { | 21 | } else if (strcasecmp("invisible", mode) == 0) { |
22 | bar->mode = strdup("invisible"); | 22 | bar->mode = strdup("invisible"); |
23 | } else { | 23 | } else { |
24 | return cmd_results_new(CMD_INVALID, "mode", "Invalid value %s", mode); | 24 | return cmd_results_new(CMD_INVALID, "Invalid value %s", mode); |
25 | } | 25 | } |
26 | 26 | ||
27 | if (strcmp(old_mode, bar->mode) != 0) { | 27 | if (strcmp(old_mode, bar->mode) != 0) { |
@@ -46,7 +46,7 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) { | |||
46 | } | 46 | } |
47 | if (config->reading && argc > 1) { | 47 | if (config->reading && argc > 1) { |
48 | return cmd_results_new(CMD_INVALID, | 48 | return cmd_results_new(CMD_INVALID, |
49 | "mode", "Unexpected value %s in config mode", argv[1]); | 49 | "Unexpected value %s in config mode", argv[1]); |
50 | } | 50 | } |
51 | 51 | ||
52 | const char *mode = argv[0]; | 52 | const char *mode = argv[0]; |
@@ -66,5 +66,5 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) { | |||
66 | } | 66 | } |
67 | } | 67 | } |
68 | } | 68 | } |
69 | return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL); | 69 | return error ? error : cmd_results_new(CMD_SUCCESS, NULL); |
70 | } | 70 | } |
diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c index b5a16f45..0d28d6a2 100644 --- a/sway/commands/bar/modifier.c +++ b/sway/commands/bar/modifier.c | |||
@@ -11,7 +11,7 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) { | |||
11 | } | 11 | } |
12 | 12 | ||
13 | if (!config->current_bar) { | 13 | if (!config->current_bar) { |
14 | return cmd_results_new(CMD_FAILURE, "modifier", "No bar defined."); | 14 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
15 | } | 15 | } |
16 | 16 | ||
17 | uint32_t mod = 0; | 17 | uint32_t mod = 0; |
@@ -21,8 +21,8 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) { | |||
21 | if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) { | 21 | if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) { |
22 | mod |= tmp_mod; | 22 | mod |= tmp_mod; |
23 | } else { | 23 | } else { |
24 | error = cmd_results_new(CMD_INVALID, "modifier", | 24 | error = cmd_results_new(CMD_INVALID, |
25 | "Unknown modifier '%s'", split->items[i]); | 25 | "Unknown modifier '%s'", (char *)split->items[i]); |
26 | list_free_items_and_destroy(split); | 26 | list_free_items_and_destroy(split); |
27 | return error; | 27 | return error; |
28 | } | 28 | } |
@@ -31,5 +31,5 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) { | |||
31 | config->current_bar->modifier = mod; | 31 | config->current_bar->modifier = mod; |
32 | wlr_log(WLR_DEBUG, | 32 | wlr_log(WLR_DEBUG, |
33 | "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); | 33 | "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); |
34 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 34 | return cmd_results_new(CMD_SUCCESS, NULL); |
35 | } | 35 | } |
diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c index 930d779d..9ad10678 100644 --- a/sway/commands/bar/output.c +++ b/sway/commands/bar/output.c | |||
@@ -11,7 +11,7 @@ struct cmd_results *bar_cmd_output(int argc, char **argv) { | |||
11 | return error; | 11 | return error; |
12 | } | 12 | } |
13 | if (!config->current_bar) { | 13 | if (!config->current_bar) { |
14 | return cmd_results_new(CMD_FAILURE, "output", "No bar defined."); | 14 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
15 | } | 15 | } |
16 | 16 | ||
17 | const char *output = argv[0]; | 17 | const char *output = argv[0]; |
@@ -45,5 +45,5 @@ struct cmd_results *bar_cmd_output(int argc, char **argv) { | |||
45 | wlr_log(WLR_DEBUG, "Adding bar: '%s' to output '%s'", | 45 | wlr_log(WLR_DEBUG, "Adding bar: '%s' to output '%s'", |
46 | config->current_bar->id, output); | 46 | config->current_bar->id, output); |
47 | } | 47 | } |
48 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 48 | return cmd_results_new(CMD_SUCCESS, NULL); |
49 | } | 49 | } |
diff --git a/sway/commands/bar/pango_markup.c b/sway/commands/bar/pango_markup.c index d57cc45c..0ffa41d9 100644 --- a/sway/commands/bar/pango_markup.c +++ b/sway/commands/bar/pango_markup.c | |||
@@ -10,7 +10,7 @@ struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) { | |||
10 | return error; | 10 | return error; |
11 | } | 11 | } |
12 | if (!config->current_bar) { | 12 | if (!config->current_bar) { |
13 | return cmd_results_new(CMD_FAILURE, "pango_markup", "No bar defined."); | 13 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
14 | } | 14 | } |
15 | config->current_bar->pango_markup | 15 | config->current_bar->pango_markup |
16 | = parse_boolean(argv[0], config->current_bar->pango_markup); | 16 | = parse_boolean(argv[0], config->current_bar->pango_markup); |
@@ -21,5 +21,5 @@ struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) { | |||
21 | wlr_log(WLR_DEBUG, "Disabling pango markup for bar: %s", | 21 | wlr_log(WLR_DEBUG, "Disabling pango markup for bar: %s", |
22 | config->current_bar->id); | 22 | config->current_bar->id); |
23 | } | 23 | } |
24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL); |
25 | } | 25 | } |
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c index 2870f60f..2e3f79b4 100644 --- a/sway/commands/bar/position.c +++ b/sway/commands/bar/position.c | |||
@@ -10,7 +10,7 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) { | |||
10 | return error; | 10 | return error; |
11 | } | 11 | } |
12 | if (!config->current_bar) { | 12 | if (!config->current_bar) { |
13 | return cmd_results_new(CMD_FAILURE, "position", "No bar defined."); | 13 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
14 | } | 14 | } |
15 | char *valid[] = { "top", "bottom" }; | 15 | char *valid[] = { "top", "bottom" }; |
16 | for (size_t i = 0; i < sizeof(valid) / sizeof(valid[0]); ++i) { | 16 | for (size_t i = 0; i < sizeof(valid) / sizeof(valid[0]); ++i) { |
@@ -19,9 +19,8 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) { | |||
19 | argv[0], config->current_bar->id); | 19 | argv[0], config->current_bar->id); |
20 | free(config->current_bar->position); | 20 | free(config->current_bar->position); |
21 | config->current_bar->position = strdup(argv[0]); | 21 | config->current_bar->position = strdup(argv[0]); |
22 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 22 | return cmd_results_new(CMD_SUCCESS, NULL); |
23 | } | 23 | } |
24 | } | 24 | } |
25 | return cmd_results_new(CMD_INVALID, | 25 | return cmd_results_new(CMD_INVALID, "Invalid value %s", argv[0]); |
26 | "position", "Invalid value %s", argv[0]); | ||
27 | } | 26 | } |
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c index 060b8f52..145cdea5 100644 --- a/sway/commands/bar/separator_symbol.c +++ b/sway/commands/bar/separator_symbol.c | |||
@@ -9,12 +9,11 @@ struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) { | |||
9 | return error; | 9 | return error; |
10 | } | 10 | } |
11 | if (!config->current_bar) { | 11 | if (!config->current_bar) { |
12 | return cmd_results_new(CMD_FAILURE, | 12 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
13 | "separator_symbol", "No bar defined."); | ||
14 | } | 13 | } |
15 | free(config->current_bar->separator_symbol); | 14 | free(config->current_bar->separator_symbol); |
16 | config->current_bar->separator_symbol = strdup(argv[0]); | 15 | config->current_bar->separator_symbol = strdup(argv[0]); |
17 | wlr_log(WLR_DEBUG, "Settings separator_symbol '%s' for bar: %s", | 16 | wlr_log(WLR_DEBUG, "Settings separator_symbol '%s' for bar: %s", |
18 | config->current_bar->separator_symbol, config->current_bar->id); | 17 | config->current_bar->separator_symbol, config->current_bar->id); |
19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 18 | return cmd_results_new(CMD_SUCCESS, NULL); |
20 | } | 19 | } |
diff --git a/sway/commands/bar/status_command.c b/sway/commands/bar/status_command.c index 490393f1..c379cc72 100644 --- a/sway/commands/bar/status_command.c +++ b/sway/commands/bar/status_command.c | |||
@@ -9,8 +9,7 @@ struct cmd_results *bar_cmd_status_command(int argc, char **argv) { | |||
9 | return error; | 9 | return error; |
10 | } | 10 | } |
11 | if (!config->current_bar) { | 11 | if (!config->current_bar) { |
12 | return cmd_results_new(CMD_FAILURE, | 12 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
13 | "status_command", "No bar defined."); | ||
14 | } | 13 | } |
15 | free(config->current_bar->status_command); | 14 | free(config->current_bar->status_command); |
16 | config->current_bar->status_command = NULL; | 15 | config->current_bar->status_command = NULL; |
@@ -28,5 +27,5 @@ struct cmd_results *bar_cmd_status_command(int argc, char **argv) { | |||
28 | load_swaybar(config->current_bar); | 27 | load_swaybar(config->current_bar); |
29 | } | 28 | } |
30 | 29 | ||
31 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 30 | return cmd_results_new(CMD_SUCCESS, NULL); |
32 | } | 31 | } |
diff --git a/sway/commands/bar/status_edge_padding.c b/sway/commands/bar/status_edge_padding.c index f3b10631..565ab9a9 100644 --- a/sway/commands/bar/status_edge_padding.c +++ b/sway/commands/bar/status_edge_padding.c | |||
@@ -11,11 +11,11 @@ struct cmd_results *bar_cmd_status_edge_padding(int argc, char **argv) { | |||
11 | char *end; | 11 | char *end; |
12 | int padding = strtol(argv[0], &end, 10); | 12 | int padding = strtol(argv[0], &end, 10); |
13 | if (strlen(end) || padding < 0) { | 13 | if (strlen(end) || padding < 0) { |
14 | return cmd_results_new(CMD_INVALID, "status_edge_padding", | 14 | return cmd_results_new(CMD_INVALID, |
15 | "Padding must be a positive integer"); | 15 | "Padding must be a positive integer"); |
16 | } | 16 | } |
17 | config->current_bar->status_edge_padding = padding; | 17 | config->current_bar->status_edge_padding = padding; |
18 | wlr_log(WLR_DEBUG, "Status edge padding on bar %s: %d", | 18 | wlr_log(WLR_DEBUG, "Status edge padding on bar %s: %d", |
19 | config->current_bar->id, config->current_bar->status_edge_padding); | 19 | config->current_bar->id, config->current_bar->status_edge_padding); |
20 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 20 | return cmd_results_new(CMD_SUCCESS, NULL); |
21 | } | 21 | } |
diff --git a/sway/commands/bar/status_padding.c b/sway/commands/bar/status_padding.c index 13b8eb6b..7a69a25d 100644 --- a/sway/commands/bar/status_padding.c +++ b/sway/commands/bar/status_padding.c | |||
@@ -11,11 +11,11 @@ struct cmd_results *bar_cmd_status_padding(int argc, char **argv) { | |||
11 | char *end; | 11 | char *end; |
12 | int padding = strtol(argv[0], &end, 10); | 12 | int padding = strtol(argv[0], &end, 10); |
13 | if (strlen(end) || padding < 0) { | 13 | if (strlen(end) || padding < 0) { |
14 | return cmd_results_new(CMD_INVALID, "status_padding", | 14 | return cmd_results_new(CMD_INVALID, |
15 | "Padding must be a positive integer"); | 15 | "Padding must be a positive integer"); |
16 | } | 16 | } |
17 | config->current_bar->status_padding = padding; | 17 | config->current_bar->status_padding = padding; |
18 | wlr_log(WLR_DEBUG, "Status padding on bar %s: %d", | 18 | wlr_log(WLR_DEBUG, "Status padding on bar %s: %d", |
19 | config->current_bar->id, config->current_bar->status_padding); | 19 | config->current_bar->id, config->current_bar->status_padding); |
20 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 20 | return cmd_results_new(CMD_SUCCESS, NULL); |
21 | } | 21 | } |
diff --git a/sway/commands/bar/strip_workspace_name.c b/sway/commands/bar/strip_workspace_name.c index 79692f6e..b74afd6e 100644 --- a/sway/commands/bar/strip_workspace_name.c +++ b/sway/commands/bar/strip_workspace_name.c | |||
@@ -11,8 +11,7 @@ struct cmd_results *bar_cmd_strip_workspace_name(int argc, char **argv) { | |||
11 | return error; | 11 | return error; |
12 | } | 12 | } |
13 | if (!config->current_bar) { | 13 | if (!config->current_bar) { |
14 | return cmd_results_new(CMD_FAILURE, | 14 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
15 | "strip_workspace_name", "No bar defined."); | ||
16 | } | 15 | } |
17 | 16 | ||
18 | config->current_bar->strip_workspace_name = | 17 | config->current_bar->strip_workspace_name = |
@@ -28,5 +27,5 @@ struct cmd_results *bar_cmd_strip_workspace_name(int argc, char **argv) { | |||
28 | config->current_bar->id); | 27 | config->current_bar->id); |
29 | } | 28 | } |
30 | 29 | ||
31 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 30 | return cmd_results_new(CMD_SUCCESS, NULL); |
32 | } | 31 | } |
diff --git a/sway/commands/bar/strip_workspace_numbers.c b/sway/commands/bar/strip_workspace_numbers.c index b33d01e5..9c6ec228 100644 --- a/sway/commands/bar/strip_workspace_numbers.c +++ b/sway/commands/bar/strip_workspace_numbers.c | |||
@@ -11,8 +11,7 @@ struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) { | |||
11 | return error; | 11 | return error; |
12 | } | 12 | } |
13 | if (!config->current_bar) { | 13 | if (!config->current_bar) { |
14 | return cmd_results_new(CMD_FAILURE, | 14 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
15 | "strip_workspace_numbers", "No bar defined."); | ||
16 | } | 15 | } |
17 | 16 | ||
18 | config->current_bar->strip_workspace_numbers = | 17 | config->current_bar->strip_workspace_numbers = |
@@ -28,5 +27,5 @@ struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) { | |||
28 | config->current_bar->id); | 27 | config->current_bar->id); |
29 | } | 28 | } |
30 | 29 | ||
31 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 30 | return cmd_results_new(CMD_SUCCESS, NULL); |
32 | } | 31 | } |
diff --git a/sway/commands/bar/swaybar_command.c b/sway/commands/bar/swaybar_command.c index 04e78e77..6253e2b1 100644 --- a/sway/commands/bar/swaybar_command.c +++ b/sway/commands/bar/swaybar_command.c | |||
@@ -9,12 +9,11 @@ struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) { | |||
9 | return error; | 9 | return error; |
10 | } | 10 | } |
11 | if (!config->current_bar) { | 11 | if (!config->current_bar) { |
12 | return cmd_results_new(CMD_FAILURE, | 12 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
13 | "swaybar_command", "No bar defined."); | ||
14 | } | 13 | } |
15 | free(config->current_bar->swaybar_command); | 14 | free(config->current_bar->swaybar_command); |
16 | config->current_bar->swaybar_command = join_args(argv, argc); | 15 | config->current_bar->swaybar_command = join_args(argv, argc); |
17 | wlr_log(WLR_DEBUG, "Using custom swaybar command: %s", | 16 | wlr_log(WLR_DEBUG, "Using custom swaybar command: %s", |
18 | config->current_bar->swaybar_command); | 17 | config->current_bar->swaybar_command); |
19 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 18 | return cmd_results_new(CMD_SUCCESS, NULL); |
20 | } | 19 | } |
diff --git a/sway/commands/bar/tray_bindsym.c b/sway/commands/bar/tray_bindsym.c index ad413446..4e57e35e 100644 --- a/sway/commands/bar/tray_bindsym.c +++ b/sway/commands/bar/tray_bindsym.c | |||
@@ -12,7 +12,7 @@ struct cmd_results *bar_cmd_tray_bindsym(int argc, char **argv) { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | if (!config->current_bar) { | 14 | if (!config->current_bar) { |
15 | return cmd_results_new(CMD_FAILURE, "tray_bindsym", "No bar defined."); | 15 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
16 | } | 16 | } |
17 | 17 | ||
18 | int button = 0; | 18 | int button = 0; |
@@ -21,7 +21,7 @@ struct cmd_results *bar_cmd_tray_bindsym(int argc, char **argv) { | |||
21 | button = argv[0][strlen("button")] - '0'; | 21 | button = argv[0][strlen("button")] - '0'; |
22 | } | 22 | } |
23 | if (button < 1 || button > 9) { | 23 | if (button < 1 || button > 9) { |
24 | return cmd_results_new(CMD_FAILURE, "tray_bindsym", | 24 | return cmd_results_new(CMD_FAILURE, |
25 | "[Bar %s] Only buttons 1 to 9 are supported", | 25 | "[Bar %s] Only buttons 1 to 9 are supported", |
26 | config->current_bar->id); | 26 | config->current_bar->id); |
27 | } | 27 | } |
@@ -42,14 +42,14 @@ struct cmd_results *bar_cmd_tray_bindsym(int argc, char **argv) { | |||
42 | wlr_log(WLR_DEBUG, "[Bar %s] Binding button %d to %s", | 42 | wlr_log(WLR_DEBUG, "[Bar %s] Binding button %d to %s", |
43 | config->current_bar->id, button, commands[i]); | 43 | config->current_bar->id, button, commands[i]); |
44 | config->current_bar->tray_bindings[button] = commands[i]; | 44 | config->current_bar->tray_bindings[button] = commands[i]; |
45 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 45 | return cmd_results_new(CMD_SUCCESS, NULL); |
46 | } | 46 | } |
47 | } | 47 | } |
48 | 48 | ||
49 | return cmd_results_new(CMD_INVALID, "tray_bindsym", | 49 | return cmd_results_new(CMD_INVALID, |
50 | "[Bar %s] Invalid command %s", config->current_bar->id, argv[1]); | 50 | "[Bar %s] Invalid command %s", config->current_bar->id, argv[1]); |
51 | #else | 51 | #else |
52 | return cmd_results_new(CMD_INVALID, "tray_bindsym", | 52 | return cmd_results_new(CMD_INVALID, |
53 | "Sway has been compiled without tray support"); | 53 | "Sway has been compiled without tray support"); |
54 | #endif | 54 | #endif |
55 | } | 55 | } |
diff --git a/sway/commands/bar/tray_output.c b/sway/commands/bar/tray_output.c index a1169c20..d45c09c6 100644 --- a/sway/commands/bar/tray_output.c +++ b/sway/commands/bar/tray_output.c | |||
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_tray_output(int argc, char **argv) { | |||
14 | } | 14 | } |
15 | 15 | ||
16 | if (!config->current_bar) { | 16 | if (!config->current_bar) { |
17 | return cmd_results_new(CMD_FAILURE, "tray_output", "No bar defined."); | 17 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
18 | } | 18 | } |
19 | 19 | ||
20 | list_t *outputs = config->current_bar->tray_outputs; | 20 | list_t *outputs = config->current_bar->tray_outputs; |
@@ -34,9 +34,9 @@ struct cmd_results *bar_cmd_tray_output(int argc, char **argv) { | |||
34 | } | 34 | } |
35 | list_add(outputs, strdup(argv[0])); | 35 | list_add(outputs, strdup(argv[0])); |
36 | 36 | ||
37 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 37 | return cmd_results_new(CMD_SUCCESS, NULL); |
38 | #else | 38 | #else |
39 | return cmd_results_new(CMD_INVALID, "tray_output", | 39 | return cmd_results_new(CMD_INVALID, |
40 | "Sway has been compiled without tray support"); | 40 | "Sway has been compiled without tray support"); |
41 | #endif | 41 | #endif |
42 | } | 42 | } |
diff --git a/sway/commands/bar/tray_padding.c b/sway/commands/bar/tray_padding.c index eb795b00..1e8b294b 100644 --- a/sway/commands/bar/tray_padding.c +++ b/sway/commands/bar/tray_padding.c | |||
@@ -16,27 +16,27 @@ struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) { | |||
16 | } | 16 | } |
17 | 17 | ||
18 | if (!config->current_bar) { | 18 | if (!config->current_bar) { |
19 | return cmd_results_new(CMD_FAILURE, "tray_padding", "No bar defined."); | 19 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
20 | } | 20 | } |
21 | struct bar_config *bar = config->current_bar; | 21 | struct bar_config *bar = config->current_bar; |
22 | 22 | ||
23 | char *end; | 23 | char *end; |
24 | int padding = strtol(argv[0], &end, 10); | 24 | int padding = strtol(argv[0], &end, 10); |
25 | if (padding < 0 || (*end != '\0' && strcasecmp(end, "px") != 0)) { | 25 | if (padding < 0 || (*end != '\0' && strcasecmp(end, "px") != 0)) { |
26 | return cmd_results_new(CMD_INVALID, "tray_padding", | 26 | return cmd_results_new(CMD_INVALID, |
27 | "[Bar %s] Invalid tray padding value: %s", bar->id, argv[0]); | 27 | "[Bar %s] Invalid tray padding value: %s", bar->id, argv[0]); |
28 | } | 28 | } |
29 | 29 | ||
30 | if (argc == 2 && strcasecmp(argv[1], "px") != 0) { | 30 | if (argc == 2 && strcasecmp(argv[1], "px") != 0) { |
31 | return cmd_results_new(CMD_INVALID, "tray_padding", | 31 | return cmd_results_new(CMD_INVALID, |
32 | "Expected 'tray_padding <px> [px]'"); | 32 | "Expected 'tray_padding <px> [px]'"); |
33 | } | 33 | } |
34 | 34 | ||
35 | wlr_log(WLR_DEBUG, "[Bar %s] Setting tray padding to %d", bar->id, padding); | 35 | wlr_log(WLR_DEBUG, "[Bar %s] Setting tray padding to %d", bar->id, padding); |
36 | config->current_bar->tray_padding = padding; | 36 | config->current_bar->tray_padding = padding; |
37 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 37 | return cmd_results_new(CMD_SUCCESS, NULL); |
38 | #else | 38 | #else |
39 | return cmd_results_new(CMD_INVALID, "tray_padding", | 39 | return cmd_results_new(CMD_INVALID, |
40 | "Sway has been compiled without tray support"); | 40 | "Sway has been compiled without tray support"); |
41 | #endif | 41 | #endif |
42 | } | 42 | } |
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c index cd001e20..773e6357 100644 --- a/sway/commands/bar/workspace_buttons.c +++ b/sway/commands/bar/workspace_buttons.c | |||
@@ -10,8 +10,7 @@ struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) { | |||
10 | return error; | 10 | return error; |
11 | } | 11 | } |
12 | if (!config->current_bar) { | 12 | if (!config->current_bar) { |
13 | return cmd_results_new(CMD_FAILURE, | 13 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
14 | "workspace_buttons", "No bar defined."); | ||
15 | } | 14 | } |
16 | config->current_bar->workspace_buttons = | 15 | config->current_bar->workspace_buttons = |
17 | parse_boolean(argv[0], config->current_bar->workspace_buttons); | 16 | parse_boolean(argv[0], config->current_bar->workspace_buttons); |
@@ -22,5 +21,5 @@ struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) { | |||
22 | wlr_log(WLR_DEBUG, "Disabling workspace buttons on bar: %s", | 21 | wlr_log(WLR_DEBUG, "Disabling workspace buttons on bar: %s", |
23 | config->current_bar->id); | 22 | config->current_bar->id); |
24 | } | 23 | } |
25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL); |
26 | } | 25 | } |
diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c index 04a4e6b8..2f7bb090 100644 --- a/sway/commands/bar/wrap_scroll.c +++ b/sway/commands/bar/wrap_scroll.c | |||
@@ -10,7 +10,7 @@ struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) { | |||
10 | return error; | 10 | return error; |
11 | } | 11 | } |
12 | if (!config->current_bar) { | 12 | if (!config->current_bar) { |
13 | return cmd_results_new(CMD_FAILURE, "wrap_scroll", "No bar defined."); | 13 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
14 | } | 14 | } |
15 | config->current_bar->wrap_scroll = | 15 | config->current_bar->wrap_scroll = |
16 | parse_boolean(argv[0], config->current_bar->wrap_scroll); | 16 | parse_boolean(argv[0], config->current_bar->wrap_scroll); |
@@ -21,5 +21,5 @@ struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) { | |||
21 | wlr_log(WLR_DEBUG, "Disabling wrap scroll on bar: %s", | 21 | wlr_log(WLR_DEBUG, "Disabling wrap scroll on bar: %s", |
22 | config->current_bar->id); | 22 | config->current_bar->id); |
23 | } | 23 | } |
24 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL); |
25 | } | 25 | } |