hirc

commit bba1ee6c32abd164715dc4d0e9a0af478f272323
parent de34a1dc1151623f12378cc33f547e26a8d7eeeb
Author: hhvn <dev@hhvn.uk>
Date:   Sun, 12 Dec 2021 18:30:08 +0000

s/ui.c s/config.c: handle disconnected servers/old channels

Diffstat:
M
src/config.c
 | 
5
+++++
M
src/ui.c
 | 
23
+++++++++++++----------

2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/config.c b/src/config.c
@@ -272,6 +272,11 @@ struct Config config[] = {
 		.strhandle = config_redraws,
 		.description = {
 		"Format of footer of /alias output", NULL}},
+	{"format.ui.buflist.old", 1, Val_string,
+		.str = "%{c:91}",
+		.strhandle = config_redraws,
+		.description = {
+		"Indicator for disconnected servers or parted channels", NULL}},
 	{"format.ui.buflist.activity.none", 1, Val_string,
 		.str = "",
 		.strhandle = config_redraws,
diff --git a/src/ui.c b/src/ui.c
@@ -701,10 +701,11 @@ ui_draw_buflist(void) {
 	for (sc = cc = pc = 0, sp = servers; sp; sp = sp->next, sc++) {
 		if (selected.server == sp && !selected.channel)
 			wattron(windows[Win_buflist].window, A_BOLD);
-		else if (sp->status != ConnStatus_connected)
-			wattron(windows[Win_buflist].window, A_DIM);
 
-		indicator = ui_format_activity(sp->history->activity);
+		if (sp->status == ConnStatus_notconnected)
+			indicator = ui_format(config_gets("format.ui.buflist.old"), NULL);
+		else
+			indicator = ui_format_activity(sp->history->activity);
 
 		len = ui_wprintc(&windows[Win_buflist], 1, "%02d: %s─ %s%s\n", i++, sp->next ? "├" : "└", indicator, sp->name);
 		wattrset(windows[Win_buflist].window, A_NORMAL);
@@ -712,10 +713,11 @@ ui_draw_buflist(void) {
 		for (chp = sp->channels; chp; chp = chp->next, cc++) {
 			if (selected.channel == chp)
 				wattron(windows[Win_buflist].window, A_BOLD);
-			else if (chp->old)
-				wattron(windows[Win_buflist].window, A_DIM);
 
-			indicator = ui_format_activity(chp->history->activity);
+			if (chp->old)
+				indicator = ui_format(config_gets("format.ui.buflist.old"), NULL);
+			else
+				indicator = ui_format_activity(chp->history->activity);
 
 			len = ui_wprintc(&windows[Win_buflist], 1, "%02d: %s  %s─ %s%s\n", i++,
 					sp->next ? "│" : " ", chp->next ? "├" : "└", indicator, chp->name);
@@ -725,10 +727,11 @@ ui_draw_buflist(void) {
 		for (chp = sp->privs; chp; chp = chp->next, pc++) {
 			if (selected.channel == chp)
 				wattron(windows[Win_buflist].window, A_BOLD);
-			else if (chp->old)
-				wattron(windows[Win_buflist].window, A_DIM);
 
-			indicator = ui_format_activity(chp->history->activity);
+			if (chp->old)
+				indicator = ui_format(config_gets("format.ui.buflist.old"), NULL);
+			else
+				indicator = ui_format_activity(chp->history->activity);
 
 			len = ui_wprintc(&windows[Win_buflist], 1, "%02d: %s  %s─ %s%s\n", i++,
 					sp->next ? "│" : " ", chp->next ? "├" : "└", indicator, chp->name);
@@ -1067,7 +1070,7 @@ ui_select(struct Server *server, struct Channel *channel) {
 	selected.server   = server;
 	selected.history  = channel ? channel->history : server ? server->history : main_buf;
 	selected.name     = channel ? channel->name    : server ? server->name    : "hirc";
-	selected.hasnicks = channel ? !channel->priv   : 0;
+	selected.hasnicks = channel ? !channel->priv && !channel->old : 0;
 
 	selected.history->activity = Activity_none;
 	selected.history->unread = 0;