svn commit: r214857 - head/contrib/top

[Xin LI]

Author: delphij
Date: Sat Nov  6 03:59:21 2010
New Revision: 214857
URL: http://svn.freebsd.org/changeset/base/214857

Log:
  Inverse display of top(1)'s table header when running in inactive mode.
  
  MFC after:	2 weeks

Modified:
  head/contrib/top/display.c
  head/contrib/top/top.h

Modified: head/contrib/top/display.c
==============================================================================
--- head/contrib/top/display.c	Sat Nov  6 01:09:00 2010	(r214856)
+++ head/contrib/top/display.c	Sat Nov  6 03:59:21 2010	(r214857)
@@ -694,7 +694,7 @@ char *text;
 	int width;
 
 	s = NULL;
-	width = display_width;
+	width = screen_width;
 	header_length = strlen(text);
 	if (header_length >= width) {
 		s = malloc((width + 1) * sizeof(char));
@@ -702,6 +702,14 @@ char *text;
 			return (NULL);
 		strncpy(s, text, width);
 		s[width] = '\0';
+	} else {
+		s = malloc((width + 1) * sizeof(char));
+		if (s == NULL)
+			return (NULL);
+		strncpy(s, text, width);
+		while (screen_width > header_length)
+			s[header_length++] = ' ';
+		s[width] = '\0';
 	}
 	return (s);
 }
@@ -726,7 +734,7 @@ char *text;
     if (header_status == ON)
     {
 	putchar('\n');
-	fputs(text, stdout);
+	standout(text, stdout);
 	lastline++;
     }
     else if (header_status == ERASE)

Modified: head/contrib/top/top.h
==============================================================================
--- head/contrib/top/top.h	Sat Nov  6 01:09:00 2010	(r214856)
+++ head/contrib/top/top.h	Sat Nov  6 03:59:21 2010	(r214857)
@@ -14,7 +14,7 @@
 extern int Header_lines;	/* 7 */
 
 /* Maximum number of columns allowed for display */
-#define MAX_COLS	128
+#define MAX_COLS	512
 
 /* Log base 2 of 1024 is 10 (2^10 == 1024) */
 #define LOG1024		10