bx/catgirl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various small cleanup in ui.c

Browse Source
This commit is contained in:
C. McEnroe 2020-02-19 01:18:09 -05:00
parent 460207440b
commit 026a8ca979
1 changed files with 105 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

197
ui.c
View File

@ -79,14 +79,14 @@ static const char *bufferLine(const struct Buffer *buffer, size_t i) {
enum { WindowLines = BufferCap }; enum { WindowLines = BufferCap };
struct Window { struct Window {
uint id; uint id;
struct Buffer buffer;
WINDOW *pad; WINDOW *pad;
int scroll; int scroll;
bool mark; bool mark;
enum Heat heat; enum Heat heat;
uint unreadTotal; uint unread;
uint unreadWarm; uint unreadWarm;
uint unreadLines; uint unreadLines;
struct Buffer buffer;
}; };
static struct { static struct {
@ -186,36 +186,6 @@ static short colorPair(short fg, short bg) {
return colorPairs++; return colorPairs++;
} }
// XXX: Assuming terminals will be fine with these even if they're unsupported,
// since they're "private" modes.
static const char *EnterFocusMode = "\33[?1004h";
static const char *ExitFocusMode = "\33[?1004l";
static const char *EnterPasteMode = "\33[?2004h";
static const char *ExitPasteMode = "\33[?2004l";
// Gain use of C-q, C-s, C-c, C-z, C-y, C-v, C-o.
static void acquireKeys(void) {
struct termios term;
int error = tcgetattr(STDOUT_FILENO, &term);
if (error) err(EX_OSERR, "tcgetattr");
term.c_iflag &= ~IXON;
term.c_cc[VINTR] = _POSIX_VDISABLE;
term.c_cc[VSUSP] = _POSIX_VDISABLE;
#ifdef VDSUSP
term.c_cc[VDSUSP] = _POSIX_VDISABLE;
#endif
term.c_cc[VLNEXT] = _POSIX_VDISABLE;
term.c_cc[VDISCARD] = _POSIX_VDISABLE;
error = tcsetattr(STDOUT_FILENO, TCSADRAIN, &term);
if (error) err(EX_OSERR, "tcsetattr");
}
static void errExit(void) {
putp(ExitFocusMode);
putp(ExitPasteMode);
reset_shell_mode();
}
#define ENUM_KEY \ #define ENUM_KEY \
X(KeyMeta0, "\0330", "\33)") \ X(KeyMeta0, "\0330", "\33)") \
X(KeyMeta1, "\0331", "\33!") \ X(KeyMeta1, "\0331", "\33!") \
@ -248,6 +218,36 @@ enum {
#undef X #undef X
}; };
// Gain use of C-q, C-s, C-c, C-z, C-y, C-v, C-o.
static void acquireKeys(void) {
struct termios term;
int error = tcgetattr(STDOUT_FILENO, &term);
if (error) err(EX_OSERR, "tcgetattr");
term.c_iflag &= ~IXON;
term.c_cc[VINTR] = _POSIX_VDISABLE;
term.c_cc[VSUSP] = _POSIX_VDISABLE;
#ifdef VDSUSP
term.c_cc[VDSUSP] = _POSIX_VDISABLE;
#endif
term.c_cc[VLNEXT] = _POSIX_VDISABLE;
term.c_cc[VDISCARD] = _POSIX_VDISABLE;
error = tcsetattr(STDOUT_FILENO, TCSADRAIN, &term);
if (error) err(EX_OSERR, "tcsetattr");
}
// XXX: Assuming terminals will be fine with these even if they're unsupported,
// since they're "private" modes.
static const char *EnterFocusMode = "\33[?1004h";
static const char *ExitFocusMode = "\33[?1004l";
static const char *EnterPasteMode = "\33[?2004h";
static const char *ExitPasteMode = "\33[?2004l";
static void errExit(void) {
putp(ExitFocusMode);
putp(ExitPasteMode);
reset_shell_mode();
}
void uiInit(void) { void uiInit(void) {
initscr(); initscr();
cbreak(); cbreak();
@ -273,7 +273,7 @@ void uiInit(void) {
short fg = 8 + COLOR_BLACK; short fg = 8 + COLOR_BLACK;
wbkgd(marker, '~' | colorAttr(fg) | COLOR_PAIR(colorPair(fg, -1))); wbkgd(marker, '~' | colorAttr(fg) | COLOR_PAIR(colorPair(fg, -1)));
input = newpad(1, 512); input = newpad(1, 1024);
if (!input) err(EX_OSERR, "newpad"); if (!input) err(EX_OSERR, "newpad");
keypad(input, true); keypad(input, true);
nodelay(input, true); nodelay(input, true);
@ -357,7 +357,7 @@ static const short Colors[ColorCap] = {
enum { B = '\2', C = '\3', O = '\17', R = '\26', I = '\35', U = '\37' }; enum { B = '\2', C = '\3', O = '\17', R = '\26', I = '\35', U = '\37' };
static void styleParse(struct Style *style, const char **str, size_t *len) { static size_t styleParse(struct Style *style, const char **str) {
switch (**str) { switch (**str) {
break; case B: (*str)++; style->attr ^= A_BOLD; break; case B: (*str)++; style->attr ^= A_BOLD;
break; case O: (*str)++; *style = Reset; break; case O: (*str)++; *style = Reset;
@ -379,14 +379,13 @@ static void styleParse(struct Style *style, const char **str, size_t *len) {
if (isdigit(**str)) style->bg = style->bg * 10 + *(*str)++ - '0'; if (isdigit(**str)) style->bg = style->bg * 10 + *(*str)++ - '0';
} }
} }
*len = strcspn(*str, (const char[]) { B, C, O, R, I, U, '\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) {
size_t len;
struct Style style = Reset; struct Style style = Reset;
while (*str) { while (*str) {
styleParse(&style, &str, &len); size_t len = styleParse(&style, &str);
wattr_set( wattr_set(
status, status,
style.attr | colorAttr(Colors[style.fg]), style.attr | colorAttr(Colors[style.fg]),
@ -399,16 +398,18 @@ static void statusAdd(const char *str) {
} }
static void statusUpdate(void) { static void statusUpdate(void) {
int otherUnread = 0; struct {
enum Heat otherHeat = Cold; uint unread;
wmove(status, 0, 0); enum Heat heat;
} others = { 0, Cold };
wmove(status, 0, 0);
for (uint num = 0; num < windows.len; ++num) { for (uint num = 0; num < windows.len; ++num) {
const struct Window *window = windows.ptrs[num]; const struct Window *window = windows.ptrs[num];
if (!window->heat && num != windows.show) continue; if (!window->heat && num != windows.show) continue;
if (num != windows.show) { if (num != windows.show) {
otherUnread += window->unreadWarm; others.unread += window->unreadWarm;
if (window->heat > otherHeat) otherHeat = window->heat; if (window->heat > others.heat) others.heat = window->heat;
} }
int trunc; int trunc;
char buf[256]; char buf[256];
@ -433,10 +434,10 @@ static void statusUpdate(void) {
window->unreadWarm, (window->heat > Warm ? "!" : "") window->unreadWarm, (window->heat > Warm ? "!" : "")
); );
} }
if (otherUnread) { if (others.unread) {
catf( catf(
title, sizeof(title), " (+%d%s)", title, sizeof(title), " (+%d%s)",
otherUnread, (otherHeat > Warm ? "!" : "") others.unread, (others.heat > Warm ? "!" : "")
); );
} }
} }
@ -444,7 +445,7 @@ static void statusUpdate(void) {
static void mark(struct Window *window) { static void mark(struct Window *window) {
if (window->scroll) return; if (window->scroll) return;
window->mark = true; window->mark = true;
window->unreadTotal = 0; window->unread = 0;
window->unreadWarm = 0; window->unreadWarm = 0;
window->unreadLines = 0; window->unreadLines = 0;
} }
@ -508,9 +509,9 @@ static int wordWidth(const char *str) {
static int wordWrap(WINDOW *win, const char *str) { static int wordWrap(WINDOW *win, const char *str) {
int y, x, width; int y, x, width;
getmaxyx(win, y, width); getmaxyx(win, y, width);
waddch(win, '\n');
size_t len; int lines = 1;
int lines = 0;
int align = 0; int align = 0;
struct Style style = Reset; struct Style style = Reset;
while (*str) { while (*str) {
@ -538,9 +539,10 @@ static int wordWrap(WINDOW *win, const char *str) {
} }
} }
styleParse(&style, &str, &len); size_t len = styleParse(&style, &str);
size_t ws = strcspn(str, "\t "); size_t ws = strcspn(str, "\t ");
if (ws < len) len = ws; if (ws < len) len = ws;
if (!len) continue;
wattr_set( wattr_set(
win, win,
@ -562,9 +564,8 @@ static void notify(uint id, const char *str) {
utilPush(&util, idNames[id]); utilPush(&util, idNames[id]);
char buf[1024] = ""; char buf[1024] = "";
while (*str) { while (*str) {
size_t len;
struct Style style = Reset; struct Style style = Reset;
styleParse(&style, &str, &len); size_t len = styleParse(&style, &str);
catf(buf, sizeof(buf), "%.*s", (int)len, str); catf(buf, sizeof(buf), "%.*s", (int)len, str);
str += len; str += len;
} }
@ -584,23 +585,24 @@ static void notify(uint id, const char *str) {
void uiWrite(uint id, enum Heat heat, const time_t *src, const char *str) { void uiWrite(uint id, enum Heat heat, const time_t *src, const char *str) {
struct Window *window = windows.ptrs[windowFor(id)]; struct Window *window = windows.ptrs[windowFor(id)];
time_t clock = (src ? *src : time(NULL)); time_t ts = (src ? *src : time(NULL));
bufferPush(&window->buffer, clock, str); bufferPush(&window->buffer, ts, str);
int lines = 1; int lines = 0;
waddch(window->pad, '\n'); window->unread++;
window->unreadTotal++;
if (window->mark && heat > Cold) { if (window->mark && heat > Cold) {
if (window->heat < heat) window->heat = heat;
if (!window->unreadWarm++) { if (!window->unreadWarm++) {
waddch(window->pad, '\n');
lines++; lines++;
waddch(window->pad, '\n');
} }
if (heat > window->heat) window->heat = heat;
statusUpdate(); statusUpdate();
} }
lines += wordWrap(window->pad, str); lines += wordWrap(window->pad, str);
window->unreadLines += lines; window->unreadLines += lines;
if (window->scroll) windowScroll(window, lines); if (window->scroll) windowScroll(window, lines);
if (window->mark && heat > Warm) { if (window->mark && heat > Warm) {
beep(); beep();
notify(id, str); notify(id, str);
@ -622,18 +624,19 @@ void uiFormat(
static void reflow(struct Window *window) { static void reflow(struct Window *window) {
werase(window->pad); werase(window->pad);
wmove(window->pad, 0, 0); wmove(window->pad, 0, 0);
int flowed = 0; int flowed = 0;
window->unreadLines = 0; window->unreadLines = 0;
for (size_t i = 0; i < BufferCap; ++i) { for (size_t i = 0; i < BufferCap; ++i) {
const char *line = bufferLine(&window->buffer, i); const char *line = bufferLine(&window->buffer, i);
if (!line) continue; if (!line) continue;
waddch(window->pad, '\n'); int lines = wordWrap(window->pad, line);
int lines = 1 + wordWrap(window->pad, line); if (i >= (size_t)(BufferCap - window->unread)) {
if (i >= (size_t)(BufferCap - window->unreadTotal)) {
window->unreadLines += lines; window->unreadLines += lines;
} }
flowed += lines; flowed += lines;
} }
if (flowed < WindowLines) { if (flowed < WindowLines) {
wscrl(window->pad, -(WindowLines - 1 - flowed)); wscrl(window->pad, -(WindowLines - 1 - flowed));
wmove(window->pad, WindowLines - 1, RIGHT); wmove(window->pad, WindowLines - 1, RIGHT);
@ -656,19 +659,20 @@ static void resize(void) {
static void bufferList(const struct Buffer *buffer) { static void bufferList(const struct Buffer *buffer) {
uiHide(); uiHide();
waiting = true; waiting = true;
for (size_t i = 0; i < BufferCap; ++i) { for (size_t i = 0; i < BufferCap; ++i) {
time_t time = bufferTime(buffer, i);
const char *line = bufferLine(buffer, i); const char *line = bufferLine(buffer, i);
if (!line) continue; if (!line) continue;
time_t time = bufferTime(buffer, i);
struct tm *tm = localtime(&time); struct tm *tm = localtime(&time);
if (!tm) continue; if (!tm) err(EX_OSERR, "localtime");
char buf[sizeof("[00:00:00]")];
strftime(buf, sizeof(buf), "[%T]", tm); char buf[sizeof("00:00:00")];
vid_attr(colorAttr(Colors[Gray]), colorPair(Colors[Gray], -1), NULL); strftime(buf, sizeof(buf), "%T", tm);
printf("%s ", buf); vid_attr(colorAttr(Colors[Gray]), colorPair(Colors[Gray], -1), NULL);
printf("[%s] ", buf);
size_t len;
bool align = false; bool align = false;
struct Style style = Reset; struct Style style = Reset;
while (*line) { while (*line) {
@ -677,15 +681,18 @@ static void bufferList(const struct Buffer *buffer) {
align = true; align = true;
line++; line++;
} }
styleParse(&style, &line, &len);
size_t len = styleParse(&style, &line);
size_t tab = strcspn(line, "\t"); size_t tab = strcspn(line, "\t");
if (tab < len) len = tab; if (tab < len) len = tab;
if (!len) continue;
vid_attr( vid_attr(
style.attr | colorAttr(Colors[style.fg]), style.attr | colorAttr(Colors[style.fg]),
colorPair(Colors[style.fg], Colors[style.bg]), colorPair(Colors[style.fg], Colors[style.bg]),
NULL NULL
); );
if (len) printf("%.*s", (int)len, line); printf("%.*s", (int)len, line);
line += len; line += len;
} }
printf("\n"); printf("\n");
@ -693,10 +700,9 @@ static void bufferList(const struct Buffer *buffer) {
} }
static void inputAdd(struct Style *style, const char *str) { static void inputAdd(struct Style *style, const char *str) {
size_t len;
while (*str) { while (*str) {
const char *code = str; const char *code = str;
styleParse(style, &str, &len); size_t len = styleParse(style, &str);
wattr_set(input, A_BOLD | A_REVERSE, 0, NULL); wattr_set(input, A_BOLD | A_REVERSE, 0, NULL);
switch (*code) { switch (*code) {
break; case B: waddch(input, 'B'); break; case B: waddch(input, 'B');
@ -707,6 +713,7 @@ static void inputAdd(struct Style *style, const char *str) {
break; case U: waddch(input, 'U'); break; case U: waddch(input, 'U');
} }
if (str - code > 1) waddnstr(input, &code[1], str - &code[1]); if (str - code > 1) waddnstr(input, &code[1], str - &code[1]);
if (!len) continue;
wattr_set( wattr_set(
input, input,
style->attr | colorAttr(Colors[style->fg]), style->attr | colorAttr(Colors[style->fg]),
@ -719,52 +726,58 @@ static void inputAdd(struct Style *style, const char *str) {
} }
static void inputUpdate(void) { static void inputUpdate(void) {
uint id = windows.ptrs[windows.show]->id;
size_t pos; size_t pos;
char *buf = editBuffer(&pos); char *buf = editBuffer(&pos);
uint id = windows.ptrs[windows.show]->id;
const char *skip = NULL;
struct Style init = { .fg = self.color, .bg = Default };
struct Style rest = Reset;
const char *prefix = ""; const char *prefix = "";
const char *prompt = self.nick; const char *prompt = self.nick;
const char *suffix = ""; const char *suffix = "";
if (NULL != (skip = commandIsPrivmsg(id, buf))) { const char *skip = buf;
struct Style stylePrompt = { .fg = self.color, .bg = Default };
struct Style styleInput = Reset;
const char *privmsg = commandIsPrivmsg(id, buf);
const char *notice = commandIsNotice(id, buf);
const char *action = commandIsAction(id, buf);
if (privmsg) {
prefix = "<"; suffix = "> "; prefix = "<"; suffix = "> ";
} else if (NULL != (skip = commandIsNotice(id, buf))) { skip = privmsg;
} else if (notice) {
prefix = "-"; suffix = "- "; prefix = "-"; suffix = "- ";
rest.fg = LightGray; styleInput.fg = LightGray;
} else if (NULL != (skip = commandIsAction(id, buf))) { skip = notice;
init.attr |= A_ITALIC; } else if (action) {
prefix = "* "; suffix = " "; prefix = "* "; suffix = " ";
rest.attr |= A_ITALIC; stylePrompt.attr |= A_ITALIC;
styleInput.attr |= A_ITALIC;
skip = action;
} else if (id == Debug && buf[0] != '/') { } else if (id == Debug && buf[0] != '/') {
skip = buf;
init.fg = Gray;
prompt = "<< "; prompt = "<< ";
stylePrompt.fg = Gray;
} else { } else {
prompt = ""; prompt = "";
} }
if (skip && skip > &buf[pos]) { if (skip > &buf[pos]) {
skip = NULL;
prefix = prompt = suffix = ""; prefix = prompt = suffix = "";
skip = buf;
} }
int y, x; int y, x;
wmove(input, 0, 0); wmove(input, 0, 0);
wattr_set( wattr_set(
input, input,
init.attr | colorAttr(Colors[init.fg]), stylePrompt.attr | colorAttr(Colors[stylePrompt.fg]),
colorPair(Colors[init.fg], Colors[init.bg]), colorPair(Colors[stylePrompt.fg], Colors[stylePrompt.bg]),
NULL NULL
); );
waddstr(input, prefix); waddstr(input, prefix);
waddstr(input, prompt); waddstr(input, prompt);
waddstr(input, suffix); waddstr(input, suffix);
struct Style style = rest; struct Style style = styleInput;
char p = buf[pos]; char p = buf[pos];
buf[pos] = '\0'; buf[pos] = '\0';
inputAdd(&style, (skip ? skip : buf)); inputAdd(&style, skip);
getyx(input, y, x); getyx(input, y, x);
buf[pos] = p; buf[pos] = p;
inputAdd(&style, &buf[pos]); inputAdd(&style, &buf[pos]);
@ -954,7 +967,7 @@ void uiRead(void) {
} }
static const time_t Signatures[] = { static const time_t Signatures[] = {
0x6C72696774616301, // no heat, unreadTotal, unreadWarm 0x6C72696774616301, // no heat, unread, unreadWarm
0x6C72696774616302, 0x6C72696774616302,
}; };
@ -981,7 +994,7 @@ int uiSave(const char *name) {
const struct Window *window = windows.ptrs[num]; const struct Window *window = windows.ptrs[num];
if (writeString(file, idNames[window->id])) return -1; if (writeString(file, idNames[window->id])) return -1;
if (writeTime(file, window->heat)) return -1; if (writeTime(file, window->heat)) return -1;
if (writeTime(file, window->unreadTotal)) return -1; if (writeTime(file, window->unread)) return -1;
if (writeTime(file, window->unreadWarm)) return -1; if (writeTime(file, window->unreadWarm)) return -1;
for (size_t i = 0; i < BufferCap; ++i) { for (size_t i = 0; i < BufferCap; ++i) {
time_t time = bufferTime(&window->buffer, i); time_t time = bufferTime(&window->buffer, i);
@ -1033,7 +1046,7 @@ void uiLoad(const char *name) {
struct Window *window = windows.ptrs[windowFor(idFor(buf))]; struct Window *window = windows.ptrs[windowFor(idFor(buf))];
if (version > 0) { if (version > 0) {
window->heat = readTime(file); window->heat = readTime(file);
window->unreadTotal = readTime(file); window->unread = readTime(file);
window->unreadWarm = readTime(file); window->unreadWarm = readTime(file);
} }
for (;;) { for (;;) {