mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-02 03:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1201 from SirCmpwn/fix-colors

Browse source 
Support specifying fewer than 5 colors
This commit is contained in:
Drew DeVault 2017-04-29 10:04:13 -04:00
parent aa341ebe7b
commit 86f81e0364
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/commands.c
View file

@ -249,7 +249,7 @@ static struct cmd_handler bar_handlers[] = {
*/ */
struct cmd_results *add_color(const char *name, char *buffer, const char *color) { struct cmd_results *add_color(const char *name, char *buffer, const char *color) {
int len = strlen(color); int len = strlen(color);
if (len != 7 && len != 9 ) { if (len != 7 && len != 9) {
return cmd_results_new(CMD_INVALID, name, "Invalid color definition %s", color); return cmd_results_new(CMD_INVALID, name, "Invalid color definition %s", color);
} }

22
sway/commands/client.c
View file

@ -4,27 +4,27 @@
static struct cmd_results *parse_border_color(struct border_colors *border_colors, const char *cmd_name, int argc, char **argv) { static struct cmd_results *parse_border_color(struct border_colors *border_colors, const char *cmd_name, int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if (argc != 5) { if (argc < 3 || argc > 5) {
return cmd_results_new(CMD_INVALID, cmd_name, "Requires exactly five color values"); return cmd_results_new(CMD_INVALID, cmd_name, "Requires between three and five color values");
} }
uint32_t colors[5]; uint32_t *colors[5] = {
&border_colors->border,
&border_colors->background,
&border_colors->text,
&border_colors->indicator,
&border_colors->child_border
};
int i; int i;
for (i = 0; i < 5; i++) { for (i = 0; i < argc; i++) {
char buffer[10]; char buffer[10];
error = add_color(cmd_name, buffer, argv[i]); error = add_color(cmd_name, buffer, argv[i]);
if (error) { if (error) {
return error; return error;
} }
colors[i] = strtoul(buffer+1, NULL, 16); *colors[i] = strtoul(buffer + 1, NULL, 16);
} }
border_colors->border = colors[0];
border_colors->background = colors[1];
border_colors->text = colors[2];
border_colors->indicator = colors[3];
border_colors->child_border = colors[4];
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }