ncurses 6.3 - patch 20220226

[ncurses.git] / test / ncurses.c

diff --git a/test/ncurses.c b/test/ncurses.c
index fd1dcd3b35fe8f555be5b832e629c880074a8cbf..2aa78b2299b961845311fba7a0f4ebc14a6a5600 100644 (file)
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,7 +41,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.526 2021/05/22 19:45:57 tom Exp $
+$Id: ncurses.c,v 1.528 2022/02/26 22:41:02 tom Exp $
 
 ***************************************************************************/
 
@@ -2885,6 +2885,10 @@ init_all_colors(bool xterm_colors, char *palette_file)
            while (fgets(buffer, sizeof(buffer), fp) != 0) {
                if (sscanf(buffer, "scale:%d", &c) == 1) {
                    scale = c;
+                   if (scale < 100)
+                       scale = 100;
+                   if (scale > 1000)
+                       scale = 1000;
                } else if (sscanf(buffer, "%d:%d %d %d",
                                  &c,
                                  &red,
@@ -7236,11 +7240,11 @@ overlap_test(bool recur GCC_UNUSED)
            overlap_test_0(win2, win1);
            break;
 
-       case 'c':               /* fill window A so it's visible */
+       case 'c':               /* fill window A so it is visible */
            overlap_test_1(flavor[otBASE_fill], 0, win1, 'A');
            break;
 
-       case 'd':               /* fill window B so it's visible */
+       case 'd':               /* fill window B so it is visible */
            overlap_test_1(flavor[otBASE_fill], 1, win2, 'B');
            break;
 
@@ -7436,11 +7440,11 @@ x_overlap_test(bool recur GCC_UNUSED)
            overlap_test_0(win2, win1);
            break;
 
-       case 'c':               /* fill window A so it's visible */
+       case 'c':               /* fill window A so it is visible */
            x_overlap_test_1(flavor[otBASE_fill], 0, win1, WIDE_A);
            break;
 
-       case 'd':               /* fill window B so it's visible */
+       case 'd':               /* fill window B so it is visible */
            x_overlap_test_1(flavor[otBASE_fill], 1, win2, WIDE_B);
            break;
 
@@ -7855,7 +7859,7 @@ main_menu(bool top)
 
        if (doit != NULL && doit(FALSE) == OK) {
            /*
-            * This may be overkill; it's intended to reset everything back
+            * This may be overkill; it is intended to reset everything back
             * to the initial terminal modes so that tests don't get in
             * each other's way.
             */