diff options
author | D.B <thejan.2009@gmail.com> | 2016-11-02 18:48:43 +0100 |
---|---|---|
committer | D.B <thejan.2009@gmail.com> | 2016-11-02 18:58:33 +0100 |
commit | ad4d21d60b36ba39e2090fa052a29bf7ea8a3395 (patch) | |
tree | 84cb01165960555dbc64cd8aa57137b43ff65655 /sway/commands/bar | |
parent | use urgent_ws color in swaybar if binding_mode is undefined (diff) | |
download | sway-ad4d21d60b36ba39e2090fa052a29bf7ea8a3395.tar.gz sway-ad4d21d60b36ba39e2090fa052a29bf7ea8a3395.tar.zst sway-ad4d21d60b36ba39e2090fa052a29bf7ea8a3395.zip |
add bar colours for focused_(workspace|statusline|separator)
If these aren't defined in config, color settings without 'focused_'
prefix are used as a fallback.
Diffstat (limited to 'sway/commands/bar')
-rw-r--r-- | sway/commands/bar/colors.c | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/sway/commands/bar/colors.c b/sway/commands/bar/colors.c index e9180604..8fb7fe27 100644 --- a/sway/commands/bar/colors.c +++ b/sway/commands/bar/colors.c | |||
@@ -49,6 +49,21 @@ struct cmd_results *bar_colors_cmd_background(int argc, char **argv) { | |||
49 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 49 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
50 | } | 50 | } |
51 | 51 | ||
52 | struct cmd_results *bar_colors_cmd_focused_background(int argc, char **argv) { | ||
53 | struct cmd_results *error = NULL; | ||
54 | if ((error = checkarg(argc, "focused_background", EXPECTED_EQUAL_TO, 1))) { | ||
55 | return error; | ||
56 | } | ||
57 | |||
58 | if ((error = add_color("focused_background", config->current_bar->colors.focused_background, argv[0]))) { | ||
59 | return error; | ||
60 | }else { | ||
61 | config->current_bar->colors.has_focused_background = true; | ||
62 | } | ||
63 | |||
64 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
65 | } | ||
66 | |||
52 | struct cmd_results *bar_colors_cmd_binding_mode(int argc, char **argv) { | 67 | struct cmd_results *bar_colors_cmd_binding_mode(int argc, char **argv) { |
53 | struct cmd_results *error = NULL; | 68 | struct cmd_results *error = NULL; |
54 | if ((error = checkarg(argc, "binding_mode", EXPECTED_EQUAL_TO, 3))) { | 69 | if ((error = checkarg(argc, "binding_mode", EXPECTED_EQUAL_TO, 3))) { |
@@ -131,6 +146,21 @@ struct cmd_results *bar_colors_cmd_separator(int argc, char **argv) { | |||
131 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 146 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
132 | } | 147 | } |
133 | 148 | ||
149 | struct cmd_results *bar_colors_cmd_focused_separator(int argc, char **argv) { | ||
150 | struct cmd_results *error = NULL; | ||
151 | if ((error = checkarg(argc, "focused_separator", EXPECTED_EQUAL_TO, 1))) { | ||
152 | return error; | ||
153 | } | ||
154 | |||
155 | if ((error = add_color("focused_separator", config->current_bar->colors.focused_separator, argv[0]))) { | ||
156 | return error; | ||
157 | } else { | ||
158 | config->current_bar->colors.has_focused_separator = true; | ||
159 | } | ||
160 | |||
161 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
162 | } | ||
163 | |||
134 | struct cmd_results *bar_colors_cmd_statusline(int argc, char **argv) { | 164 | struct cmd_results *bar_colors_cmd_statusline(int argc, char **argv) { |
135 | struct cmd_results *error = NULL; | 165 | struct cmd_results *error = NULL; |
136 | if ((error = checkarg(argc, "statusline", EXPECTED_EQUAL_TO, 1))) { | 166 | if ((error = checkarg(argc, "statusline", EXPECTED_EQUAL_TO, 1))) { |
@@ -144,6 +174,21 @@ struct cmd_results *bar_colors_cmd_statusline(int argc, char **argv) { | |||
144 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 174 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
145 | } | 175 | } |
146 | 176 | ||
177 | struct cmd_results *bar_colors_cmd_focused_statusline(int argc, char **argv) { | ||
178 | struct cmd_results *error = NULL; | ||
179 | if ((error = checkarg(argc, "focused_statusline", EXPECTED_EQUAL_TO, 1))) { | ||
180 | return error; | ||
181 | } | ||
182 | |||
183 | if ((error = add_color("focused_statusline", config->current_bar->colors.focused_statusline, argv[0]))) { | ||
184 | return error; | ||
185 | } else { | ||
186 | config->current_bar->colors.has_focused_statusline = true; | ||
187 | } | ||
188 | |||
189 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
190 | } | ||
191 | |||
147 | struct cmd_results *bar_colors_cmd_urgent_workspace(int argc, char **argv) { | 192 | struct cmd_results *bar_colors_cmd_urgent_workspace(int argc, char **argv) { |
148 | struct cmd_results *error = NULL; | 193 | struct cmd_results *error = NULL; |
149 | if ((error = checkarg(argc, "urgent_workspace", EXPECTED_EQUAL_TO, 3))) { | 194 | if ((error = checkarg(argc, "urgent_workspace", EXPECTED_EQUAL_TO, 3))) { |