src/usr.bin/tmux/style.c - diff

Return to style.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/style.c between version 1.15 and 1.16

version 1.15, 2019/03/14 09:53:52

version 1.16, 2019/03/14 10:19:52

Line 39

int

style_parse(struct style *sy, const struct grid_cell *base, const char *in)

{

struct grid_cell *gc = &sy->gc;

struct style saved;

struct grid_cell saved;

const char delimiters[] = " ,";

char tmp[32];

int value, fg, bg, attr, flags;

size_t end;

if (*in == '\0')

return (0);

if (strchr(delimiters, in[strlen(in) - 1]) != NULL)

return (-1);

memcpy(&saved, base, sizeof saved);

style_copy(&saved, sy);

fg = gc->fg;

fg = sy->gc.fg;

bg = gc->bg;

bg = sy->gc.bg;

attr = gc->attr;

attr = sy->gc.attr;

flags = gc->flags;

flags = sy->gc.flags;

do {

end = strcspn(in, delimiters);

Line 99

Line 98

in += end + strspn(in + end, delimiters);

} while (*in != '\0');

gc->fg = fg;

sy->gc.fg = fg;

gc->bg = bg;

sy->gc.bg = bg;

gc->attr = attr;

sy->gc.attr = attr;

gc->flags = flags;

sy->gc.flags = flags;

return (0);

error:

memcpy(gc, &saved, sizeof *gc);

style_copy(sy, &saved);

return (-1);

}