From 2715981ff967386a070d52cf9c00ef71983a085b Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sun, 23 Mar 2008 20:04:18 +0000
Subject: Revert commit 48fc097e39ec9b3edd9a8929fe9faf8f302451ec and add a
comment about making it a runtime config option if it needs to change.
---
src/libeinfo/libeinfo.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
index c46cacbc..f8ddcb5f 100644
--- a/src/libeinfo/libeinfo.c
+++ b/src/libeinfo/libeinfo.c
@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
if (! msg)
return;
- cols = get_term_columns(fp) - (strlen(msg) + 5);
+ cols = get_term_columns(fp) - (strlen(msg) + 3);
/* cons25 is special - we need to remove one char, otherwise things
* do not align properly at all. */
@@ -801,15 +801,18 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
if (term_is_cons25)
cols--;
+ /* If extra spacing is required around msg, then please change
+ * via a runtime knob and leave this default as is as it saves 2
+ * valuable columns when running on 80 column screens. */
if (cols > 0 && colour_terminal(fp)) {
- fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
+ fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
ecolor(ECOLOR_BRACKET), ecolor(color), msg,
ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
} else {
if (col > 0)
for (i = 0; i < cols - col; i++)
fprintf(fp, " ");
- fprintf(fp, " [ %s ]\n", msg);
+ fprintf(fp, " [%s]\n", msg);
}
}
--
cgit v1.2.3