hirc

commit 8be8fa1bd18d9a72c6a9a51c02b6be6d03225c23
parent e8ff69142a73deeb3406ea19cb752cebfc4c7527
Author: hhvn <dev@hhvn.uk>
Date:   Sun, 31 Oct 2021 13:31:14 +0000

ui.c hist.c main.c hirc.h: draw Win_main from selected.history

Diffstat:
M
hirc.h
 | 
1
+
M
hist.c
 | 
7
++-----
M
main.c
 | 
3
+++
M
ui.c
 | 
38
+++++++++++++++++++++++++-------------

4 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/hirc.h b/hirc.h
@@ -96,6 +96,7 @@ void		ui_redraw(void);
 void		ui_draw_input(void);
 void		ui_draw_nicklist(void);
 void		ui_draw_buflist(void);
+void		ui_draw_main(void);
 int		ui_buflist_count(int *ret_servers, int *ret_channels);
 void		ui_buflist_select(int num);
 int		ui_get_pair(short fg, short bg);
diff --git a/hist.c b/hist.c
@@ -97,12 +97,9 @@ hist_add(struct Server *server, struct HistInfo *histinfo, struct Nick *from,
 	new->next->prev = new;
 	histinfo->history = new;
 
-
-	// XXX 
-	if (options & HIST_SHOW) {
-		ui_wprintc(&windows[Win_main], 0, "!%lld :%s %s\n", (long long)new->timestamp, nick_strprefix(new->from), new->raw);
+	/* TODO: this triggers way too often, need to have some sort of delay */
+	if (selected.history == histinfo)
 		windows[Win_main].redraw = 1;
-	}
 
 	if (options & HIST_LOG) {
 		if (server)
diff --git a/main.c b/main.c
@@ -235,6 +235,9 @@ main(int argc, char **argv) {
 				windows[Win_buflist].redraw = 1;
 		}
 
+		if (oldselected.history != selected.history)
+			windows[Win_main].redraw = 1;
+
 		oldselected.channel = selected.channel;
 		oldselected.server = selected.server;
 		oldselected.history = selected.history;
diff --git a/ui.c b/ui.c
@@ -11,7 +11,7 @@
 #include "hirc.h"
 
 struct Window windows[Win_last] = {
-	[Win_main]	= {.handler = NULL},
+	[Win_main]	= {.handler = ui_draw_main},
 	[Win_input]	= {.handler = ui_draw_input},
 	[Win_nicklist]	= {.handler = ui_draw_nicklist},
 	[Win_buflist]	= {.handler = ui_draw_buflist},
@@ -192,6 +192,7 @@ ui_read(void) {
 void
 ui_redraw(void) {
 	int x = 0, rx = 0;
+	int i;
 
 	if (windows[Win_buflist].location == LEFT) {
 		windows[Win_buflist].x = windows[Win_buflist].y = 0;
@@ -230,11 +231,6 @@ ui_redraw(void) {
 	windows[Win_input].h = 1;
 	windows[Win_input].w = COLS - x - rx;
 
-	ui_placewindow(&windows[Win_nicklist]);
-	ui_placewindow(&windows[Win_buflist]);
-	ui_placewindow(&windows[Win_main]);
-	ui_placewindow(&windows[Win_input]);
-
 	if (x)
 		mvvline(0, x - 1, '|', LINES);
 	if (rx)
@@ -243,9 +239,10 @@ ui_redraw(void) {
 	mvhline(LINES - 2, x, '-', COLS - x - rx);
 	refresh();
 
-	windows[Win_nicklist].redraw = 1;
-	windows[Win_buflist].redraw = 1;
-	windows[Win_input].redraw = 1;
+	for (i = 0; i < Win_last; i++) {
+		ui_placewindow(&windows[i]);
+		windows[i].redraw = 1;
+	}
 }
 
 void
@@ -411,6 +408,7 @@ ui_wprintc(struct Window *window, int lines, char *format, ...) {
 
 	if (lines < 0)
 		ui_strlenc(window, str, &elc);
+	elc -= 1;
 
 	for (ret = cc = lc = 0, s = str; s && *s; s++) {
 		switch (*s) {
@@ -549,15 +547,29 @@ ui_strlenc(struct Window *window, char *s, int *lines) {
 	}
 
 	if (lines)
-		*lines = lc;
+		*lines = lc + 1;
 	return ret;
 }
 
 void
 ui_draw_main(void) {
-	int y;
-
-	y = windows[Win_main].h - 1;
+	struct History *p;
+	int y, lines;
+
+	/* need to do manual clearing to avoid the flicker */
+	wclear(windows[Win_main].window);
+	y = windows[Win_main].h;
+	for (p = selected.history->history; p && y > 0; p = p->next) {
+		ui_strlenc(&windows[Win_main], p->raw, &lines);
+		y = y - lines;
+		if (y < lines) {
+			y *= -1;
+			wmove(windows[Win_main].window, 0, 0);
+			ui_wprintc(&windows[Win_main], y, "%s\n", p->raw);
+		}
+		wmove(windows[Win_main].window, y, 0);
+		ui_wprintc(&windows[Win_main], 0, "%s\n", p->raw);
+	}
 }
 
 void