ncurses 6.3 - patch 20220521

[ncurses.git] / test / padview.c

diff --git a/test/padview.c b/test/padview.c
index 3b4e052ad54b9bb0052f4339c73b2a205aa0e9c8..868dbfeda2142abe051f7fa96df96e0b317afab8 100644 (file)
--- a/test/padview.c
+++ b/test/padview.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2017 Free Software Foundation, Inc.                        *
+ * Copyright 2019-2021,2022 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            *
  *                                                                          *
  * 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
  *
 /*
  * clone of view.c, using pads
  *

- * $Id: padview.c,v 1.12 2017/10/23 00:37:21 tom Exp $
+ * $Id: padview.c,v 1.19 2022/05/15 14:36:23 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -40,10 +41,11 @@
 
 #if HAVE_NEWPAD
 
 
 #if HAVE_NEWPAD
 

-static void finish(int sig) GCC_NORETURN;
+static GCC_NORETURN void finish(int sig);

 
 #define my_pair 1
 
 
 #define my_pair 1
 

+static WINDOW *global_pad;

 static int shift = 0;
 static bool try_color = FALSE;
 
 static int shift = 0;
 static bool try_color = FALSE;
 


@@ -54,7 +56,7 @@ static int num_lines;
 static bool n_option = FALSE;
 #endif
 
 static bool n_option = FALSE;
 #endif
 

-static void usage(void) GCC_NORETURN;
+static GCC_NORETURN void usage(void);

 
 static void
 failed(const char *msg)
 
 static void
 failed(const char *msg)


@@ -68,6 +70,8 @@ static void
 finish(int sig)
 {
     endwin();
 finish(int sig)
 {
     endwin();

+    if (global_pad != NULL)
+       delwin(global_pad);

     ExitProgram(sig != 0 ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
     ExitProgram(sig != 0 ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 


@@ -89,7 +93,7 @@ show_all(const char *tag, WINDOW *my_pad, int my_row)
     _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
                "view %.*s", (int) strlen(tag), tag);
     i = (int) strlen(temp);
     _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp))
                "view %.*s", (int) strlen(tag), tag);
     i = (int) strlen(temp);

-    _nc_SPRINTF(temp + i, _nc_SLIMIT(sizeof(temp) - i)
+    _nc_SPRINTF(temp + i, _nc_SLIMIT(sizeof(temp) - (size_t) i)

                " %.*s", (int) sizeof(temp) - i - 2, fname);
     mvprintw(0, 0, "%.*s", COLS, temp);
     this_time = time((time_t *) 0);
                " %.*s", (int) sizeof(temp) - i - 2, fname);
     mvprintw(0, 0, "%.*s", COLS, temp);
     this_time = time((time_t *) 0);


@@ -143,9 +147,12 @@ read_file(const char *filename)
     }
 
     len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
     }
 
     len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);

-    my_blob[sb.st_size] = '\0';

     fclose(fp);
 
     fclose(fp);
 

+    if (len > (size_t) sb.st_size)
+       len = (size_t) sb.st_size;
+    my_blob[len] = '\0';
+

     for (pass = 0; pass < 2; ++pass) {
        char *base = my_blob;
        k = 0;
     for (pass = 0; pass < 2; ++pass) {
        char *base = my_blob;
        k = 0;


@@ -159,12 +166,19 @@ read_file(const char *filename)
                ++k;
            }
        }
                ++k;
            }
        }

+       if (base != (my_blob + j)) {
+           if (pass)
+               my_vec[k] = base;
+           ++k;
+       }

        num_lines = k;
        num_lines = k;

-       if (base != (my_blob + j))
-           ++num_lines;
-       if (!pass &&
-           ((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) {
-           failed("cannot allocate line-vector #1");
+       if (pass == 0) {
+           if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) {
+               failed("cannot allocate line-vector #1");
+           }
+       } else {
+           if (my_vec[0] == NULL)
+               my_vec[0] = my_blob;

        }
     }
 
        }
     }
 


@@ -191,7 +205,7 @@ read_file(const char *filename)
        failed("cannot allocate pad workspace");
     if (try_color) {
        wattrset(my_pad, COLOR_PAIR(my_pair));
        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 +338,11 @@ main(int argc, char *argv[])
                int tvalue = (int) strtol(optarg, &next, 0);
                if (tvalue < 0 || (next != 0 && *next != 0))
                    usage();
                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':
            }
            break;
        case 't':

-           trace(TRACE_CALLS);
+           curses_trace(TRACE_CALLS);

            break;
 #endif
        default:
            break;
 #endif
        default:


@@ -347,18 +361,23 @@ main(int argc, char *argv[])
        nodelay(stdscr, TRUE);
     idlok(stdscr, TRUE);       /* allow use of insert/delete line */
 
        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);
     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;
        }
     }
 
        } else {
            try_color = FALSE;
        }
     }
 

+    /*
+     * Do this after starting color, otherwise the pad's background will be
+     * uncolored after the ncurses 6.1.20181208 fixes.
+     */
+    global_pad =
+       my_pad = read_file(fname = argv[optind]);
+

     my_row = 0;
     while (!done) {
        int n, c;
     my_row = 0;
     while (!done) {
        int n, c;