hirc

commit d6dad114bc1708ce4579048250743e3e995f771c
parent 86952de9f1c493d62cadb174702109f32dada966
Author: hhvn <dev@hhvn.uk>
Date:   Thu,  3 Mar 2022 22:31:26 +0000

Cache formats of main buffer

Diffstat:
M
src/hist.c
 | 
2
++
M
src/struct.h
 | 
1
+
M
src/ui.c
 | 
47
+++++++++++++++++++++++++++++++++++------------

3 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/src/hist.c b/src/hist.c
@@ -36,6 +36,7 @@ hist_free(struct History *history) {
 		free(history->from);
 	}
 	free(history->raw);
+	free(history->format);
 	free(history);
 }
 
@@ -62,6 +63,7 @@ hist_create(struct HistInfo *histinfo, struct Nick *from, char *msg,
 	new->activity = activity;
 	new->raw = estrdup(msg);
 	new->_params = new->params = param_create(msg);
+	new->format = NULL;
 	new->options = options;
 	new->origin = histinfo;
 
diff --git a/src/struct.h b/src/struct.h
@@ -67,6 +67,7 @@ struct History {
 	char *raw;
 	char **_params; /* contains all params, free from here */
 	char **params;  /* contains params without perfix, don't free */
+	char *format;   /* cached ui_format */
 	struct HistInfo *origin;
 	struct Nick *from;
 	struct History *next;
diff --git a/src/ui.c b/src/ui.c
@@ -533,6 +533,7 @@ ui_input_delete(int num, int counter) {
 
 void
 ui_redraw(void) {
+	struct History *p;
 	char *format;
 	long nicklistwidth, buflistwidth;
 	int x = 0, rx = 0;
@@ -622,6 +623,18 @@ ui_redraw(void) {
 			windows[i].refresh = 1;
 		}
 	}
+
+	/* Clear format element of history.
+	 * Formats need updating if the windows are resized,
+	 * or format.* settings are changed. */
+	if (selected.history) {
+		for (p = selected.history->history; p; p = p->next) {
+			if (p->format) {
+				free(p->format);
+				p->format = NULL;
+			}
+		}
+	}
 }
 
 void
@@ -1102,36 +1115,46 @@ raw:
 
 void
 ui_draw_main(void) {
-	struct History *p;
+	struct History *p, *hp;
 	char *format;
 	int y, lines;
 	int i;
 
 	werase(windows[Win_main].window);
 
-	for (i=0, p = selected.history->history; p && p->next && i < windows[Win_main].scroll; i++)
-		p = p->next;
+	for (i=0, p = selected.history->history, hp = NULL; p; p = p->next) {
+		if (!(p->options & HIST_SHOW))
+			continue;
+		if (windows[Win_main].scroll > 0 && !hp && !p->next)
+			hp = p;
+		else if (i == windows[Win_main].scroll && !hp)
+			hp = p;
 
-	if (i)
+		if (i < windows[Win_main].scroll)
+			i++;
+		if (!p->format)
+			p->format = estrdup(ui_hformat(&windows[Win_main], p));
+	}
+
+	if (windows[Win_main].scroll > 0)
 		windows[Win_main].scroll = i;
+	if (!hp)
+		hp = selected.history->history;
 
-	y = windows[Win_main].h;
-	for (; p && y > 0; p = p->next) {
-		if (!(p->options & HIST_SHOW))
-			continue;
-		if ((format = ui_hformat(&windows[Win_main], p)) == NULL)
+	for (y = windows[Win_main].h; hp && y > 0; hp = hp->next) {
+		if (!(hp->options & HIST_SHOW) || !hp->format)
 			continue;
-		if (ui_strlenc(&windows[Win_main], format, &lines) <= 0)
+		if (ui_strlenc(&windows[Win_main], hp->format, &lines) <= 0)
 			continue;
 		y = y - lines;
 		if (y < lines) {
 			y *= -1;
 			wmove(windows[Win_main].window, 0, 0);
-			ui_wprintc(&windows[Win_main], y, "%s\n", format);
+			ui_wprintc(&windows[Win_main], y, "%s\n", hp->format);
 			break;
 		}
 		wmove(windows[Win_main].window, y, 0);
-		ui_wprintc(&windows[Win_main], 0, "%s\n", format);
+		ui_wprintc(&windows[Win_main], 0, "%s\n", hp->format);
 	}
 
 	if (selected.channel && selected.channel->topic) {