diff options
author | D.B <thejan.2009@gmail.com> | 2016-11-03 06:43:12 +0100 |
---|---|---|
committer | D.B <thejan.2009@gmail.com> | 2016-11-03 06:43:12 +0100 |
commit | 3d1b472b8312ec212b82b9a5c34af40272e9d995 (patch) | |
tree | ee822e5e219275c84446709c349de630d7441055 /sway/config.c | |
parent | change bar colors from char[10] to *char (diff) | |
download | sway-3d1b472b8312ec212b82b9a5c34af40272e9d995.tar.gz sway-3d1b472b8312ec212b82b9a5c34af40272e9d995.tar.zst sway-3d1b472b8312ec212b82b9a5c34af40272e9d995.zip |
swap unnecessary function for strndup
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/sway/config.c b/sway/config.c index d790afa2..7d5999d8 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -1131,12 +1131,6 @@ struct sway_binding *sway_binding_dup(struct sway_binding *sb) { | |||
1131 | return new_sb; | 1131 | return new_sb; |
1132 | } | 1132 | } |
1133 | 1133 | ||
1134 | static void set_bar_color(char **name, char *value) { | ||
1135 | // every color has 9 characters plus \0 | ||
1136 | *name = malloc(10); | ||
1137 | strcpy(*name, value); | ||
1138 | } | ||
1139 | |||
1140 | struct bar_config *default_bar_config(void) { | 1134 | struct bar_config *default_bar_config(void) { |
1141 | struct bar_config *bar = NULL; | 1135 | struct bar_config *bar = NULL; |
1142 | bar = malloc(sizeof(struct bar_config)); | 1136 | bar = malloc(sizeof(struct bar_config)); |
@@ -1160,22 +1154,23 @@ struct bar_config *default_bar_config(void) { | |||
1160 | bar->verbose = false; | 1154 | bar->verbose = false; |
1161 | bar->pid = 0; | 1155 | bar->pid = 0; |
1162 | // set default colors | 1156 | // set default colors |
1163 | set_bar_color(&(bar->colors.background), "#000000ff"); | 1157 | bar->colors.background = strndup("#000000ff", 9); |
1164 | set_bar_color(&(bar->colors.statusline), "#ffffffff"); | 1158 | bar->colors.statusline = strndup("#ffffffff", 9); |
1165 | set_bar_color(&(bar->colors.separator), "#666666ff"); | 1159 | bar->colors.separator = strndup("#666666ff", 9); |
1166 | set_bar_color(&(bar->colors.focused_workspace_border), "#4c7899ff"); | 1160 | bar->colors.focused_workspace_border = strndup("#4c7899ff", 9); |
1167 | set_bar_color(&(bar->colors.focused_workspace_bg), "#285577ff"); | 1161 | bar->colors.focused_workspace_bg = strndup("#285577ff", 9); |
1168 | set_bar_color(&(bar->colors.focused_workspace_text), "#ffffffff"); | 1162 | bar->colors.focused_workspace_text = strndup("#ffffffff", 9); |
1169 | set_bar_color(&(bar->colors.active_workspace_border), "#333333ff"); | 1163 | bar->colors.active_workspace_border = strndup("#333333ff", 9); |
1170 | set_bar_color(&(bar->colors.active_workspace_bg), "#5f676aff"); | 1164 | bar->colors.active_workspace_bg = strndup("#5f676aff", 9); |
1171 | set_bar_color(&(bar->colors.active_workspace_text), "#ffffffff"); | 1165 | bar->colors.active_workspace_text = strndup("#ffffffff", 9); |
1172 | set_bar_color(&(bar->colors.inactive_workspace_border), "#333333ff"); | 1166 | bar->colors.inactive_workspace_border = strndup("#333333ff", 9); |
1173 | set_bar_color(&(bar->colors.inactive_workspace_bg),"#222222ff"); | 1167 | bar->colors.inactive_workspace_bg = strndup("#222222ff", 9); |
1174 | set_bar_color(&(bar->colors.inactive_workspace_text), "#888888ff"); | 1168 | bar->colors.inactive_workspace_text = strndup("#888888ff", 9); |
1175 | set_bar_color(&(bar->colors.urgent_workspace_border), "#2f343aff"); | 1169 | bar->colors.urgent_workspace_border = strndup("#2f343aff", 9); |
1176 | set_bar_color(&(bar->colors.urgent_workspace_bg),"#900000ff"); | 1170 | bar->colors.urgent_workspace_bg = strndup("#900000ff", 9); |
1177 | set_bar_color(&(bar->colors.urgent_workspace_text), "#ffffffff"); | 1171 | bar->colors.urgent_workspace_text = strndup("#ffffffff", 9); |
1178 | 1172 | // if the following colors stay undefined, they fall back to background, | |
1173 | // statusline, separator and urgent_workspace_*. | ||
1179 | bar->colors.focused_background = NULL; | 1174 | bar->colors.focused_background = NULL; |
1180 | bar->colors.focused_statusline = NULL; | 1175 | bar->colors.focused_statusline = NULL; |
1181 | bar->colors.focused_separator = NULL; | 1176 | bar->colors.focused_separator = NULL; |