top: eliminate that 'TOG4_NOFORCE' compile conditional <=== port of newlib d9c45988

______________________________ original newlib message
----------------------------------- ( minus git hash )

When two abreast display was introduce, in that commit
shown below, this #define provision was also added. It
actually was an artifact left from program development
and never made much sense in a real world application.

If activated it would make the '4' toggle appear to be
broken since it would only take affect if a user first
activated individual cpu display (the '1' toggle off).
And there was no error message offered to those users.

So, this questionable #define is now being eliminated.

Reference(s):
. May, 2020 - introduce 2 abreast display
commit ........................................

Signed-off-by: Jim Warner <james.warner@comcast.net>

diff --git a/top/top.c b/top/top.c
index eab1735e4b1d44289410ae8f705328eeee79e460..29768ca9a58b456a7d707b42ec72b13cc78a8e40 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -5846,13 +5846,8 @@ static void keys_summary (int ch) {
             w->rc.double_up = 0;
             break;
          }
-#ifdef TOG4_NOFORCE
-         if (CHKw(w, (View_CPUSUM | View_CPUNOD)))
-            w->rc.double_up = 0;
-#else
          if (w->rc.double_up)
             OFFw(w, (View_CPUSUM | View_CPUNOD));
-#endif
          break;
       case 'C':
          VIZTOGw(w, View_SCROLL);

diff --git a/top/top.h b/top/top.h
index ea8420eed39df685f5ef6960bcc83adc2be70389..c16ae88213b4cf640afd8473a7117777ba791972 100644 (file)
--- a/top/top.h
+++ b/top/top.h
@@ -65,7 +65,6 @@
 //#define SCROLLV_BY_1            /* when scrolling left/right do not move 8 */
 //#define STRINGCASENO            /* case insenstive compare/locate versions */
 //#define TERMIOS_ONLY            /* use native input only (just limp along) */
-//#define TOG4_NOFORCE            /* no force 2 abreast mode with '4' toggle */
 //#define TOG4_NOTRUNC            /* ensure no truncation for 2 abreast mode */
 //#define TOG4_OFF_MEM            /* don't show two abreast memory statistic */
 //#define TOG4_OFF_SEP            /* don't show two abreast visual separator */