dzwdz
/
catboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move styleParse out of ui

master
C. McEnroe 2020-09-01 18:05:17 -04:00
parent 8190d76086
commit a98fd70aac
2 changed files with 61 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
chat.h
View File

@ -26,6 +26,7 @@
*/ */
#include <assert.h> #include <assert.h>
#include <ctype.h>
#include <err.h> #include <err.h>
#include <getopt.h> #include <getopt.h>
#include <stdarg.h> #include <stdarg.h>
@ -59,12 +60,50 @@ catf(struct Cat *cat, const char *format, ...) {
if (cat->len >= cat->cap) cat->len = cat->cap - 1; if (cat->len >= cat->cap) cat->len = cat->cap - 1;
} }
enum Attr {
BIT(Bold),
BIT(Reverse),
BIT(Italic),
BIT(Underline),
};
enum Color { enum Color {
White, Black, Blue, Green, Red, Brown, Magenta, Orange, White, Black, Blue, Green, Red, Brown, Magenta, Orange,
Yellow, LightGreen, Cyan, LightCyan, LightBlue, Pink, Gray, LightGray, Yellow, LightGreen, Cyan, LightCyan, LightBlue, Pink, Gray, LightGray,
Default = 99, Default = 99,
ColorCap, ColorCap,
}; };
struct Style {
enum Attr attr;
enum Color fg, bg;
};
static const struct Style StyleDefault = { 0, Default, Default };
enum { B = '\2', C = '\3', O = '\17', R = '\26', I = '\35', U = '\37' };
static inline size_t styleParse(struct Style *style, const char **str) {
switch (**str) {
break; case B: (*str)++; style->attr ^= Bold;
break; case O: (*str)++; *style = StyleDefault;
break; case R: (*str)++; style->attr ^= Reverse;
break; case I: (*str)++; style->attr ^= Italic;
break; case U: (*str)++; style->attr ^= Underline;
break; case C: {
(*str)++;
if (!isdigit(**str)) {
style->fg = Default;
style->bg = Default;
break;
}
style->fg = *(*str)++ - '0';
if (isdigit(**str)) style->fg = style->fg * 10 + *(*str)++ - '0';
if ((*str)[0] != ',' || !isdigit((*str)[1])) break;
(*str)++;
style->bg = *(*str)++ - '0';
if (isdigit(**str)) style->bg = style->bg * 10 + *(*str)++ - '0';
}
}
return strcspn(*str, (const char[]) { B, C, O, R, I, U, '\0' });
}
enum { None, Debug, Network, IDCap = 256 }; enum { None, Debug, Network, IDCap = 256 };
extern char *idNames[IDCap]; extern char *idNames[IDCap];

88
ui.c
View File

