diff options
author | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-12-15 13:12:08 +0100 |
---|---|---|
committer | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2015-12-15 13:12:55 +0100 |
commit | 8c1d56812bea35b4543898ef3df82b2d35355be1 (patch) | |
tree | e56ebb3d5a9d36793f32d575af0648fc382ad81e /sway/config.c | |
parent | Merge pull request #326 from mikkeloscar/remove-spaces (diff) | |
download | sway-8c1d56812bea35b4543898ef3df82b2d35355be1.tar.gz sway-8c1d56812bea35b4543898ef3df82b2d35355be1.tar.zst sway-8c1d56812bea35b4543898ef3df82b2d35355be1.zip |
Implement bar option: colors {}
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c index 1fff3a08..a0e95677 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -263,6 +263,14 @@ bool read_config(FILE *file, bool is_active) { | |||
263 | } | 263 | } |
264 | break; | 264 | break; |
265 | 265 | ||
266 | case CMD_BLOCK_BAR_COLORS: | ||
267 | if (block == CMD_BLOCK_BAR) { | ||
268 | block = CMD_BLOCK_BAR_COLORS; | ||
269 | } else { | ||
270 | sway_log(L_ERROR, "Invalid block '%s'", line); | ||
271 | } | ||
272 | break; | ||
273 | |||
266 | case CMD_BLOCK_END: | 274 | case CMD_BLOCK_END: |
267 | switch(block) { | 275 | switch(block) { |
268 | case CMD_BLOCK_MODE: | 276 | case CMD_BLOCK_MODE: |
@@ -277,6 +285,11 @@ bool read_config(FILE *file, bool is_active) { | |||
277 | block = CMD_BLOCK_END; | 285 | block = CMD_BLOCK_END; |
278 | break; | 286 | break; |
279 | 287 | ||
288 | case CMD_BLOCK_BAR_COLORS: | ||
289 | sway_log(L_DEBUG, "End of bar colors block"); | ||
290 | block = CMD_BLOCK_BAR; | ||
291 | break; | ||
292 | |||
280 | case CMD_BLOCK_END: | 293 | case CMD_BLOCK_END: |
281 | sway_log(L_ERROR, "Unmatched }"); | 294 | sway_log(L_ERROR, "Unmatched }"); |
282 | break; | 295 | break; |
@@ -554,6 +567,26 @@ struct bar_config *default_bar_config(void) { | |||
554 | bar->strip_workspace_numbers = false; | 567 | bar->strip_workspace_numbers = false; |
555 | bar->binding_mode_indicator = true; | 568 | bar->binding_mode_indicator = true; |
556 | bar->tray_padding = 2; | 569 | bar->tray_padding = 2; |
570 | // set default colors | ||
571 | strcpy(bar->colors.background, "#000000"); | ||
572 | strcpy(bar->colors.statusline, "#ffffff"); | ||
573 | strcpy(bar->colors.separator, "#666666"); | ||
574 | strcpy(bar->colors.focused_workspace_border, "#4c7899"); | ||
575 | strcpy(bar->colors.focused_workspace_bg, "#285577"); | ||
576 | strcpy(bar->colors.focused_workspace_text, "#ffffff"); | ||
577 | strcpy(bar->colors.active_workspace_border, "333333"); | ||
578 | strcpy(bar->colors.active_workspace_bg, "#5f676a"); | ||
579 | strcpy(bar->colors.active_workspace_text, "#ffffff"); | ||
580 | strcpy(bar->colors.inactive_workspace_border, "#333333"); | ||
581 | strcpy(bar->colors.inactive_workspace_bg,"#222222"); | ||
582 | strcpy(bar->colors.inactive_workspace_text, "#888888"); | ||
583 | strcpy(bar->colors.urgent_workspace_border, "#2f343a"); | ||
584 | strcpy(bar->colors.urgent_workspace_bg,"#900000"); | ||
585 | strcpy(bar->colors.urgent_workspace_text, "#ffffff"); | ||
586 | strcpy(bar->colors.binding_mode_border, "#2f343a"); | ||
587 | strcpy(bar->colors.binding_mode_bg,"#900000"); | ||
588 | strcpy(bar->colors.binding_mode_text, "#ffffff"); | ||
589 | |||
557 | list_add(config->bars, bar); | 590 | list_add(config->bars, bar); |
558 | 591 | ||
559 | return bar; | 592 | return bar; |