ncurses 6.1 - patch 20180303

[ncurses.git] / test / inserts.c

diff --git a/test/inserts.c b/test/inserts.c
index 9c3a89ee3b617e022b1eb156567a57687516101e..9ba373f23fbddef884c474810324c1fc8dfcd195 100644 (file)
--- a/test/inserts.c
+++ b/test/inserts.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2002-2007,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2016,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            *


@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: inserts.c,v 1.20 2009/10/10 16:01:41 tom Exp $
+ * $Id: inserts.c,v 1.29 2017/04/08 22:20:46 tom Exp $

  *
  * Demonstrate the winsstr() and winsch functions.
  * Thomas Dickey - 2002/10/19
  *
  * Demonstrate the winsstr() and winsch functions.
  * Thomas Dickey - 2002/10/19


@@ -40,16 +40,16 @@
 
 #define InsNStr    insnstr
 #define InsStr     insstr
 
 #define InsNStr    insnstr
 #define InsStr     insstr

-#define MvInsNStr  mvinsnstr
-#define MvInsStr   mvinsstr
-#define MvWInsNStr mvwinsnstr
-#define MvWInsStr  mvwinsstr
+#define MvInsNStr  (void) mvinsnstr
+#define MvInsStr   (void) mvinsstr
+#define MvWInsNStr (void) mvwinsnstr
+#define MvWInsStr  (void) mvwinsstr

 #define WInsNStr   winsnstr
 #define WInsStr    winsstr
 
 #define InsCh      insch
 #define WInsNStr   winsnstr
 #define WInsStr    winsstr
 
 #define InsCh      insch

-#define MvInsCh    mvinsch
-#define MvWInsCh   mvwinsch
+#define MvInsCh    (void) mvinsch
+#define MvWInsCh   (void) mvwinsch

 #define WInsCh     winsch
 
 #define MY_TABSIZE 8
 #define WInsCh     winsch
 
 #define MY_TABSIZE 8


@@ -68,7 +68,7 @@ static int n_opt = -1;
 static void
 legend(WINDOW *win, int level, Options state, char *buffer, int length)
 {
 static void
 legend(WINDOW *win, int level, Options state, char *buffer, int length)
 {

-    NCURSES_CONST char *showstate;
+    const char *showstate;

 
     switch (state) {
     default:
 
     switch (state) {
     default:


@@ -90,7 +90,7 @@ legend(WINDOW *win, int level, Options state, char *buffer, int length)
     wprintw(win,
            "The Strings/Chars displays should match.  Enter any characters, except:\n");
     wprintw(win,
     wprintw(win,
            "The Strings/Chars displays should match.  Enter any characters, except:\n");
     wprintw(win,

-           "down-arrow or ^N to repeat on next line, 'w' for inner window, 'q' to exit.\n");
+           "down-arrow or ^N to repeat on next line, ^W for inner window, ESC to exit.\n");

     wclrtoeol(win);
     wprintw(win, "Level %d,%s inserted %d characters <%s>", level,
            showstate, length, buffer);
     wclrtoeol(win);
     wprintw(win, "Level %d,%s inserted %d characters <%s>", level,
            showstate, length, buffer);


@@ -161,12 +161,22 @@ test_inserts(int level)
        static char cmd[80];
        setlocale(LC_ALL, "");
 
        static char cmd[80];
        setlocale(LC_ALL, "");
 

-       putenv(strcpy(cmd, "TABSIZE=8"));
+       _nc_STRCPY(cmd, "TABSIZE=8", sizeof(cmd));
+       putenv(cmd);

 
        initscr();
        (void) cbreak();        /* take input chars one at a time, no wait for \n */
        (void) noecho();        /* don't echo input */
        keypad(stdscr, TRUE);
 
        initscr();
        (void) cbreak();        /* take input chars one at a time, no wait for \n */
        (void) noecho();        /* don't echo input */
        keypad(stdscr, TRUE);

+
+       /*
+        * Show the characters inserted in color, to distinguish from those
+        * that are shifted.
+        */
+       if (has_colors()) {
+           start_color();
+           init_pair(1, COLOR_WHITE, COLOR_BLUE);
+       }

     }
 
     limit = LINES - 5;
     }
 
     limit = LINES - 5;


@@ -184,14 +194,14 @@ test_inserts(int level)
     keypad(work, TRUE);
 
     for (col = margin + 1; col < COLS; col += MY_TABSIZE)
     keypad(work, TRUE);
 
     for (col = margin + 1; col < COLS; col += MY_TABSIZE)

-       mvwvline(work, row, col, '.', limit - 2);
+       MvWVLine(work, row, col, '.', limit - 2);

 
 

-    mvwvline(work, row, margin, ACS_VLINE, limit - 2);
-    mvwvline(work, row, margin + 1, ACS_VLINE, limit - 2);
+    MvWVLine(work, row, margin, ACS_VLINE, limit - 2);
+    MvWVLine(work, row, margin + 1, ACS_VLINE, limit - 2);

     limit /= 2;
 
     limit /= 2;
 

-    mvwaddstr(work, 1, 2, "String");
-    mvwaddstr(work, limit + 1, 2, "Chars");
+    MvWAddStr(work, 1, 2, "String");
+    MvWAddStr(work, limit + 1, 2, "Chars");

     wnoutrefresh(work);
 
     buffer[length = 0] = '\0';
     wnoutrefresh(work);
 
     buffer[length = 0] = '\0';


@@ -200,14 +210,8 @@ test_inserts(int level)
 
     doupdate();
 
 
     doupdate();
 

-    /*
-     * Show the characters inserted in color, to distinguish from those that
-     * are shifted.
-     */

     if (has_colors()) {
     if (has_colors()) {

-       start_color();
-       init_pair(1, COLOR_WHITE, COLOR_BLUE);
-       wbkgdset(work, COLOR_PAIR(1) | ' ');
+       wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' '));

     }
 
     while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {
     }
 
     while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {


@@ -216,11 +220,13 @@ test_inserts(int level)
        case key_RECUR:
            test_inserts(level + 1);
 
        case key_RECUR:
            test_inserts(level + 1);
 

-           touchwin(look);
+           if (look)
+               touchwin(look);

            touchwin(work);
            touchwin(show);
 
            touchwin(work);
            touchwin(show);
 

-           wnoutrefresh(look);
+           if (look)
+               wnoutrefresh(look);

            wnoutrefresh(work);
            wnoutrefresh(show);
 
            wnoutrefresh(work);
            wnoutrefresh(show);
 


@@ -314,6 +320,8 @@ test_inserts(int level)
                beep();
                break;
            }
                beep();
                break;
            }

+           if (length >= BUFSIZ - 2)
+               break;

            buffer[length++] = (char) ch;
            buffer[length] = '\0';
 
            buffer[length++] = (char) ch;
            buffer[length] = '\0';
 


@@ -368,10 +376,10 @@ test_inserts(int level)
        }
     }
     if (level > 0) {
        }
     }
     if (level > 0) {

-       delwin(show);

        delwin(work);
        delwin(look);
     }
        delwin(work);
        delwin(look);
     }

+    delwin(show);

 }
 
 static void
 }
 
 static void