@ -372,12 +372,6 @@ void uiDraw(void) {
fflush(stdout); fflush(stdout);
} }
struct Style {
attr_t attr;
enum Color fg, bg;
};
static const struct Style Reset = { A_NORMAL, Default, Default };
static const short Colors[ColorCap] = { static const short Colors[ColorCap] = {
[Default] = -1, [Default] = -1,
[White] = 8 + COLOR_WHITE, [White] = 8 + COLOR_WHITE,
@ -405,43 +399,24 @@ static const short Colors[ColorCap] = {
16, 233, 235, 237, 239, 241, 244, 247, 250, 254, 231, 16, 233, 235, 237, 239, 241, 244, 247, 250, 254, 231,
}; };
enum { B = '\2', C = '\3', O = '\17', R = '\26', I = '\35', U = '\37' }; static attr_t styleAttr(struct Style style) {
attr_t attr = A_NORMAL;
if (style.attr & Bold) attr |= A_BOLD;
if (style.attr & Reverse) attr |= A_REVERSE;
if (style.attr & Italic) attr |= A_ITALIC;
if (style.attr & Underline) attr |= A_UNDERLINE;
return attr | colorAttr(Colors[style.fg]);
}
static size_t styleParse(struct Style *style, const char **str) { static short stylePair(struct Style style) {
switch (**str) { return colorPair(Colors[style.fg], Colors[style.bg]);
break; case B: (*str)++; style->attr ^= A_BOLD;
break; case O: (*str)++; *style = Reset;
break; case R: (*str)++; style->attr ^= A_REVERSE;
break; case I: (*str)++; style->attr ^= A_ITALIC;
break; case U: (*str)++; style->attr ^= A_UNDERLINE;
break; case C: {
(*str)++;
if (!isdigit(**str)) {
style->fg = Default;
style->bg = Default;
break;
}
style->fg = *(*str)++ - '0';
if (isdigit(**str)) style->fg = style->fg * 10 + *(*str)++ - '0';
if ((*str)[0] != ',' || !isdigit((*str)[1])) break;
(*str)++;
style->bg = *(*str)++ - '0';
if (isdigit(**str)) style->bg = style->bg * 10 + *(*str)++ - '0';
}
}
return strcspn(*str, (const char[]) { B, C, O, R, I, U, '\0' });
} }
static void statusAdd(const char *str) { static void statusAdd(const char *str) {
struct Style style = Reset; struct Style style = StyleDefault;
while (*str) { while (*str) {
size_t len = styleParse(&style, &str); size_t len = styleParse(&style, &str);
wattr_set( wattr_set(status, styleAttr(style), stylePair(style), NULL);
status,
style.attr | colorAttr(Colors[style.fg]),
colorPair(Colors[style.fg], Colors[style.bg]),
NULL
);
waddnstr(status, str, len); waddnstr(status, str, len);
str += len; str += len;
} }
@ -587,7 +562,7 @@ static int wordWrap(WINDOW *win, const char *str) {
int lines = 1; int lines = 1;
int align = 0; int align = 0;
struct Style style = Reset; struct Style style = StyleDefault;
while (*str) { while (*str) {
char ch = *str; char ch = *str;
if (ch == ' ' || ch == '\t') { if (ch == ' ' || ch == '\t') {
@ -612,12 +587,7 @@ static int wordWrap(WINDOW *win, const char *str) {
size_t ws = strcspn(str, " \t"); size_t ws = strcspn(str, " \t");
if (ws < len) len = ws; if (ws < len) len = ws;
wattr_set( wattr_set(win, styleAttr(style), stylePair(style), NULL);
win,
style.attr | colorAttr(Colors[style.fg]),
colorPair(Colors[style.fg], Colors[style.bg]),
NULL
);
waddnstrnzw(win, str, len); waddnstrnzw(win, str, len);
str += len; str += len;
} }
@ -633,7 +603,7 @@ static void notify(uint id, const char *str) {
char buf[1024] = ""; char buf[1024] = "";
struct Cat cat = { buf, sizeof(buf), 0 }; struct Cat cat = { buf, sizeof(buf), 0 };
while (*str) { while (*str) {
struct Style style = Reset; struct Style style = StyleDefault;
size_t len = styleParse(&style, &str); size_t len = styleParse(&style, &str);
catf(&cat, "%.*s", (int)len, str); catf(&cat, "%.*s", (int)len, str);
str += len; str += len;
@ -749,7 +719,7 @@ static void bufferList(const struct Buffer *buffer) {
printf("[%s] ", buf); printf("[%s] ", buf);
bool align = false; bool align = false;
struct Style style = Reset; struct Style style = StyleDefault;
while (*line.str) { while (*line.str) {
if (*line.str == '\t') { if (*line.str == '\t') {
printf("%c", (align ? '\t' : ' ')); printf("%c", (align ? '\t' : ' '));
@ -761,11 +731,7 @@ static void bufferList(const struct Buffer *buffer) {
size_t tab = strcspn(line.str, "\t"); size_t tab = strcspn(line.str, "\t");
if (tab < len) len = tab; if (tab < len) len = tab;
vid_attr( vid_attr(styleAttr(style), stylePair(style), NULL);
style.attr | colorAttr(Colors[style.fg]),
colorPair(Colors[style.fg], Colors[style.bg]),
NULL
);
printf("%.*s", (int)len, line.str); printf("%.*s", (int)len, line.str);
line.str += len; line.str += len;
} }
@ -794,12 +760,7 @@ static void inputAdd(struct Style *style, const char *str) {
} }
size_t nl = strcspn(str, "\n"); size_t nl = strcspn(str, "\n");
if (nl < len) len = nl; if (nl < len) len = nl;
wattr_set( wattr_set(input, styleAttr(*style), stylePair(*style), NULL);
input,
style->attr | colorAttr(Colors[style->fg]),
colorPair(Colors[style->fg], Colors[style->bg]),
NULL
);
waddnstr(input, str, len); waddnstr(input, str, len);
str += len; str += len;
} }
@ -815,7 +776,7 @@ static void inputUpdate(void) {
const char *suffix = ""; const char *suffix = "";
const char *skip = buf; const char *skip = buf;
struct Style stylePrompt = { .fg = self.color, .bg = Default }; struct Style stylePrompt = { .fg = self.color, .bg = Default };
struct Style styleInput = Reset; struct Style styleInput = StyleDefault;
const char *privmsg = commandIsPrivmsg(id, buf); const char *privmsg = commandIsPrivmsg(id, buf);
const char *notice = commandIsNotice(id, buf); const char *notice = commandIsNotice(id, buf);
@ -829,8 +790,8 @@ static void inputUpdate(void) {
skip = notice; skip = notice;
} else if (action) { } else if (action) {
prefix = "* "; suffix = " "; prefix = "* "; suffix = " ";
stylePrompt.attr |= A_ITALIC; stylePrompt.attr |= Italic;
styleInput.attr |= A_ITALIC; styleInput.attr |= Italic;
skip = action; skip = action;
} else if (id == Debug && buf[0] != '/') { } else if (id == Debug && buf[0] != '/') {
prompt = "<< "; prompt = "<< ";
@ -845,12 +806,7 @@ static void inputUpdate(void) {
int y, x; int y, x;
wmove(input, 0, 0); wmove(input, 0, 0);
wattr_set( wattr_set(input, styleAttr(stylePrompt), stylePair(stylePrompt), NULL);
input,
stylePrompt.attr | colorAttr(Colors[stylePrompt.fg]),
colorPair(Colors[stylePrompt.fg], Colors[stylePrompt.bg]),
NULL
);
waddstr(input, prefix); waddstr(input, prefix);
waddstr(input, prompt); waddstr(input, prompt);
waddstr(input, suffix); waddstr(input, suffix);