X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fpadview.c;h=60f800ffac7539da97da76d6ac91061f54375fca;hp=0445fc74840520b87e977daba758ffaa86b59aca;hb=8890c8f28a1db5995ef17f52a7d8c0b9cf574210;hpb=eccca377f55c70b12e3e92621d94d1e1c1fcfb7d

diff --git a/test/padview.c b/test/padview.c
index 0445fc74..60f800ff 100644
--- a/test/padview.c
+++ b/test/padview.c
@@ -28,7 +28,7 @@
 /*
  * clone of view.c, using pads
  *
- * $Id: padview.c,v 1.13 2019/01/21 19:47:07 tom Exp $
+ * $Id: padview.c,v 1.15 2019/12/07 18:06:12 tom Exp $
  */
 
 #include <test.priv.h>
@@ -191,7 +191,7 @@ read_file(const char *filename)
 	failed("cannot allocate pad workspace");
     if (try_color) {
 	wattrset(my_pad, COLOR_PAIR(my_pair));
-	wbkgd(my_pad, (chtype) COLOR_PAIR(my_pair));
+	wbkgd(my_pad, (chtype) (' ' | COLOR_PAIR(my_pair)));
     }
 
     /*
@@ -324,11 +324,11 @@ main(int argc, char *argv[])
 		int tvalue = (int) strtol(optarg, &next, 0);
 		if (tvalue < 0 || (next != 0 && *next != 0))
 		    usage();
-		trace((unsigned) tvalue);
+		curses_trace((unsigned) tvalue);
 	    }
 	    break;
 	case 't':
-	    trace(TRACE_CALLS);
+	    curses_trace(TRACE_CALLS);
 	    break;
 #endif
 	default:
@@ -347,18 +347,22 @@ main(int argc, char *argv[])
 	nodelay(stdscr, TRUE);
     idlok(stdscr, TRUE);	/* allow use of insert/delete line */
 
-    my_pad = read_file(fname = argv[optind]);
-
     if (try_color) {
 	if (has_colors()) {
 	    start_color();
 	    init_pair(my_pair, COLOR_WHITE, COLOR_BLUE);
-	    bkgd((chtype) COLOR_PAIR(my_pair));
+	    bkgd((chtype) (' ' | COLOR_PAIR(my_pair)));
 	} else {
 	    try_color = FALSE;
 	}
     }
 
+    /*
+     * Do this after starting color, otherwise the pad's background will be
+     * uncolored after the ncurses 6.1.20181208 fixes.
+     */
+    my_pad = read_file(fname = argv[optind]);
+
     my_row = 0;
     while (!done) {
 	int n, c;