emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: fix 'TOG4_MEM_1UP' if two abreast summary display

Browse Source 
If one per line display of Mem/Swap data was forced by
this #define, screen width was not fully exploited for
graph mode. Rather, those graphs were scaled just like
they would be if aligned with a nonexistent separator.

With this commit, those graphs will expand to fill the
screen width (or be limited by the maximum of '100' ).

[ and in unrelated news a variable used in do_memory ]
[ was changed for consistency. it doesn't affect the ]
[ the results since a part1 of swap was always zero. ]

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2022-09-18 00:00:00 -05:00 committed by Craig Small
parent 602146a623
commit 124f26a423
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/top/top.c
View File

@ -2088,7 +2088,11 @@ static void adj_geometry (void) {
if (Graph_cpus->length > GRAPH_length_max) Graph_cpus->length = GRAPH_length_max; if (Graph_cpus->length > GRAPH_length_max) Graph_cpus->length = GRAPH_length_max;
if (Graph_cpus->length < GRAPH_length_min) Graph_cpus->length = GRAPH_length_min; if (Graph_cpus->length < GRAPH_length_min) Graph_cpus->length = GRAPH_length_min;
#ifdef TOG4_MEM_1UP
Graph_mems->length = (Screen_cols - (GRAPH_prefix_std + GRAPH_suffix));
#else
Graph_mems->length = (Screen_cols - ADJOIN_space - (2 * (pfx + GRAPH_suffix))) / 2; Graph_mems->length = (Screen_cols - ADJOIN_space - (2 * (pfx + GRAPH_suffix))) / 2;
#endif
if (Graph_mems->length > GRAPH_length_max) Graph_mems->length = GRAPH_length_max; if (Graph_mems->length > GRAPH_length_max) Graph_mems->length = GRAPH_length_max;
if (Graph_mems->length < GRAPH_length_min) Graph_mems->length = GRAPH_length_min; if (Graph_mems->length < GRAPH_length_min) Graph_mems->length = GRAPH_length_min;
@ -6520,7 +6524,7 @@ static void do_memory (void) {
#else #else
if (Curwin->rc.double_up > 1) if (Curwin->rc.double_up > 1)
snprintf(row, sizeof(row), "%s %s~3%3.0f%s" snprintf(row, sizeof(row), "%s %s~3%3.0f%s"
, scT(label), N_txt(WORD_abv_swp_txt), rx->pcnt_tot, rx->graph); , scT(label), N_txt(WORD_abv_swp_txt), rx->pcnt_two, rx->graph);
else { else {
prT(bfT(1), mkM(MEM_VAL(swp_TOT))); prT(bfT(1), mkM(MEM_VAL(swp_TOT)));
snprintf(row, sizeof(row), "%s %s:~3%#5.1f~2/%-9.9s~3%s" snprintf(row, sizeof(row), "%s %s:~3%#5.1f~2/%-9.9s~3%s"