Skip to content

Commit

Permalink
Support specifying fewer than 5 colors
Browse files Browse the repository at this point in the history
This doesn't work, I'm not sure why. The color structs definitely get
changed but if you specify fewer than 5, it renders with the defaults.
  • Loading branch information
ddevault committed Apr 29, 2017
1 parent 1376de4 commit 02812a2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion sway/commands.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ static struct cmd_handler bar_handlers[] = {
*/
struct cmd_results *add_color(const char *name, char *buffer, const char *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);
}

Expand Down
22 changes: 11 additions & 11 deletions sway/commands/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@

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;
if (argc != 5) {
return cmd_results_new(CMD_INVALID, cmd_name, "Requires exactly five color values");
if (argc < 3 || argc > 5) {
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;
for (i = 0; i < 5; i++) {
for (i = 0; i < argc; i++) {
char buffer[10];
error = add_color(cmd_name, buffer, argv[i]);
if (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);
}

Expand Down

0 comments on commit 02812a2

Please sign in to comment.