diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-12-27 23:56:11 -0500 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2019-12-28 10:07:25 +0100 |
commit | 66dc33296ca97b10f60daaff8c5e4b3f95fac8cd (patch) | |
tree | 95cb83ff86cf43d096df4f10a3cfb402d34315f7 /sway/config.c | |
parent | parse_color: return success + drop fallback color (diff) | |
download | sway-66dc33296ca97b10f60daaff8c5e4b3f95fac8cd.tar.gz sway-66dc33296ca97b10f60daaff8c5e4b3f95fac8cd.tar.zst sway-66dc33296ca97b10f60daaff8c5e4b3f95fac8cd.zip |
cmd_client_*: refactor duplicated code
This is the second in a series of commits to refactor the color handling
in sway. This removes the duplicated color parsing code in
sway/commands/client.c. Additionally, this combines the parsing of
colors to float arrays with that in sway/config.c and introduces a
color_to_rgba function in commom/util.c.
As an added bonus, this also makes it so non of the colors in a border
color class will be changed unless all of the colors specified are
valid. This ensures that an invalid command does not get partially
applied.
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 70 |
1 files changed, 32 insertions, 38 deletions
diff --git a/sway/config.c b/sway/config.c index 34704277..6d730f46 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "stringop.h" | 31 | #include "stringop.h" |
32 | #include "list.h" | 32 | #include "list.h" |
33 | #include "log.h" | 33 | #include "log.h" |
34 | #include "util.h" | ||
34 | 35 | ||
35 | struct sway_config *config = NULL; | 36 | struct sway_config *config = NULL; |
36 | 37 | ||
@@ -192,13 +193,6 @@ static void destroy_removed_seats(struct sway_config *old_config, | |||
192 | } | 193 | } |
193 | } | 194 | } |
194 | 195 | ||
195 | static void set_color(float dest[static 4], uint32_t color) { | ||
196 | dest[0] = ((color >> 16) & 0xff) / 255.0; | ||
197 | dest[1] = ((color >> 8) & 0xff) / 255.0; | ||
198 | dest[2] = (color & 0xff) / 255.0; | ||
199 | dest[3] = 1.0; | ||
200 | } | ||
201 | |||
202 | static void config_defaults(struct sway_config *config) { | 196 | static void config_defaults(struct sway_config *config) { |
203 | if (!(config->swaynag_command = strdup("swaynag"))) goto cleanup; | 197 | if (!(config->swaynag_command = strdup("swaynag"))) goto cleanup; |
204 | config->swaynag_config_errors = (struct swaynag_instance){0}; | 198 | config->swaynag_config_errors = (struct swaynag_instance){0}; |
@@ -300,37 +294,37 @@ static void config_defaults(struct sway_config *config) { | |||
300 | config->hide_lone_tab = false; | 294 | config->hide_lone_tab = false; |
301 | 295 | ||
302 | // border colors | 296 | // border colors |
303 | set_color(config->border_colors.focused.border, 0x4C7899); | 297 | color_to_rgba(config->border_colors.focused.border, 0x4C7899FF); |
304 | set_color(config->border_colors.focused.background, 0x285577); | 298 | color_to_rgba(config->border_colors.focused.background, 0x285577FF); |
305 | set_color(config->border_colors.focused.text, 0xFFFFFFFF); | 299 | color_to_rgba(config->border_colors.focused.text, 0xFFFFFFFF); |
306 | set_color(config->border_colors.focused.indicator, 0x2E9EF4); | 300 | color_to_rgba(config->border_colors.focused.indicator, 0x2E9EF4FF); |
307 | set_color(config->border_colors.focused.child_border, 0x285577); | 301 | color_to_rgba(config->border_colors.focused.child_border, 0x285577FF); |
308 | 302 | ||
309 | set_color(config->border_colors.focused_inactive.border, 0x333333); | 303 | color_to_rgba(config->border_colors.focused_inactive.border, 0x333333FF); |
310 | set_color(config->border_colors.focused_inactive.background, 0x5F676A); | 304 | color_to_rgba(config->border_colors.focused_inactive.background, 0x5F676AFF); |
311 | set_color(config->border_colors.focused_inactive.text, 0xFFFFFFFF); | 305 | color_to_rgba(config->border_colors.focused_inactive.text, 0xFFFFFFFF); |
312 | set_color(config->border_colors.focused_inactive.indicator, 0x484E50); | 306 | color_to_rgba(config->border_colors.focused_inactive.indicator, 0x484E50FF); |
313 | set_color(config->border_colors.focused_inactive.child_border, 0x5F676A); | 307 | color_to_rgba(config->border_colors.focused_inactive.child_border, 0x5F676AFF); |
314 | 308 | ||
315 | set_color(config->border_colors.unfocused.border, 0x333333); | 309 | color_to_rgba(config->border_colors.unfocused.border, 0x333333FF); |
316 | set_color(config->border_colors.unfocused.background, 0x222222); | 310 | color_to_rgba(config->border_colors.unfocused.background, 0x222222FF); |
317 | set_color(config->border_colors.unfocused.text, 0x88888888); | 311 | color_to_rgba(config->border_colors.unfocused.text, 0x88888888); |
318 | set_color(config->border_colors.unfocused.indicator, 0x292D2E); | 312 | color_to_rgba(config->border_colors.unfocused.indicator, 0x292D2EFF); |
319 | set_color(config->border_colors.unfocused.child_border, 0x222222); | 313 | color_to_rgba(config->border_colors.unfocused.child_border, 0x222222FF); |
320 | 314 | ||
321 | set_color(config->border_colors.urgent.border, 0x2F343A); | 315 | color_to_rgba(config->border_colors.urgent.border, 0x2F343AFF); |
322 | set_color(config->border_colors.urgent.background, 0x900000); | 316 | color_to_rgba(config->border_colors.urgent.background, 0x900000FF); |
323 | set_color(config->border_colors.urgent.text, 0xFFFFFFFF); | 317 | color_to_rgba(config->border_colors.urgent.text, 0xFFFFFFFF); |
324 | set_color(config->border_colors.urgent.indicator, 0x900000); | 318 | color_to_rgba(config->border_colors.urgent.indicator, 0x900000FF); |
325 | set_color(config->border_colors.urgent.child_border, 0x900000); | 319 | color_to_rgba(config->border_colors.urgent.child_border, 0x900000FF); |
326 | 320 | ||
327 | set_color(config->border_colors.placeholder.border, 0x000000); | 321 | color_to_rgba(config->border_colors.placeholder.border, 0x000000FF); |
328 | set_color(config->border_colors.placeholder.background, 0x0C0C0C); | 322 | color_to_rgba(config->border_colors.placeholder.background, 0x0C0C0CFF); |
329 | set_color(config->border_colors.placeholder.text, 0xFFFFFFFF); | 323 | color_to_rgba(config->border_colors.placeholder.text, 0xFFFFFFFF); |
330 | set_color(config->border_colors.placeholder.indicator, 0x000000); | 324 | color_to_rgba(config->border_colors.placeholder.indicator, 0x000000FF); |
331 | set_color(config->border_colors.placeholder.child_border, 0x0C0C0C); | 325 | color_to_rgba(config->border_colors.placeholder.child_border, 0x0C0C0CFF); |
332 | 326 | ||
333 | set_color(config->border_colors.background, 0xFFFFFF); | 327 | color_to_rgba(config->border_colors.background, 0xFFFFFFFF); |
334 | 328 | ||
335 | // Security | 329 | // Security |
336 | if (!(config->command_policies = create_list())) goto cleanup; | 330 | if (!(config->command_policies = create_list())) goto cleanup; |