diff options
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 @@ #include "stringop.h" #include "list.h" #include "log.h" +#include "util.h" struct sway_config *config = NULL; @@ -192,13 +193,6 @@ static void destroy_removed_seats(struct sway_config *old_config, } } -static void set_color(float dest[static 4], uint32_t color) { - dest[0] = ((color >> 16) & 0xff) / 255.0; - dest[1] = ((color >> 8) & 0xff) / 255.0; - dest[2] = (color & 0xff) / 255.0; - dest[3] = 1.0; -} - static void config_defaults(struct sway_config *config) { if (!(config->swaynag_command = strdup("swaynag"))) goto cleanup; config->swaynag_config_errors = (struct swaynag_instance){0}; @@ -300,37 +294,37 @@ static void config_defaults(struct sway_config *config) { config->hide_lone_tab = false; // border colors - set_color(config->border_colors.focused.border, 0x4C7899); - set_color(config->border_colors.focused.background, 0x285577); - set_color(config->border_colors.focused.text, 0xFFFFFFFF); - set_color(config->border_colors.focused.indicator, 0x2E9EF4); - set_color(config->border_colors.focused.child_border, 0x285577); - - set_color(config->border_colors.focused_inactive.border, 0x333333); - set_color(config->border_colors.focused_inactive.background, 0x5F676A); - set_color(config->border_colors.focused_inactive.text, 0xFFFFFFFF); - set_color(config->border_colors.focused_inactive.indicator, 0x484E50); - set_color(config->border_colors.focused_inactive.child_border, 0x5F676A); - - set_color(config->border_colors.unfocused.border, 0x333333); - set_color(config->border_colors.unfocused.background, 0x222222); - set_color(config->border_colors.unfocused.text, 0x88888888); - set_color(config->border_colors.unfocused.indicator, 0x292D2E); - set_color(config->border_colors.unfocused.child_border, 0x222222); - - set_color(config->border_colors.urgent.border, 0x2F343A); - set_color(config->border_colors.urgent.background, 0x900000); - set_color(config->border_colors.urgent.text, 0xFFFFFFFF); - set_color(config->border_colors.urgent.indicator, 0x900000); - set_color(config->border_colors.urgent.child_border, 0x900000); - - set_color(config->border_colors.placeholder.border, 0x000000); - set_color(config->border_colors.placeholder.background, 0x0C0C0C); - set_color(config->border_colors.placeholder.text, 0xFFFFFFFF); - set_color(config->border_colors.placeholder.indicator, 0x000000); - set_color(config->border_colors.placeholder.child_border, 0x0C0C0C); - - set_color(config->border_colors.background, 0xFFFFFF); + color_to_rgba(config->border_colors.focused.border, 0x4C7899FF); + color_to_rgba(config->border_colors.focused.background, 0x285577FF); + color_to_rgba(config->border_colors.focused.text, 0xFFFFFFFF); + color_to_rgba(config->border_colors.focused.indicator, 0x2E9EF4FF); + color_to_rgba(config->border_colors.focused.child_border, 0x285577FF); + + color_to_rgba(config->border_colors.focused_inactive.border, 0x333333FF); + color_to_rgba(config->border_colors.focused_inactive.background, 0x5F676AFF); + color_to_rgba(config->border_colors.focused_inactive.text, 0xFFFFFFFF); + color_to_rgba(config->border_colors.focused_inactive.indicator, 0x484E50FF); + color_to_rgba(config->border_colors.focused_inactive.child_border, 0x5F676AFF); + + color_to_rgba(config->border_colors.unfocused.border, 0x333333FF); + color_to_rgba(config->border_colors.unfocused.background, 0x222222FF); + color_to_rgba(config->border_colors.unfocused.text, 0x88888888); + color_to_rgba(config->border_colors.unfocused.indicator, 0x292D2EFF); + color_to_rgba(config->border_colors.unfocused.child_border, 0x222222FF); + + color_to_rgba(config->border_colors.urgent.border, 0x2F343AFF); + color_to_rgba(config->border_colors.urgent.background, 0x900000FF); + color_to_rgba(config->border_colors.urgent.text, 0xFFFFFFFF); + color_to_rgba(config->border_colors.urgent.indicator, 0x900000FF); + color_to_rgba(config->border_colors.urgent.child_border, 0x900000FF); + + color_to_rgba(config->border_colors.placeholder.border, 0x000000FF); + color_to_rgba(config->border_colors.placeholder.background, 0x0C0C0CFF); + color_to_rgba(config->border_colors.placeholder.text, 0xFFFFFFFF); + color_to_rgba(config->border_colors.placeholder.indicator, 0x000000FF); + color_to_rgba(config->border_colors.placeholder.child_border, 0x0C0C0CFF); + + color_to_rgba(config->border_colors.background, 0xFFFFFFFF); // Security if (!(config->command_policies = create_list())) goto cleanup; |