mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-21 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd_client_*: refactor duplicated code

Browse source 
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.
This commit is contained in:
Brian Ashworth 2019-12-27 23:56:11 -05:00 • committed by Simon Ser
parent 97f9f0b699
commit 66dc33296c
4 changed files with 57 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

60
sway/config.c
View file

@ -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);
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);
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);
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);
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);
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);
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);
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);
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);
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);
set_color(config->border_colors.background, 0xFFFFFF);
color_to_rgba(config->border_colors.background, 0xFFFFFFFF);
// Security
if (!(config->command_policies = create_list())) goto cleanup;