From ab655c0a37c9738e8629de4234f319004ff87f5f Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Debian Linux)" <rob@synchro.net>
Date: Sat, 28 Oct 2023 14:03:34 -0700
Subject: [PATCH] Fixes for narrow terminals
In terminals < 80 cols in width, only the message # and "from" field are shown
in listings, so don't show column headings for fields that aren't shown.
Display a '-' in the flag column for deleted messages (that aren't flagged).
Shorten the prompt when listing msgs for terminals narrower than 64 cols
(for phigz). I don't know of any systems/terminals that use 64 cols however.
---
exec/msglist.js | 58 +++++++++++++++++++++++++++----------------------
1 file changed, 32 insertions(+), 26 deletions(-)
diff --git a/exec/msglist.js b/exec/msglist.js
index 041e6c6404..3fe0857358 100644
--- a/exec/msglist.js
+++ b/exec/msglist.js
@@ -350,7 +350,7 @@ function list_msg(msg, digits, selected, sort, msg_ctrl, exclude, is_operator)
var color_mask = msg_ctrl ? 7 : 0xff;
console_color(color&color_mask, selected);
- printf("%-*u%c", digits, msg.num, msg.flagged ? 251 : ' ');
+ printf("%-*u%c", digits, msg.num, msg.flagged ? 251 : msg.attr & MSG_DELETE ? '-' : ' ');
color = LIGHTMAGENTA;
if(color_cfg.column[1] != undefined)
color = color_cfg.column[1];
@@ -834,32 +834,34 @@ function list_msgs(msgbase, list, current, preview, grp_name, sub_name)
printf("%-*s ", digits, "#");
console.add_hotspot(CTRL_T);
printf("%-*s ", LEN_ALIAS, sort=="from" ? "FROM" : "From");
- for(var i = 0; i < list_formats[list_format].length; i++) {
- var prop = list_formats[list_format][i];
- if(exclude_heading.indexOf(prop) >= 0)
- continue;
- var fmt = "%-*.*s";
- var heading = columnHeading(prop);
- var last_column = (i == (list_formats[list_format].length - 1));
- if(last_column) {
- if(i > 0)
- fmt = "%*.*s";
- } else {
- if(i > 0 && max_len(prop) >= heading.length)
- console.print(" ");
- }
- var cols_remain = console.screen_columns - console.current_column - 1;
- var len = cols_remain;
- if(!last_column) {
- len = Math.min(max_len(prop), cols_remain);
- len = Math.max(heading.length, len);
+ if(console.screen_columns >= 80) {
+ for(var i = 0; i < list_formats[list_format].length; i++) {
+ var prop = list_formats[list_format][i];
+ if(exclude_heading.indexOf(prop) >= 0)
+ continue;
+ var fmt = "%-*.*s";
+ var heading = columnHeading(prop);
+ var last_column = (i == (list_formats[list_format].length - 1));
+ if(last_column) {
+ if(i > 0)
+ fmt = "%*.*s";
+ } else {
+ if(i > 0 && max_len(prop) >= heading.length)
+ console.print(" ");
+ }
+ var cols_remain = console.screen_columns - console.current_column - 1;
+ var len = cols_remain;
+ if(!last_column) {
+ len = Math.min(max_len(prop), cols_remain);
+ len = Math.max(heading.length, len);
+ }
+ console.add_hotspot(ascii(ascii(CTRL_U) + i));
+ // console.add_hotspot(CTRL_U);
+ printf(fmt
+ ,len
+ ,len
+ ,sort==prop ? heading.toUpperCase() : heading);
}
- console.add_hotspot(ascii(ascii(CTRL_U) + i));
-// console.add_hotspot(CTRL_U);
- printf(fmt
- ,len
- ,len
- ,sort==prop ? heading.toUpperCase() : heading);
}
console.cleartoeol();
console.crlf();
@@ -967,6 +969,10 @@ function list_msgs(msgbase, list, current, preview, grp_name, sub_name)
if(console.term_supports(USER_ANSI))
fmt += ", Hm/End/\x18\x19/PgUpDn";
fmt += ", ~Quit or [~View] ~?";
+ if(console.screen_columns < 64) {
+ for(var i = 0; i < cmds.length; i++)
+ cmds[i] = cmds[i].substring(0, 2);
+ }
console.mnemonics(cmds.join(", ") + format(fmt, list_formats.length-1));
console.cleartoeol();
bbs.nodesync(/* clearline: */false);
--
GitLab