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

Rework status line

master
Curtis McEnroe 2018-10-22 16:09:40 -04:00
parent 40f87ae909
commit 35fdcbc285
No known key found for this signature in database
GPG Key ID: CEA2F97ADCFCD77C
1 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ui.c
View File

@ -92,8 +92,6 @@ void uiHide(void) {
endwin(); endwin();
} }
static const int ColsMax = 512;
void uiInit(void) { void uiInit(void) {
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
initscr(); initscr();
@ -103,8 +101,8 @@ void uiInit(void) {
colorInit(); colorInit();
termInit(); termInit();
ui.status = newpad(1, ColsMax); ui.status = newwin(1, COLS, 0, 0);
ui.input = newpad(1, ColsMax); ui.input = newpad(1, 512);
keypad(ui.input, true); keypad(ui.input, true);
nodelay(ui.input, true); nodelay(ui.input, true);
@ -131,23 +129,14 @@ static int logHeight(void) {
void uiDraw(void) { void uiDraw(void) {
if (ui.hide) return; if (ui.hide) return;
wnoutrefresh(ui.status);
int _, x;
getyx(ui.status, _, x);
pnoutrefresh(
ui.status,
0, MAX(0, x - lastCol() - 1),
0, 0,
0, lastCol()
);
pnoutrefresh( pnoutrefresh(
ui.view->log, ui.view->log,
ui.view->scroll - logHeight(), 0, ui.view->scroll - logHeight(), 0,
1, 0, 1, 0,
lastLine() - 1, lastCol() lastLine() - 1, lastCol()
); );
int _, x;
getyx(ui.input, _, x); getyx(ui.input, _, x);
pnoutrefresh( pnoutrefresh(
ui.input, ui.input,
@ -155,7 +144,6 @@ void uiDraw(void) {
lastLine(), 0, lastLine(), 0,
lastLine(), lastCol() lastLine(), lastCol()
); );
doupdate(); doupdate();
} }
@ -234,33 +222,27 @@ static struct {
} views; } views;
static void uiStatus(void) { static void uiStatus(void) {
mvwhline(ui.status, 0, 0, ACS_HLINE, COLS); wmove(ui.status, 0, 0);
mvwaddch(ui.status, 0, COLS, ACS_RTEE);
int num = 0; int num = 0;
int count = 0;
for (const struct View *view = views.head; view; view = view->next, ++num) { for (const struct View *view = views.head; view; view = view->next, ++num) {
if (!view->unread) continue; if (!view->unread && view != ui.view) continue;
bool status = (view->tag.id == TagStatus.id);
int unread; int unread;
wchar_t *str; wchar_t *str;
int len = aswprintf( int len = aswprintf(
&str, L",\3%02d%d\3%s%s%n(%d)", &str, L"%c %d:%s%n(\3%02d%d\3) ",
(view->hot ? IRCYellow : IRCWhite), num, (view == ui.view ? IRCReverse : IRCReset),
&status[":"], (status ? "" : view->tag.name), num, view->tag.name,
&unread, view->unread &unread, (view->hot ? IRCYellow : IRCDefault), view->unread
); );
if (len < 0) err(EX_OSERR, "aswprintf"); if (len < 0) err(EX_OSERR, "aswprintf");
if (view->unread == 1) str[unread] = L'\0'; if (!view->unread) {
str[unread + 0] = L' ';
addWrap(ui.status, count ? str : &str[1]); str[unread + 1] = L'\0';
free(str);
count++;
} }
addWrap(ui.status, str);
waddch(ui.status, count ? ACS_LTEE : '\b'); free(str);
waddch(ui.status, ACS_HLINE); }
wclrtoeol(ui.status);
} }
static void viewAppend(struct View *view) { static void viewAppend(struct View *view) {
@ -310,6 +292,7 @@ static void viewClose(struct View *view) {
} }
static void uiResize(void) { static void uiResize(void) {
wresize(ui.status, 1, COLS);
for (struct View *view = views.head; view; view = view->next) { for (struct View *view = views.head; view; view = view->next) {
wresize(view->log, LogLines, COLS); wresize(view->log, LogLines, COLS);
wmove(view->log, LogLines - 1, lastCol()); wmove(view->log, LogLines - 1, lastCol());