ncurses 6.2 - patch 20200418

[ncurses.git] / test / test_addwstr.c

diff --git a/test/test_addwstr.c b/test/test_addwstr.c
index ff5a3505029558254b2eb8b480e74f2c309767d5..22cacb91b09454e46d47be3c3c7800502c9230f8 100644 (file)
--- a/test/test_addwstr.c
+++ b/test/test_addwstr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2009-2012,2014 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2009-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            *
@@ -26,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addwstr.c,v 1.12 2014/08/02 17:24:55 tom Exp $
+ * $Id: test_addwstr.c,v 1.17 2020/02/02 23:34:34 tom Exp $
  *
  * Demonstrate the waddwstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
@@ -48,12 +49,16 @@
 #define WIDE_LINEDATA
 #include <linedata.h>
 
+#undef AddCh
 #undef MvAddCh
 #undef MvAddStr
 #undef MvWAddCh
 #undef MvWAddStr
+#undef WAddCh
 
-/* definitions to make it simpler to compare with inserts.c */
+/*
+ * redefinitions to simplify comparison between test_*str programs
+ */
 #define AddNStr    addnwstr
 #define AddStr     addwstr
 #define MvAddNStr  (void) mvaddnwstr
@@ -103,8 +108,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length)
     wprintw(win,
            "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 <", level,
-           showstate, length);
+    wprintw(win, "Level %d,%s added %d characters <", level, showstate, length);
     waddwstr(win, buffer);
     waddstr(win, ">");
 }
@@ -218,7 +222,7 @@ AddCh(chtype ch)
 
 #define LEN(n) ((length - (n) > n_opt) ? n_opt : (length - (n)))
 static void
-test_inserts(int level)
+recursive_test(int level)
 {
     static bool first = TRUE;
 
@@ -233,15 +237,19 @@ test_inserts(int level)
     WINDOW *work = 0;
     WINDOW *show = 0;
     int margin = (2 * MY_TABSIZE) - 1;
-    Options option = (Options) ((int) (m_opt ? oMove : oDefault)
-                               | (int) ((w_opt || (level > 0))
-                                        ? oWindow : oDefault));
+    Options option = (Options) ((unsigned) (m_opt
+                                           ? oMove
+                                           : oDefault)
+                               | (unsigned) ((w_opt || (level > 0))
+                                             ? oWindow
+                                             : oDefault));
 
     if (first) {
        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 */
@@ -249,7 +257,7 @@ test_inserts(int level)
        keypad(stdscr, TRUE);
 
        /*
-        * Show the characters inserted in color, to distinguish from those that
+        * Show the characters added in color, to distinguish from those that
         * are shifted.
         */
        if (has_colors()) {
@@ -297,7 +305,7 @@ test_inserts(int level)
        wmove(work, row, margin + 1);
        switch (ch) {
        case key_RECUR:
-           test_inserts(level + 1);
+           recursive_test(level + 1);
 
            if (look)
                touchwin(look);
@@ -367,7 +375,7 @@ test_inserts(int level)
                    break;
                }
 
-               /* do the corresponding single-character insertion */
+               /* do the corresponding single-character add */
                row2 = limit + row;
                for (col = 0; col < length; ++col) {
                    col2 = ColOf(buffer, col, margin);
@@ -422,7 +430,7 @@ test_inserts(int level)
                break;
            }
 
-           /* do the corresponding single-character insertion */
+           /* do the corresponding single-character add */
            switch (option) {
            case oDefault:
                if (move(limit + row, col) != ERR) {
@@ -463,12 +471,12 @@ usage(void)
 {
     static const char *tbl[] =
     {
-       "Usage: inserts [options]"
+       "Usage: test_addwstr [options]"
        ,""
        ,"Options:"
        ,"  -f FILE read data from given file"
-       ,"  -n NUM  limit string-inserts to NUM bytes on ^N replay"
-       ,"  -m      perform wmove/move separately from insert-functions"
+       ,"  -n NUM  limit string-adds to NUM bytes on ^N replay"
+       ,"  -m      perform wmove/move separately from add-functions"
        ,"  -w      use window-parameter even when stdscr would be implied"
     };
     unsigned n;
@@ -508,7 +516,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     if (optind < argc)
        usage();
 
-    test_inserts(0);
+    recursive_test(0);
     endwin();
     ExitProgram(EXIT_SUCCESS);
 }