top - Adjust top display

* Replace RES with PRES, remove PRI.  This opens up more space for the
  command which had gotten too squeezed.

* Realign columns for smp and non-smp displays.

* Remove annoying "This terminal can only display..." message from the
  original contrib code.

diff --git a/contrib/top/commands.c b/contrib/top/commands.c
index 7320daf..1374fac 100644 (file)
--- a/contrib/top/commands.c
+++ b/contrib/top/commands.c
@@ -593,11 +593,13 @@ cmd_number(globalstate *gstate)
     newval = readline(tmpbuf, 8, Yes);
     if (newval > -1)
     {
+#if 0
        if (newval > gstate->max_topn)
        {
            message_error(" This terminal can only display %d processes",
                          gstate->max_topn);
        }
+#endif
 
        if (newval == 0)
        {

diff --git a/contrib/top/top.c b/contrib/top/top.c
index 8d87940..9193cf8 100644 (file)
--- a/contrib/top/top.c
+++ b/contrib/top/top.c
@@ -892,8 +892,10 @@ main(int argc, char *argv[])
     }
     else if (gstate->topn > gstate->max_topn)
     {
+#if 0
        message_error(" This terminal can only display %d processes",
                      gstate->max_topn);
+#endif
     }
 
 #ifdef ENABLE_COLOR

diff --git a/usr.bin/top/m_dragonfly.c b/usr.bin/top/m_dragonfly.c
index f9f1619..be4303d 100644 (file)
--- a/usr.bin/top/m_dragonfly.c
+++ b/usr.bin/top/m_dragonfly.c
@@ -97,18 +97,16 @@ struct handle {
  */
 
 static char smp_header[] =
-"  PID %-*.*s PRI NICE  SIZE    RES   PRES  STATE  C   TIME   CTIME   CPU COMMAND";
+"  PID %-*.*s NICE  SIZE   PRES   STATE C    TIME   CTIME    CPU COMMAND";
 
 #define smp_Proc_format \
-       "%5d %-*.*s %3d %3d%7s %6s %6s  %-6.6s %1x%7s %7s %5.2f%% %.*s"
+       "%5d %-*.*s %3d%7s %6s %7.7s %1x %7s %7s %5.2f%% %.*s"
 
 static char up_header[] =
-"  PID %-*.*s PRI NICE  SIZE    RES   PRES  STATE    TIME   CTIME   CPU COMMAND";
+"  PID %-*.*s NICE  SIZE   PRES   STATE    TIME   CTIME    CPU COMMAND";
 
 #define up_Proc_format \
-       "%5d %-*.*s %3d %3d%7s %6s %6s  %-6.6s%.0d%7s%7s %5.2f%% %.*s"
-
-
+       "%5d %-*.*s %3d%7s %6s %7.7s%.0d %7s %7s %5.2f%% %.*s"
 
 
 /* process state names for the "STATE" column of the display */
@@ -625,11 +623,8 @@ format_next_process(caddr_t xhandle, char *(*get_userid) (int))
            (int)PP(pp, pid),
            namelength, namelength,
            get_userid(PP(pp, ruid)),
-           (int)((show_threads && (LP(pp, pid) == -1)) ?
-           LP(pp, tdprio) : LP(pp, prio)),
            (int)xnice,
            format_k(PROCSIZE(pp)),
-           format_k(pagetok(VP(pp, rssize))),
            format_k(pagetok(VP(pp, prssize))),
            status,
            (int)(smpmode ? LP(pp, cpuid) : 0),