diff options
-rw-r--r-- | include/config.h | 36 | ||||
-rw-r--r-- | sway/commands.c | 14 | ||||
-rw-r--r-- | sway/config.c | 36 |
3 files changed, 46 insertions, 40 deletions
diff --git a/include/config.h b/include/config.h index 2423c9ed..80340720 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -99,24 +99,24 @@ struct bar_config { | |||
99 | bool binding_mode_indicator; | 99 | bool binding_mode_indicator; |
100 | bool verbose; | 100 | bool verbose; |
101 | struct { | 101 | struct { |
102 | char background[8]; | 102 | char background[10]; |
103 | char statusline[8]; | 103 | char statusline[10]; |
104 | char separator[8]; | 104 | char separator[10]; |
105 | char focused_workspace_border[8]; | 105 | char focused_workspace_border[10]; |
106 | char focused_workspace_bg[8]; | 106 | char focused_workspace_bg[10]; |
107 | char focused_workspace_text[8]; | 107 | char focused_workspace_text[10]; |
108 | char active_workspace_border[8]; | 108 | char active_workspace_border[10]; |
109 | char active_workspace_bg[8]; | 109 | char active_workspace_bg[10]; |
110 | char active_workspace_text[8]; | 110 | char active_workspace_text[10]; |
111 | char inactive_workspace_border[8]; | 111 | char inactive_workspace_border[10]; |
112 | char inactive_workspace_bg[8]; | 112 | char inactive_workspace_bg[10]; |
113 | char inactive_workspace_text[8]; | 113 | char inactive_workspace_text[10]; |
114 | char urgent_workspace_border[8]; | 114 | char urgent_workspace_border[10]; |
115 | char urgent_workspace_bg[8]; | 115 | char urgent_workspace_bg[10]; |
116 | char urgent_workspace_text[8]; | 116 | char urgent_workspace_text[10]; |
117 | char binding_mode_border[8]; | 117 | char binding_mode_border[10]; |
118 | char binding_mode_bg[8]; | 118 | char binding_mode_bg[10]; |
119 | char binding_mode_text[8]; | 119 | char binding_mode_text[10]; |
120 | } colors; | 120 | } colors; |
121 | }; | 121 | }; |
122 | 122 | ||
diff --git a/sway/commands.c b/sway/commands.c index d2b53783..733fb293 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -1851,7 +1851,8 @@ static struct cmd_handler bar_handlers[] = { | |||
1851 | * return error object, or NULL if color is valid. | 1851 | * return error object, or NULL if color is valid. |
1852 | */ | 1852 | */ |
1853 | static struct cmd_results *add_color(const char *name, char *buffer, const char *color) { | 1853 | static struct cmd_results *add_color(const char *name, char *buffer, const char *color) { |
1854 | if (strlen(color) != 7) { | 1854 | int len = strlen(color); |
1855 | if (len != 7 && len != 9 ) { | ||
1855 | return cmd_results_new(CMD_INVALID, name, "Invalid color definition %s", color); | 1856 | return cmd_results_new(CMD_INVALID, name, "Invalid color definition %s", color); |
1856 | } | 1857 | } |
1857 | 1858 | ||
@@ -1860,15 +1861,20 @@ static struct cmd_results *add_color(const char *name, char *buffer, const char | |||
1860 | } | 1861 | } |
1861 | 1862 | ||
1862 | int i; | 1863 | int i; |
1863 | for (i = 1; i < 7; ++i) { | 1864 | for (i = 1; i < len; ++i) { |
1864 | if (!isxdigit(color[i])) { | 1865 | if (!isxdigit(color[i])) { |
1865 | return cmd_results_new(CMD_INVALID, name, "Invalid color definition %s", color); | 1866 | return cmd_results_new(CMD_INVALID, name, "Invalid color definition %s", color); |
1866 | } | 1867 | } |
1867 | } | 1868 | } |
1868 | 1869 | ||
1869 | // copy color to buffer | 1870 | // copy color to buffer |
1870 | strncpy(buffer, color, 7); | 1871 | strncpy(buffer, color, len); |
1871 | sway_log(L_DEBUG, "Setting %s color %s for bar: %s", name, color, config->current_bar->id); | 1872 | // add default alpha channel if color was defined without it |
1873 | if (len == 7) { | ||
1874 | buffer[7] = 'f'; | ||
1875 | buffer[8] = 'f'; | ||
1876 | } | ||
1877 | sway_log(L_DEBUG, "Setting %s color %s for bar: %s", name, buffer, config->current_bar->id); | ||
1872 | 1878 | ||
1873 | return NULL; | 1879 | return NULL; |
1874 | } | 1880 | } |
diff --git a/sway/config.c b/sway/config.c index a0e95677..e0c9151d 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -568,24 +568,24 @@ struct bar_config *default_bar_config(void) { | |||
568 | bar->binding_mode_indicator = true; | 568 | bar->binding_mode_indicator = true; |
569 | bar->tray_padding = 2; | 569 | bar->tray_padding = 2; |
570 | // set default colors | 570 | // set default colors |
571 | strcpy(bar->colors.background, "#000000"); | 571 | strcpy(bar->colors.background, "#000000ff"); |
572 | strcpy(bar->colors.statusline, "#ffffff"); | 572 | strcpy(bar->colors.statusline, "#ffffffff"); |
573 | strcpy(bar->colors.separator, "#666666"); | 573 | strcpy(bar->colors.separator, "#666666ff"); |
574 | strcpy(bar->colors.focused_workspace_border, "#4c7899"); | 574 | strcpy(bar->colors.focused_workspace_border, "#4c7899ff"); |
575 | strcpy(bar->colors.focused_workspace_bg, "#285577"); | 575 | strcpy(bar->colors.focused_workspace_bg, "#285577ff"); |
576 | strcpy(bar->colors.focused_workspace_text, "#ffffff"); | 576 | strcpy(bar->colors.focused_workspace_text, "#ffffffff"); |
577 | strcpy(bar->colors.active_workspace_border, "333333"); | 577 | strcpy(bar->colors.active_workspace_border, "333333ff"); |
578 | strcpy(bar->colors.active_workspace_bg, "#5f676a"); | 578 | strcpy(bar->colors.active_workspace_bg, "#5f676aff"); |
579 | strcpy(bar->colors.active_workspace_text, "#ffffff"); | 579 | strcpy(bar->colors.active_workspace_text, "#ffffffff"); |
580 | strcpy(bar->colors.inactive_workspace_border, "#333333"); | 580 | strcpy(bar->colors.inactive_workspace_border, "#333333ff"); |
581 | strcpy(bar->colors.inactive_workspace_bg,"#222222"); | 581 | strcpy(bar->colors.inactive_workspace_bg,"#222222ff"); |
582 | strcpy(bar->colors.inactive_workspace_text, "#888888"); | 582 | strcpy(bar->colors.inactive_workspace_text, "#888888ff"); |
583 | strcpy(bar->colors.urgent_workspace_border, "#2f343a"); | 583 | strcpy(bar->colors.urgent_workspace_border, "#2f343aff"); |
584 | strcpy(bar->colors.urgent_workspace_bg,"#900000"); | 584 | strcpy(bar->colors.urgent_workspace_bg,"#900000ff"); |
585 | strcpy(bar->colors.urgent_workspace_text, "#ffffff"); | 585 | strcpy(bar->colors.urgent_workspace_text, "#ffffffff"); |
586 | strcpy(bar->colors.binding_mode_border, "#2f343a"); | 586 | strcpy(bar->colors.binding_mode_border, "#2f343aff"); |
587 | strcpy(bar->colors.binding_mode_bg,"#900000"); | 587 | strcpy(bar->colors.binding_mode_bg,"#900000ff"); |
588 | strcpy(bar->colors.binding_mode_text, "#ffffff"); | 588 | strcpy(bar->colors.binding_mode_text, "#ffffffff"); |
589 | 589 | ||
590 | list_add(config->bars, bar); | 590 | list_add(config->bars, bar); |
591 | 591 | ||