diff options
| author | Jim Warner <james.warner@comcast.net> | 2022-09-19 00:00:00 -0500 |
|---|---|---|
| committer | Craig Small <csmall@dropbear.xyz> | 2022-09-20 19:34:40 +1000 |
| commit | ad8a8bee17c470f6fc3b923636852e72903999fc (patch) | |
| tree | fb1c825002f5cf4d5862932531821866a9c02040 | |
| parent | 5dc515a6fd4f6bd0d594170dcf32664123b0272e (diff) | |
| download | procps-ng-ad8a8bee17c470f6fc3b923636852e72903999fc.tar.gz | |
top: distinct separator if two abreast summary display <=== port of newlib 96153c0f
______________________________ original newlib message
When displaying detailed memory statistics two abreast
data for the lines are less than those for cpus. So we
can exploit such a difference to provide a distinctive
separator. This may help separating cpu & memory data.
[ in truth, this happened before this patch. what we ]
[ are doing now is polishing that accidental feature ]
[ and placing it under the control of a conditional. ]
Signed-off-by: Jim Warner <james.warner@comcast.net>
| -rw-r--r-- | top/top.c | 4 | ||||
| -rw-r--r-- | top/top.h | 4 | ||||
| -rw-r--r-- | top/top_nls.c | 6 |
3 files changed, 11 insertions, 3 deletions
@@ -282,7 +282,11 @@ static const char Osel_filterI_fmt[] = "\ttype=%d,\t" OSEL_FILTER "%*s\n"; static char Adjoin_sp[] = " "; #define ADJOIN_space (sizeof(Adjoin_sp) - 1) #else +#ifdef TOG4_STD_SEP +static char Adjoin_sp[] = "~1 ~6 "; +#else static char Adjoin_sp[] = " ~6 ~1"; +#endif #define ADJOIN_space (sizeof(Adjoin_sp) - 5) // 1 for null, 4 unprintable #endif #define ADJOIN_limit 8 @@ -66,6 +66,7 @@ //#define TERMIOS_ONLY /* use native input only (just limp along) */ //#define TOG4_OFF_MEM /* don't show two abreast memory statistic */ //#define TOG4_OFF_SEP /* don't show two abreast visual separator */ +//#define TOG4_STD_SEP /* normal mem sep if 2 abreast & no graphs */ //#define TREE_NORESET /* sort keys should not force 'V' view off */ //#define TREE_SCANALL /* rescan array w/ forest view, avoid sort */ //#define TREE_VALTMRK /* use an indented '+' with collapsed pids */ @@ -699,6 +700,9 @@ typedef struct WIN_t { #if defined(SCALE_FORMER) && defined(SCALE_POSTFX) # warning 'SCALE_POSTFX' is ignored when 'SCALE_FORMER' is active #endif +#if defined(TOG4_STD_SEP) && defined(TOG4_OFF_SEP) +# warning 'TOG4_STD_SEP' has no effect when 'TOG4_OFF_SEP' is active +#endif /*###### Some Prototypes (ha!) #########################################*/ diff --git a/top/top_nls.c b/top/top_nls.c index 65fe2c8..4f36d15 100644 --- a/top/top_nls.c +++ b/top/top_nls.c @@ -693,17 +693,17 @@ static void build_uniq_nlstab (void) { . us = user, sy = system, ni = nice, id = idle, wa = wait, . hi hardware interrupt, si = software interrupt */ Uniq_nlstab[STATE_lin2x6_fmt] = _("%s~3" - " %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f ~2wa,~3 %#5.1f ~2hi,~3 %#5.1f ~2si~3"); + " %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f ~2wa,~3 %#5.1f ~2hi,~3 %#5.1f ~2si~3 ~1"); /* Translation Hint: Only the following abbreviations need be translated . us = user, sy = system, ni = nice, id = idle, wa = wait, . hi hardware interrupt, si = software interrupt, st = steal time */ Uniq_nlstab[STATE_lin2x7_fmt] = _("%s~3" - "%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3"); + "%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3 ~1"); /* Translation Hint: next 2 must be treated together, with WORDS above & below aligned */ Uniq_nlstab[MEMORY_line1_fmt] = _("" - "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3 "); + "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3 ~1 "); Uniq_nlstab[MEMORY_line2_fmt] = _("" "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used.~3 %9.9s~2avail %s~3"); |