ncurses 6.2 - patch 20200321

[ncurses.git] / test / padview.c

diff --git a/test/padview.c b/test/padview.c
index 0445fc74840520b87e977daba758ffaa86b59aca..6917e0ed6eb654de2ad81e896b57b706195c8c29 100644 (file)
--- a/test/padview.c
+++ b/test/padview.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2017,2019 Free Software Foundation, Inc.                   *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2017 Free Software Foundation, Inc.                            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -28,7 +29,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.16 2020/02/02 23:34:34 tom Exp $
  */
 
 #include <test.priv.h>
@@ -191,7 +192,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 +325,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 +348,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;