summaryrefslogtreecommitdiffstats
path: root/sway/commands/bar
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands/bar')
-rw-r--r--sway/commands/bar/activate_button.c22
-rw-r--r--sway/commands/bar/binding_mode_indicator.c20
-rw-r--r--sway/commands/bar/bindsym.c39
-rw-r--r--sway/commands/bar/colors.c51
-rw-r--r--sway/commands/bar/context_button.c22
-rw-r--r--sway/commands/bar/font.c13
-rw-r--r--sway/commands/bar/height.c5
-rw-r--r--sway/commands/bar/hidden_state.c24
-rw-r--r--sway/commands/bar/icon_theme.c21
-rw-r--r--sway/commands/bar/id.c7
-rw-r--r--sway/commands/bar/mode.c15
-rw-r--r--sway/commands/bar/modifier.c8
-rw-r--r--sway/commands/bar/output.c15
-rw-r--r--sway/commands/bar/pango_markup.c11
-rw-r--r--sway/commands/bar/position.c29
-rw-r--r--sway/commands/bar/secondary_button.c22
-rw-r--r--sway/commands/bar/separator_symbol.c9
-rw-r--r--sway/commands/bar/status_command.c9
-rw-r--r--sway/commands/bar/strip_workspace_numbers.c18
-rw-r--r--sway/commands/bar/swaybar_command.c9
-rw-r--r--sway/commands/bar/tray_output.c25
-rw-r--r--sway/commands/bar/tray_padding.c29
-rw-r--r--sway/commands/bar/workspace_buttons.c15
-rw-r--r--sway/commands/bar/wrap_scroll.c12
24 files changed, 131 insertions, 319 deletions
diff --git a/sway/commands/bar/activate_button.c b/sway/commands/bar/activate_button.c
index 32a1d3e5..7310e7ec 100644
--- a/sway/commands/bar/activate_button.c
+++ b/sway/commands/bar/activate_button.c
@@ -3,24 +3,6 @@
3#include "log.h" 3#include "log.h"
4 4
5struct cmd_results *bar_cmd_activate_button(int argc, char **argv) { 5struct cmd_results *bar_cmd_activate_button(int argc, char **argv) {
6 const char *cmd_name = "activate_button"; 6 // TODO TRAY
7#ifndef ENABLE_TRAY 7 return cmd_results_new(CMD_INVALID, "activate_button", "TODO TRAY");
8 return cmd_results_new(CMD_INVALID, cmd_name, "Invalid %s command "
9 "%s called, but sway was compiled without tray support",
10 cmd_name, cmd_name);
11#else
12 struct cmd_results *error = NULL;
13 if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) {
14 return error;
15 }
16
17 if (!config->current_bar) {
18 return cmd_results_new(CMD_FAILURE, cmd_name, "No bar defined.");
19 }
20
21 // User should be able to prefix with 0x or whatever they want
22 config->current_bar->secondary_button = strtoul(argv[0], NULL, 0);
23
24 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
25#endif
26} 8}
diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c
index 64f5b84f..3ba5f33f 100644
--- a/sway/commands/bar/binding_mode_indicator.c
+++ b/sway/commands/bar/binding_mode_indicator.c
@@ -5,23 +5,23 @@
5 5
6struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) { 6struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) {
7 struct cmd_results *error = NULL; 7 struct cmd_results *error = NULL;
8 if ((error = checkarg(argc, "binding_mode_indicator", EXPECTED_EQUAL_TO, 1))) { 8 if ((error = checkarg(argc,
9 "binding_mode_indicator", EXPECTED_EQUAL_TO, 1))) {
9 return error; 10 return error;
10 } 11 }
11
12 if (!config->current_bar) { 12 if (!config->current_bar) {
13 return cmd_results_new(CMD_FAILURE, "binding_mode_indicator", "No bar defined."); 13 return cmd_results_new(CMD_FAILURE,
14 "binding_mode_indicator", "No bar defined.");
14 } 15 }
15
16 if (strcasecmp("yes", argv[0]) == 0) { 16 if (strcasecmp("yes", argv[0]) == 0) {
17 config->current_bar->binding_mode_indicator = true; 17 config->current_bar->binding_mode_indicator = true;
18 sway_log(L_DEBUG, "Enabling binding mode indicator on bar: %s", config->current_bar->id); 18 wlr_log(L_DEBUG, "Enabling binding mode indicator on bar: %s",
19 config->current_bar->id);
19 } else if (strcasecmp("no", argv[0]) == 0) { 20 } else if (strcasecmp("no", argv[0]) == 0) {
20 config->current_bar->binding_mode_indicator = false; 21 config->current_bar->binding_mode_indicator = false;
21 sway_log(L_DEBUG, "Disabling binding mode indicator on bar: %s", config->current_bar->id); 22 wlr_log(L_DEBUG, "Disabling binding mode indicator on bar: %s",
22 } else { 23 config->current_bar->id);
23 error = cmd_results_new(CMD_INVALID, "binding_mode_indicator", "Invalid value %s", argv[0]);
24 return error;
25 } 24 }
26 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 25 return cmd_results_new(CMD_INVALID, "binding_mode_indicator",
26 "Invalid value %s", argv[0]);
27} 27}
diff --git a/sway/commands/bar/bindsym.c b/sway/commands/bar/bindsym.c
index 5f90b51a..ac09a03f 100644
--- a/sway/commands/bar/bindsym.c
+++ b/sway/commands/bar/bindsym.c
@@ -7,42 +7,5 @@
7#include "stringop.h" 7#include "stringop.h"
8 8
9struct cmd_results *bar_cmd_bindsym(int argc, char **argv) { 9struct cmd_results *bar_cmd_bindsym(int argc, char **argv) {
10 struct cmd_results *error = NULL; 10 return cmd_results_new(CMD_FAILURE, "bindsym", "TODO"); // TODO
11 if ((error = checkarg(argc, "bindsym", EXPECTED_MORE_THAN, 1))) {
12 return error;
13 } else if (!config->reading) {
14 return cmd_results_new(CMD_FAILURE, "bindsym", "Can only be used in config file.");
15 }
16
17 if (!config->current_bar) {
18 return cmd_results_new(CMD_FAILURE, "bindsym", "No bar defined.");
19 }
20
21 if (strlen(argv[1]) != 7) {
22 return cmd_results_new(CMD_INVALID, "bindsym", "Invalid mouse binding %s", argv[1]);
23 }
24 uint32_t numbutton = (uint32_t)atoi(argv[1] + 6);
25 if (numbutton < 1 || numbutton > 5 || strncmp(argv[1], "button", 6) != 0) {
26 return cmd_results_new(CMD_INVALID, "bindsym", "Invalid mouse binding %s", argv[1]);
27 }
28 struct sway_mouse_binding *binding = malloc(sizeof(struct sway_mouse_binding));
29 if (!binding) {
30 return cmd_results_new(CMD_FAILURE, "bindsym", "Unable to allocate binding");
31 }
32 binding->button = numbutton;
33 binding->command = join_args(argv + 1, argc - 1);
34
35 struct bar_config *bar = config->current_bar;
36 int i = list_seq_find(bar->bindings, sway_mouse_binding_cmp_buttons, binding);
37 if (i > -1) {
38 sway_log(L_DEBUG, "bindsym - '%s' for swaybar already exists, overwriting", argv[0]);
39 struct sway_mouse_binding *dup = bar->bindings->items[i];
40 free_sway_mouse_binding(dup);
41 list_del(bar->bindings, i);
42 }
43 list_add(bar->bindings, binding);
44 list_qsort(bar->bindings, sway_mouse_binding_cmp_qsort);
45
46 sway_log(L_DEBUG, "bindsym - Bound %s to command %s when clicking swaybar", argv[0], binding->command);
47 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
48} 11}
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c
index 8b3b0aac..17ba9b7c 100644
--- a/sway/commands/bar/colors.c
+++ b/sway/commands/bar/colors.c
@@ -1,47 +1,38 @@
1#include <string.h> 1#include <string.h>
2#include "sway/commands.h" 2#include "sway/commands.h"
3 3
4static struct cmd_results *parse_single_color(char **color, const char *cmd_name, int argc, char **argv) { 4static struct cmd_results *parse_single_color(char **color,
5 const char *cmd_name, int argc, char **argv) {
5 struct cmd_results *error = NULL; 6 struct cmd_results *error = NULL;
6 if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) { 7 if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) {
7 return error; 8 return error;
8 } 9 }
9 10 if (!*color && !(*color = malloc(10))) {
10 if (!*color) { 11 return NULL;
11 *color = malloc(10);
12 if (!*color) {
13 return cmd_results_new(CMD_FAILURE, cmd_name, "Unable to allocate color");
14 }
15 } 12 }
16
17 error = add_color(cmd_name, *color, argv[0]); 13 error = add_color(cmd_name, *color, argv[0]);
18 if (error) { 14 if (error) {
19 return error; 15 return error;
20 } 16 }
21
22 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 17 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
23} 18}
24 19
25static struct cmd_results *parse_three_colors(char ***colors, const char *cmd_name, int argc, char **argv) { 20static struct cmd_results *parse_three_colors(char ***colors,
21 const char *cmd_name, int argc, char **argv) {
26 struct cmd_results *error = NULL; 22 struct cmd_results *error = NULL;
27 if (argc != 3) { 23 if (argc != 3) {
28 return cmd_results_new(CMD_INVALID, cmd_name, "Requires exactly three color values"); 24 return cmd_results_new(CMD_INVALID,
25 cmd_name, "Requires exactly three color values");
29 } 26 }
30 27 for (size_t i = 0; i < 3; i++) {
31 int i; 28 if (!*colors[i] && !(*(colors[i]) = malloc(10))) {
32 for (i = 0; i < 3; i++) { 29 return NULL;
33 if (!*colors[i]) {
34 *(colors[i]) = malloc(10);
35 if (!*(colors[i])) {
36 return cmd_results_new(CMD_FAILURE, cmd_name, "Unable to allocate color");
37 }
38 } 30 }
39 error = add_color(cmd_name, *(colors[i]), argv[i]); 31 error = add_color(cmd_name, *(colors[i]), argv[i]);
40 if (error) { 32 if (error) {
41 return error; 33 return error;
42 } 34 }
43 } 35 }
44
45 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 36 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
46} 37}
47 38
@@ -50,12 +41,10 @@ struct cmd_results *bar_cmd_colors(int argc, char **argv) {
50 if ((error = checkarg(argc, "colors", EXPECTED_EQUAL_TO, 1))) { 41 if ((error = checkarg(argc, "colors", EXPECTED_EQUAL_TO, 1))) {
51 return error; 42 return error;
52 } 43 }
53
54 if (strcmp("{", argv[0]) != 0) { 44 if (strcmp("{", argv[0]) != 0) {
55 return cmd_results_new(CMD_INVALID, "colors", 45 return cmd_results_new(CMD_INVALID, "colors",
56 "Expected '{' at the start of colors config definition."); 46 "Expected '{' at the start of colors config definition.");
57 } 47 }
58
59 return cmd_results_new(CMD_BLOCK_BAR_COLORS, NULL, NULL); 48 return cmd_results_new(CMD_BLOCK_BAR_COLORS, NULL, NULL);
60} 49}
61 50
@@ -69,11 +58,13 @@ struct cmd_results *bar_colors_cmd_active_workspace(int argc, char **argv) {
69} 58}
70 59
71struct cmd_results *bar_colors_cmd_background(int argc, char **argv) { 60struct cmd_results *bar_colors_cmd_background(int argc, char **argv) {
72 return parse_single_color(&(config->current_bar->colors.background), "background", argc, argv); 61 return parse_single_color(&(config->current_bar->colors.background),
62 "background", argc, argv);
73} 63}
74 64
75struct cmd_results *bar_colors_cmd_focused_background(int argc, char **argv) { 65struct cmd_results *bar_colors_cmd_focused_background(int argc, char **argv) {
76 return parse_single_color(&(config->current_bar->colors.focused_background), "focused_background", argc, argv); 66 return parse_single_color(&(config->current_bar->colors.focused_background),
67 "focused_background", argc, argv);
77} 68}
78 69
79struct cmd_results *bar_colors_cmd_binding_mode(int argc, char **argv) { 70struct cmd_results *bar_colors_cmd_binding_mode(int argc, char **argv) {
@@ -104,19 +95,23 @@ struct cmd_results *bar_colors_cmd_inactive_workspace(int argc, char **argv) {
104} 95}
105 96
106struct cmd_results *bar_colors_cmd_separator(int argc, char **argv) { 97struct cmd_results *bar_colors_cmd_separator(int argc, char **argv) {
107 return parse_single_color(&(config->current_bar->colors.separator), "separator", argc, argv); 98 return parse_single_color(&(config->current_bar->colors.separator),
99 "separator", argc, argv);
108} 100}
109 101
110struct cmd_results *bar_colors_cmd_focused_separator(int argc, char **argv) { 102struct cmd_results *bar_colors_cmd_focused_separator(int argc, char **argv) {
111 return parse_single_color(&(config->current_bar->colors.focused_separator), "focused_separator", argc, argv); 103 return parse_single_color(&(config->current_bar->colors.focused_separator),
104 "focused_separator", argc, argv);
112} 105}
113 106
114struct cmd_results *bar_colors_cmd_statusline(int argc, char **argv) { 107struct cmd_results *bar_colors_cmd_statusline(int argc, char **argv) {
115 return parse_single_color(&(config->current_bar->colors.statusline), "statusline", argc, argv); 108 return parse_single_color(&(config->current_bar->colors.statusline),
109 "statusline", argc, argv);
116} 110}
117 111
118struct cmd_results *bar_colors_cmd_focused_statusline(int argc, char **argv) { 112struct cmd_results *bar_colors_cmd_focused_statusline(int argc, char **argv) {
119 return parse_single_color(&(config->current_bar->colors.focused_separator), "focused_separator", argc, argv); 113 return parse_single_color(&(config->current_bar->colors.focused_separator),
114 "focused_separator", argc, argv);
120} 115}
121 116
122struct cmd_results *bar_colors_cmd_urgent_workspace(int argc, char **argv) { 117struct cmd_results *bar_colors_cmd_urgent_workspace(int argc, char **argv) {
diff --git a/sway/commands/bar/context_button.c b/sway/commands/bar/context_button.c
index 6d7d7aec..3b76885a 100644
--- a/sway/commands/bar/context_button.c
+++ b/sway/commands/bar/context_button.c
@@ -3,24 +3,6 @@
3#include "log.h" 3#include "log.h"
4 4
5struct cmd_results *bar_cmd_context_button(int argc, char **argv) { 5struct cmd_results *bar_cmd_context_button(int argc, char **argv) {
6 const char *cmd_name = "context_button"; 6 // TODO TRAY
7#ifndef ENABLE_TRAY 7 return cmd_results_new(CMD_INVALID, "context_button", "TODO TRAY");
8 return cmd_results_new(CMD_INVALID, cmd_name, "Invalid %s command "
9 "%s called, but sway was compiled without tray support",
10 cmd_name, cmd_name);
11#else
12 struct cmd_results *error = NULL;
13 if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) {
14 return error;
15 }
16
17 if (!config->current_bar) {
18 return cmd_results_new(CMD_FAILURE, cmd_name, "No bar defined.");
19 }
20
21 // User should be able to prefix with 0x or whatever they want
22 config->current_bar->context_button = strtoul(argv[0], NULL, 0);
23
24 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
25#endif
26} 8}
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c
index c586c5bc..80b7a593 100644
--- a/sway/commands/bar/font.c
+++ b/sway/commands/bar/font.c
@@ -1,3 +1,4 @@
1#define _POSIX_C_SOURCE 200809L
1#include <string.h> 2#include <string.h>
2#include "sway/commands.h" 3#include "sway/commands.h"
3#include "log.h" 4#include "log.h"
@@ -8,19 +9,13 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) {
8 if ((error = checkarg(argc, "font", EXPECTED_AT_LEAST, 1))) { 9 if ((error = checkarg(argc, "font", EXPECTED_AT_LEAST, 1))) {
9 return error; 10 return error;
10 } 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, "font", "No bar defined.");
14 } 14 }
15
16 char *font = join_args(argv, argc); 15 char *font = join_args(argv, argc);
17 free(config->current_bar->font); 16 free(config->current_bar->font);
18 if (strlen(font) > 6 && strncmp("pango:", font, 6) == 0) { 17 config->current_bar->font = strdup(font);
19 config->current_bar->font = font; 18 wlr_log(L_DEBUG, "Settings font '%s' for bar: %s",
20 } else { 19 config->current_bar->font, config->current_bar->id);
21 config->current_bar->font = font;
22 }
23
24 sway_log(L_DEBUG, "Settings font '%s' for bar: %s", config->current_bar->font, config->current_bar->id);
25 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 20 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
26} 21}
diff --git a/sway/commands/bar/height.c b/sway/commands/bar/height.c
index eb576ab3..3160caed 100644
--- a/sway/commands/bar/height.c
+++ b/sway/commands/bar/height.c
@@ -8,14 +8,13 @@ struct cmd_results *bar_cmd_height(int argc, char **argv) {
8 if ((error = checkarg(argc, "height", EXPECTED_EQUAL_TO, 1))) { 8 if ((error = checkarg(argc, "height", EXPECTED_EQUAL_TO, 1))) {
9 return error; 9 return error;
10 } 10 }
11
12 int height = atoi(argv[0]); 11 int height = atoi(argv[0]);
13 if (height < 0) { 12 if (height < 0) {
14 return cmd_results_new(CMD_INVALID, "height", 13 return cmd_results_new(CMD_INVALID, "height",
15 "Invalid height value: %s", argv[0]); 14 "Invalid height value: %s", argv[0]);
16 } 15 }
17
18 config->current_bar->height = height; 16 config->current_bar->height = height;
19 sway_log(L_DEBUG, "Setting bar height to %d on bar: %s", height, config->current_bar->id); 17 wlr_log(L_DEBUG, "Setting bar height to %d on bar: %s",
18 height, config->current_bar->id);
20 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 19 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
21} 20}
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
index 0b49aa6b..6641f184 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -6,7 +6,8 @@
6#include "sway/ipc-server.h" 6#include "sway/ipc-server.h"
7#include "log.h" 7#include "log.h"
8 8
9static struct cmd_results *bar_set_hidden_state(struct bar_config *bar, const char *hidden_state) { 9static struct cmd_results *bar_set_hidden_state(struct bar_config *bar,
10 const char *hidden_state) {
10 char *old_state = bar->hidden_state; 11 char *old_state = bar->hidden_state;
11 if (strcasecmp("toggle", hidden_state) == 0 && !config->reading) { 12 if (strcasecmp("toggle", hidden_state) == 0 && !config->reading) {
12 if (strcasecmp("hide", bar->hidden_state) == 0) { 13 if (strcasecmp("hide", bar->hidden_state) == 0) {
@@ -19,16 +20,16 @@ static struct cmd_results *bar_set_hidden_state(struct bar_config *bar, const ch
19 } else if (strcasecmp("show", hidden_state) == 0) { 20 } else if (strcasecmp("show", hidden_state) == 0) {
20 bar->hidden_state = strdup("show"); 21 bar->hidden_state = strdup("show");
21 } else { 22 } else {
22 return cmd_results_new(CMD_INVALID, "hidden_state", "Invalid value %s", hidden_state); 23 return cmd_results_new(CMD_INVALID, "hidden_state",
24 "Invalid value %s", hidden_state);
23 } 25 }
24
25 if (strcmp(old_state, bar->hidden_state) != 0) { 26 if (strcmp(old_state, bar->hidden_state) != 0) {
26 if (!config->reading) { 27 if (!config->reading) {
27 ipc_event_barconfig_update(bar); 28 ipc_event_barconfig_update(bar);
28 } 29 }
29 sway_log(L_DEBUG, "Setting hidden_state: '%s' for bar: %s", bar->hidden_state, bar->id); 30 wlr_log(L_DEBUG, "Setting hidden_state: '%s' for bar: %s",
31 bar->hidden_state, bar->id);
30 } 32 }
31
32 // free old mode 33 // free old mode
33 free(old_state); 34 free(old_state);
34 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 35 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
@@ -42,13 +43,12 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
42 if ((error = checkarg(argc, "hidden_state", EXPECTED_LESS_THAN, 3))) { 43 if ((error = checkarg(argc, "hidden_state", EXPECTED_LESS_THAN, 3))) {
43 return error; 44 return error;
44 } 45 }
45
46 if (config->reading && argc > 1) { 46 if (config->reading && argc > 1) {
47 return cmd_results_new(CMD_INVALID, "hidden_state", "Unexpected value %s in config mode", argv[1]); 47 return cmd_results_new(CMD_INVALID, "hidden_state",
48 "Unexpected value %s in config mode", argv[1]);
48 } 49 }
49 50
50 const char *state = argv[0]; 51 const char *state = argv[0];
51
52 if (config->reading) { 52 if (config->reading) {
53 return bar_set_hidden_state(config->current_bar, state); 53 return bar_set_hidden_state(config->current_bar, state);
54 } 54 }
@@ -57,10 +57,8 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
57 if (argc == 2) { 57 if (argc == 2) {
58 id = argv[1]; 58 id = argv[1];
59 } 59 }
60
61 int i;
62 struct bar_config *bar; 60 struct bar_config *bar;
63 for (i = 0; i < config->bars->length; ++i) { 61 for (int i = 0; i < config->bars->length; ++i) {
64 bar = config->bars->items[i]; 62 bar = config->bars->items[i];
65 if (id && strcmp(id, bar->id) == 0) { 63 if (id && strcmp(id, bar->id) == 0) {
66 return bar_set_hidden_state(bar, state); 64 return bar_set_hidden_state(bar, state);
@@ -71,9 +69,5 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
71 return error; 69 return error;
72 } 70 }
73 } 71 }
74
75 // active bar modifiers might have changed.
76 update_active_bar_modifiers();
77
78 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 72 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
79} 73}
diff --git a/sway/commands/bar/icon_theme.c b/sway/commands/bar/icon_theme.c
index cbfc0be5..44cd3076 100644
--- a/sway/commands/bar/icon_theme.c
+++ b/sway/commands/bar/icon_theme.c
@@ -3,23 +3,6 @@
3#include "sway/commands.h" 3#include "sway/commands.h"
4 4
5struct cmd_results *bar_cmd_icon_theme(int argc, char **argv) { 5struct cmd_results *bar_cmd_icon_theme(int argc, char **argv) {
6 const char *cmd_name = "tray_output"; 6 // TODO TRAY
7#ifndef ENABLE_TRAY 7 return cmd_results_new(CMD_INVALID, "icon_theme", "TODO TRAY");
8 return cmd_results_new(CMD_INVALID, cmd_name, "Invalid %s command "
9 "%s called, but sway was compiled without tray support",
10 cmd_name, cmd_name);
11#else
12 struct cmd_results *error = NULL;
13 if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) {
14 return error;
15 }
16
17 if (!config->current_bar) {
18 return cmd_results_new(CMD_FAILURE, cmd_name, "No bar defined.");
19 }
20
21 config->current_bar->icon_theme = strdup(argv[0]);
22
23 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
24#endif
25} 8}
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
index 1221ebf6..c1e56f03 100644
--- a/sway/commands/bar/id.c
+++ b/sway/commands/bar/id.c
@@ -11,10 +11,8 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) {
11 11
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
15 // check if id is used by a previously defined bar 14 // check if id is used by a previously defined bar
16 int i; 15 for (int i = 0; i < config->bars->length; ++i) {
17 for (i = 0; i < config->bars->length; ++i) {
18 struct bar_config *find = config->bars->items[i]; 16 struct bar_config *find = config->bars->items[i];
19 if (strcmp(name, find->id) == 0 && config->current_bar != find) { 17 if (strcmp(name, find->id) == 0 && config->current_bar != find) {
20 return cmd_results_new(CMD_FAILURE, "id", 18 return cmd_results_new(CMD_FAILURE, "id",
@@ -23,11 +21,10 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) {
23 } 21 }
24 } 22 }
25 23
26 sway_log(L_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name); 24 wlr_log(L_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name);
27 25
28 // free old bar id 26 // free old bar id
29 free(config->current_bar->id); 27 free(config->current_bar->id);
30
31 config->current_bar->id = strdup(name); 28 config->current_bar->id = strdup(name);
32 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 29 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
33} 30}
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
index 36816b93..34bb0a4f 100644
--- a/sway/commands/bar/mode.c
+++ b/sway/commands/bar/mode.c
@@ -27,11 +27,8 @@ static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode
27 if (strcmp(old_mode, bar->mode) != 0) { 27 if (strcmp(old_mode, bar->mode) != 0) {
28 if (!config->reading) { 28 if (!config->reading) {
29 ipc_event_barconfig_update(bar); 29 ipc_event_barconfig_update(bar);
30
31 // active bar modifiers might have changed.
32 update_active_bar_modifiers();
33 } 30 }
34 sway_log(L_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id); 31 wlr_log(L_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id);
35 } 32 }
36 33
37 // free old mode 34 // free old mode
@@ -47,13 +44,12 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) {
47 if ((error = checkarg(argc, "mode", EXPECTED_LESS_THAN, 3))) { 44 if ((error = checkarg(argc, "mode", EXPECTED_LESS_THAN, 3))) {
48 return error; 45 return error;
49 } 46 }
50
51 if (config->reading && argc > 1) { 47 if (config->reading && argc > 1) {
52 return cmd_results_new(CMD_INVALID, "mode", "Unexpected value %s in config mode", argv[1]); 48 return cmd_results_new(CMD_INVALID,
49 "mode", "Unexpected value %s in config mode", argv[1]);
53 } 50 }
54 51
55 const char *mode = argv[0]; 52 const char *mode = argv[0];
56
57 if (config->reading) { 53 if (config->reading) {
58 return bar_set_mode(config->current_bar, mode); 54 return bar_set_mode(config->current_bar, mode);
59 } 55 }
@@ -63,19 +59,16 @@ struct cmd_results *bar_cmd_mode(int argc, char **argv) {
63 id = argv[1]; 59 id = argv[1];
64 } 60 }
65 61
66 int i;
67 struct bar_config *bar; 62 struct bar_config *bar;
68 for (i = 0; i < config->bars->length; ++i) { 63 for (int i = 0; i < config->bars->length; ++i) {
69 bar = config->bars->items[i]; 64 bar = config->bars->items[i];
70 if (id && strcmp(id, bar->id) == 0) { 65 if (id && strcmp(id, bar->id) == 0) {
71 return bar_set_mode(bar, mode); 66 return bar_set_mode(bar, mode);
72 } 67 }
73
74 error = bar_set_mode(bar, mode); 68 error = bar_set_mode(bar, mode);
75 if (error) { 69 if (error) {
76 return error; 70 return error;
77 } 71 }
78 } 72 }
79
80 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 73 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
81} 74}
diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c
index 153d87e6..7ba4b125 100644
--- a/sway/commands/bar/modifier.c
+++ b/sway/commands/bar/modifier.c
@@ -15,7 +15,6 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
15 } 15 }
16 16
17 uint32_t mod = 0; 17 uint32_t mod = 0;
18
19 list_t *split = split_string(argv[0], "+"); 18 list_t *split = split_string(argv[0], "+");
20 for (int i = 0; i < split->length; ++i) { 19 for (int i = 0; i < split->length; ++i) {
21 uint32_t tmp_mod; 20 uint32_t tmp_mod;
@@ -24,12 +23,13 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
24 continue; 23 continue;
25 } else { 24 } else {
26 free_flat_list(split); 25 free_flat_list(split);
27 return cmd_results_new(CMD_INVALID, "modifier", "Unknown modifier '%s'", split->items[i]); 26 return cmd_results_new(CMD_INVALID, "modifier",
27 "Unknown modifier '%s'", split->items[i]);
28 } 28 }
29 } 29 }
30 free_flat_list(split); 30 free_flat_list(split);
31
32 config->current_bar->modifier = mod; 31 config->current_bar->modifier = mod;
33 sway_log(L_DEBUG, "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); 32 wlr_log(L_DEBUG,
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, NULL);
35} 35}
diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c
index a5710bc0..f7ca0aa4 100644
--- a/sway/commands/bar/output.c
+++ b/sway/commands/bar/output.c
@@ -1,4 +1,5 @@
1#define _XOPEN_SOURCE 500 1#define _XOPEN_SOURCE 500
2#include <stdbool.h>
2#include <string.h> 3#include <string.h>
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "list.h" 5#include "list.h"
@@ -9,7 +10,6 @@ struct cmd_results *bar_cmd_output(int argc, char **argv) {
9 if ((error = checkarg(argc, "output", EXPECTED_EQUAL_TO, 1))) { 10 if ((error = checkarg(argc, "output", EXPECTED_EQUAL_TO, 1))) {
10 return error; 11 return error;
11 } 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, "output", "No bar defined.");
15 } 15 }
@@ -21,21 +21,20 @@ struct cmd_results *bar_cmd_output(int argc, char **argv) {
21 config->current_bar->outputs = outputs; 21 config->current_bar->outputs = outputs;
22 } 22 }
23 23
24 int i; 24 bool add_output = true;
25 int add_output = 1;
26 if (strcmp("*", output) == 0) { 25 if (strcmp("*", output) == 0) {
27 // remove all previous defined outputs and replace with '*' 26 // remove all previous defined outputs and replace with '*'
28 for (i = 0; i < outputs->length; ++i) { 27 for (int i = 0; i < outputs->length; ++i) {
29 free(outputs->items[i]); 28 free(outputs->items[i]);
30 list_del(outputs, i); 29 list_del(outputs, i);
31 } 30 }
32 } else { 31 } else {
33 // only add output if not already defined with either the same 32 // only add output if not already defined with either the same
34 // name or as '*' 33 // name or as '*'
35 for (i = 0; i < outputs->length; ++i) { 34 for (int i = 0; i < outputs->length; ++i) {
36 const char *find = outputs->items[i]; 35 const char *find = outputs->items[i];
37 if (strcmp("*", find) == 0 || strcmp(output, find) == 0) { 36 if (strcmp("*", find) == 0 || strcmp(output, find) == 0) {
38 add_output = 0; 37 add_output = false;
39 break; 38 break;
40 } 39 }
41 } 40 }
@@ -43,8 +42,8 @@ struct cmd_results *bar_cmd_output(int argc, char **argv) {
43 42
44 if (add_output) { 43 if (add_output) {
45 list_add(outputs, strdup(output)); 44 list_add(outputs, strdup(output));
46 sway_log(L_DEBUG, "Adding bar: '%s' to output '%s'", config->current_bar->id, output); 45 wlr_log(L_DEBUG, "Adding bar: '%s' to output '%s'",
46 config->current_bar->id, output);
47 } 47 }
48
49 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 48 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
50} 49}
diff --git a/sway/commands/bar/pango_markup.c b/sway/commands/bar/pango_markup.c
index f69e882f..480af724 100644
--- a/sway/commands/bar/pango_markup.c
+++ b/sway/commands/bar/pango_markup.c
@@ -8,19 +8,20 @@ struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) {
8 if ((error = checkarg(argc, "pango_markup", EXPECTED_EQUAL_TO, 1))) { 8 if ((error = checkarg(argc, "pango_markup", EXPECTED_EQUAL_TO, 1))) {
9 return error; 9 return error;
10 } 10 }
11
12 if (!config->current_bar) { 11 if (!config->current_bar) {
13 return cmd_results_new(CMD_FAILURE, "pango_markup", "No bar defined."); 12 return cmd_results_new(CMD_FAILURE, "pango_markup", "No bar defined.");
14 } 13 }
15
16 if (strcasecmp("enabled", argv[0]) == 0) { 14 if (strcasecmp("enabled", argv[0]) == 0) {
17 config->current_bar->pango_markup = true; 15 config->current_bar->pango_markup = true;
18 sway_log(L_DEBUG, "Enabling pango markup for bar: %s", config->current_bar->id); 16 wlr_log(L_DEBUG, "Enabling pango markup for bar: %s",
17 config->current_bar->id);
19 } else if (strcasecmp("disabled", argv[0]) == 0) { 18 } else if (strcasecmp("disabled", argv[0]) == 0) {
20 config->current_bar->pango_markup = false; 19 config->current_bar->pango_markup = false;
21 sway_log(L_DEBUG, "Disabling pango markup for bar: %s", config->current_bar->id); 20 wlr_log(L_DEBUG, "Disabling pango markup for bar: %s",
21 config->current_bar->id);
22 } else { 22 } else {
23 error = cmd_results_new(CMD_INVALID, "pango_markup", "Invalid value %s", argv[0]); 23 error = cmd_results_new(CMD_INVALID, "pango_markup",
24 "Invalid value %s", argv[0]);
24 return error; 25 return error;
25 } 26 }
26 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 27 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c
index 50de58e2..9c580483 100644
--- a/sway/commands/bar/position.c
+++ b/sway/commands/bar/position.c
@@ -1,3 +1,4 @@
1#define _POSIX_C_SOURCE 200809L
1#include <string.h> 2#include <string.h>
2#include <strings.h> 3#include <strings.h>
3#include "sway/commands.h" 4#include "sway/commands.h"
@@ -8,26 +9,18 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) {
8 if ((error = checkarg(argc, "position", EXPECTED_EQUAL_TO, 1))) { 9 if ((error = checkarg(argc, "position", EXPECTED_EQUAL_TO, 1))) {
9 return error; 10 return error;
10 } 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, "position", "No bar defined.");
14 } 14 }
15 15 char *valid[] = { "top", "bottom", "left", "right" };
16 if (strcasecmp("top", argv[0]) == 0) { 16 for (size_t i = 0; i < sizeof(valid) / sizeof(valid[0]); ++i) {
17 config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_TOP; 17 if (strcasecmp(valid[i], argv[0]) == 0) {
18 } else if (strcasecmp("bottom", argv[0]) == 0) { 18 wlr_log(L_DEBUG, "Setting bar position '%s' for bar: %s",
19 config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; 19 argv[0], config->current_bar->id);
20 } else if (strcasecmp("left", argv[0]) == 0) { 20 config->current_bar->position = strdup(argv[0]);
21 sway_log(L_INFO, "Warning: swaybar currently only supports top and bottom positioning. YMMV"); 21 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
22 config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_LEFT; 22 }
23 } else if (strcasecmp("right", argv[0]) == 0) {
24 sway_log(L_INFO, "Warning: swaybar currently only supports top and bottom positioning. YMMV");
25 config->current_bar->position = DESKTOP_SHELL_PANEL_POSITION_RIGHT;
26 } else {
27 error = cmd_results_new(CMD_INVALID, "position", "Invalid value %s", argv[0]);
28 return error;
29 } 23 }
30 24 return cmd_results_new(CMD_INVALID,
31 sway_log(L_DEBUG, "Setting bar position '%s' for bar: %s", argv[0], config->current_bar->id); 25 "position", "Invalid value %s", argv[0]);
32 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
33} 26}
diff --git a/sway/commands/bar/secondary_button.c b/sway/commands/bar/secondary_button.c
index 745045c5..449124cb 100644
--- a/sway/commands/bar/secondary_button.c
+++ b/sway/commands/bar/secondary_button.c
@@ -3,24 +3,6 @@
3#include "log.h" 3#include "log.h"
4 4
5struct cmd_results *bar_cmd_secondary_button(int argc, char **argv) { 5struct cmd_results *bar_cmd_secondary_button(int argc, char **argv) {
6 const char *cmd_name = "secondary_button"; 6 // TODO TRAY
7#ifndef ENABLE_TRAY 7 return cmd_results_new(CMD_INVALID, "secondary_button", "TODO TRAY");
8 return cmd_results_new(CMD_INVALID, cmd_name, "Invalid %s command "
9 "%s called, but sway was compiled without tray support",
10 cmd_name, cmd_name);
11#else
12 struct cmd_results *error = NULL;
13 if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) {
14 return error;
15 }
16
17 if (!config->current_bar) {
18 return cmd_results_new(CMD_FAILURE, cmd_name, "No bar defined.");
19 }
20
21 // User should be able to prefix with 0x or whatever they want
22 config->current_bar->secondary_button = strtoul(argv[0], NULL, 0);
23
24 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
25#endif
26} 8}
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
index 2766d8a2..1e08df6d 100644
--- a/sway/commands/bar/separator_symbol.c
+++ b/sway/commands/bar/separator_symbol.c
@@ -8,14 +8,13 @@ struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) {
8 if ((error = checkarg(argc, "separator_symbol", EXPECTED_EQUAL_TO, 1))) { 8 if ((error = checkarg(argc, "separator_symbol", EXPECTED_EQUAL_TO, 1))) {
9 return error; 9 return error;
10 } 10 }
11
12 if (!config->current_bar) { 11 if (!config->current_bar) {
13 return cmd_results_new(CMD_FAILURE, "separator_symbol", "No bar defined."); 12 return cmd_results_new(CMD_FAILURE,
13 "separator_symbol", "No bar defined.");
14 } 14 }
15
16 free(config->current_bar->separator_symbol); 15 free(config->current_bar->separator_symbol);
17 config->current_bar->separator_symbol = strdup(argv[0]); 16 config->current_bar->separator_symbol = strdup(argv[0]);
18 sway_log(L_DEBUG, "Settings separator_symbol '%s' for bar: %s", config->current_bar->separator_symbol, config->current_bar->id); 17 wlr_log(L_DEBUG, "Settings separator_symbol '%s' for bar: %s",
19 18 config->current_bar->separator_symbol, config->current_bar->id);
20 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 19 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
21} 20}
diff --git a/sway/commands/bar/status_command.c b/sway/commands/bar/status_command.c
index b227ac47..5e199cde 100644
--- a/sway/commands/bar/status_command.c
+++ b/sway/commands/bar/status_command.c
@@ -8,14 +8,13 @@ struct cmd_results *bar_cmd_status_command(int argc, char **argv) {
8 if ((error = checkarg(argc, "status_command", EXPECTED_AT_LEAST, 1))) { 8 if ((error = checkarg(argc, "status_command", EXPECTED_AT_LEAST, 1))) {
9 return error; 9 return error;
10 } 10 }
11
12 if (!config->current_bar) { 11 if (!config->current_bar) {
13 return cmd_results_new(CMD_FAILURE, "status_command", "No bar defined."); 12 return cmd_results_new(CMD_FAILURE,
13 "status_command", "No bar defined.");
14 } 14 }
15
16 free(config->current_bar->status_command); 15 free(config->current_bar->status_command);
17 config->current_bar->status_command = join_args(argv, argc); 16 config->current_bar->status_command = join_args(argv, argc);
18 sway_log(L_DEBUG, "Feeding bar with status command: %s", config->current_bar->status_command); 17 wlr_log(L_DEBUG, "Feeding bar with status command: %s",
19 18 config->current_bar->status_command);
20 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 19 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
21} 20}
diff --git a/sway/commands/bar/strip_workspace_numbers.c b/sway/commands/bar/strip_workspace_numbers.c
index 9ac32482..4f24a356 100644
--- a/sway/commands/bar/strip_workspace_numbers.c
+++ b/sway/commands/bar/strip_workspace_numbers.c
@@ -5,23 +5,25 @@
5 5
6struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) { 6struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) {
7 struct cmd_results *error = NULL; 7 struct cmd_results *error = NULL;
8 if ((error = checkarg(argc, "strip_workspace_numbers", EXPECTED_EQUAL_TO, 1))) { 8 if ((error = checkarg(argc,
9 "strip_workspace_numbers", EXPECTED_EQUAL_TO, 1))) {
9 return error; 10 return error;
10 } 11 }
11
12 if (!config->current_bar) { 12 if (!config->current_bar) {
13 return cmd_results_new(CMD_FAILURE, "strip_workspace_numbers", "No bar defined."); 13 return cmd_results_new(CMD_FAILURE,
14 "strip_workspace_numbers", "No bar defined.");
14 } 15 }
15
16 if (strcasecmp("yes", argv[0]) == 0) { 16 if (strcasecmp("yes", argv[0]) == 0) {
17 config->current_bar->strip_workspace_numbers = true; 17 config->current_bar->strip_workspace_numbers = true;
18 sway_log(L_DEBUG, "Stripping workspace numbers on bar: %s", config->current_bar->id); 18 wlr_log(L_DEBUG, "Stripping workspace numbers on bar: %s",
19 config->current_bar->id);
19 } else if (strcasecmp("no", argv[0]) == 0) { 20 } else if (strcasecmp("no", argv[0]) == 0) {
20 config->current_bar->strip_workspace_numbers = false; 21 config->current_bar->strip_workspace_numbers = false;
21 sway_log(L_DEBUG, "Enabling workspace numbers on bar: %s", config->current_bar->id); 22 wlr_log(L_DEBUG, "Enabling workspace numbers on bar: %s",
23 config->current_bar->id);
22 } else { 24 } else {
23 error = cmd_results_new(CMD_INVALID, "strip_workspace_numbers", "Invalid value %s", argv[0]); 25 return cmd_results_new(CMD_INVALID,
24 return error; 26 "strip_workspace_numbers", "Invalid value %s", argv[0]);
25 } 27 }
26 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 28 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
27} 29}
diff --git a/sway/commands/bar/swaybar_command.c b/sway/commands/bar/swaybar_command.c
index 452e2df5..520cdd11 100644
--- a/sway/commands/bar/swaybar_command.c
+++ b/sway/commands/bar/swaybar_command.c
@@ -8,14 +8,13 @@ struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) {
8 if ((error = checkarg(argc, "swaybar_command", EXPECTED_AT_LEAST, 1))) { 8 if ((error = checkarg(argc, "swaybar_command", EXPECTED_AT_LEAST, 1))) {
9 return error; 9 return error;
10 } 10 }
11
12 if (!config->current_bar) { 11 if (!config->current_bar) {
13 return cmd_results_new(CMD_FAILURE, "swaybar_command", "No bar defined."); 12 return cmd_results_new(CMD_FAILURE,
13 "swaybar_command", "No bar defined.");
14 } 14 }
15
16 free(config->current_bar->swaybar_command); 15 free(config->current_bar->swaybar_command);
17 config->current_bar->swaybar_command = join_args(argv, argc); 16 config->current_bar->swaybar_command = join_args(argv, argc);
18 sway_log(L_DEBUG, "Using custom swaybar command: %s", config->current_bar->swaybar_command); 17 wlr_log(L_DEBUG, "Using custom swaybar command: %s",
19 18 config->current_bar->swaybar_command);
20 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 19 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
21} 20}
diff --git a/sway/commands/bar/tray_output.c b/sway/commands/bar/tray_output.c
index 012304a9..6ab16731 100644
--- a/sway/commands/bar/tray_output.c
+++ b/sway/commands/bar/tray_output.c
@@ -3,27 +3,6 @@
3#include "sway/commands.h" 3#include "sway/commands.h"
4 4
5struct cmd_results *bar_cmd_tray_output(int argc, char **argv) { 5struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {
6 const char *cmd_name = "tray_output"; 6 // TODO TRAY
7#ifndef ENABLE_TRAY 7 return cmd_results_new(CMD_INVALID, "tray_output", "TODO TRAY");
8 return cmd_results_new(CMD_INVALID, cmd_name, "Invalid %s command "
9 "%s called, but sway was compiled without tray support",
10 cmd_name, cmd_name);
11#else
12 struct cmd_results *error = NULL;
13 if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 1))) {
14 return error;
15 }
16
17 if (!config->current_bar) {
18 return cmd_results_new(CMD_FAILURE, cmd_name, "No bar defined.");
19 }
20
21 if (strcmp(argv[0], "all") == 0) {
22 // Default behaviour
23 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
24 }
25 config->current_bar->tray_output = strdup(argv[0]);
26
27 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
28#endif
29} 8}
diff --git a/sway/commands/bar/tray_padding.c b/sway/commands/bar/tray_padding.c
index ac0572ce..91c56f19 100644
--- a/sway/commands/bar/tray_padding.c
+++ b/sway/commands/bar/tray_padding.c
@@ -4,31 +4,6 @@
4#include "log.h" 4#include "log.h"
5 5
6struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) { 6struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) {
7 const char *cmd_name = "tray_padding"; 7 // TODO TRAY
8#ifndef ENABLE_TRAY 8 return cmd_results_new(CMD_INVALID, "tray_padding", "TODO TRAY");
9 return cmd_results_new(CMD_INVALID, cmd_name, "Invalid %s command"
10 "%s called, but sway was compiled without tray support",
11 cmd_name, cmd_name);
12#else
13 struct cmd_results *error = NULL;
14 if ((error = checkarg(argc, cmd_name, EXPECTED_AT_LEAST, 1))) {
15 return error;
16 }
17
18 if (!config->current_bar) {
19 return cmd_results_new(CMD_FAILURE, cmd_name, "No bar defined.");
20 }
21
22 if (argc == 1 || (argc == 2 && strcasecmp("px", argv[1]) == 0)) {
23 char *inv;
24 uint32_t padding = strtoul(argv[0], &inv, 10);
25 if (*inv == '\0' || strcasecmp(inv, "px") == 0) {
26 config->current_bar->tray_padding = padding;
27 sway_log(L_DEBUG, "Enabling tray padding of %d px on bar: %s", padding, config->current_bar->id);
28 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
29 }
30 }
31 return cmd_results_new(CMD_FAILURE, cmd_name,
32 "Expected 'tray_padding <padding>[px]'");
33#endif
34} 9}
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c
index 67dd2d31..6edc3a0d 100644
--- a/sway/commands/bar/workspace_buttons.c
+++ b/sway/commands/bar/workspace_buttons.c
@@ -8,20 +8,21 @@ struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) {
8 if ((error = checkarg(argc, "workspace_buttons", EXPECTED_EQUAL_TO, 1))) { 8 if ((error = checkarg(argc, "workspace_buttons", EXPECTED_EQUAL_TO, 1))) {
9 return error; 9 return error;
10 } 10 }
11
12 if (!config->current_bar) { 11 if (!config->current_bar) {
13 return cmd_results_new(CMD_FAILURE, "workspace_buttons", "No bar defined."); 12 return cmd_results_new(CMD_FAILURE,
13 "workspace_buttons", "No bar defined.");
14 } 14 }
15
16 if (strcasecmp("yes", argv[0]) == 0) { 15 if (strcasecmp("yes", argv[0]) == 0) {
17 config->current_bar->workspace_buttons = true; 16 config->current_bar->workspace_buttons = true;
18 sway_log(L_DEBUG, "Enabling workspace buttons on bar: %s", config->current_bar->id); 17 wlr_log(L_DEBUG, "Enabling workspace buttons on bar: %s",
18 config->current_bar->id);
19 } else if (strcasecmp("no", argv[0]) == 0) { 19 } else if (strcasecmp("no", argv[0]) == 0) {
20 config->current_bar->workspace_buttons = false; 20 config->current_bar->workspace_buttons = false;
21 sway_log(L_DEBUG, "Disabling workspace buttons on bar: %s", config->current_bar->id); 21 wlr_log(L_DEBUG, "Disabling workspace buttons on bar: %s",
22 config->current_bar->id);
22 } else { 23 } else {
23 error = cmd_results_new(CMD_INVALID, "workspace_buttons", "Invalid value %s", argv[0]); 24 return cmd_results_new(CMD_INVALID, "workspace_buttons",
24 return error; 25 "Invalid value %s", argv[0]);
25 } 26 }
26 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 27 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
27} 28}
diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c
index 4ed1f12a..7386f82c 100644
--- a/sway/commands/bar/wrap_scroll.c
+++ b/sway/commands/bar/wrap_scroll.c
@@ -8,20 +8,20 @@ struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) {
8 if ((error = checkarg(argc, "wrap_scroll", EXPECTED_EQUAL_TO, 1))) { 8 if ((error = checkarg(argc, "wrap_scroll", EXPECTED_EQUAL_TO, 1))) {
9 return error; 9 return error;
10 } 10 }
11
12 if (!config->current_bar) { 11 if (!config->current_bar) {
13 return cmd_results_new(CMD_FAILURE, "wrap_scroll", "No bar defined."); 12 return cmd_results_new(CMD_FAILURE, "wrap_scroll", "No bar defined.");
14 } 13 }
15
16 if (strcasecmp("yes", argv[0]) == 0) { 14 if (strcasecmp("yes", argv[0]) == 0) {
17 config->current_bar->wrap_scroll = true; 15 config->current_bar->wrap_scroll = true;
18 sway_log(L_DEBUG, "Enabling wrap scroll on bar: %s", config->current_bar->id); 16 wlr_log(L_DEBUG, "Enabling wrap scroll on bar: %s",
17 config->current_bar->id);
19 } else if (strcasecmp("no", argv[0]) == 0) { 18 } else if (strcasecmp("no", argv[0]) == 0) {
20 config->current_bar->wrap_scroll = false; 19 config->current_bar->wrap_scroll = false;
21 sway_log(L_DEBUG, "Disabling wrap scroll on bar: %s", config->current_bar->id); 20 wlr_log(L_DEBUG, "Disabling wrap scroll on bar: %s",
21 config->current_bar->id);
22 } else { 22 } else {
23 error = cmd_results_new(CMD_INVALID, "wrap_scroll", "Invalid value %s", argv[0]); 23 return cmd_results_new(CMD_INVALID,
24 return error; 24 "wrap_scroll", "Invalid value %s", argv[0]);
25 } 25 }
26 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 26 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
27} 27}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-26 17:35:56 +0000