ncurses 6.2 - patch 20200418

[ncurses.git] / test / ins_wide.c

diff --git a/test/ins_wide.c b/test/ins_wide.c
index 33dafe4fcd05d8117d72e20566a16d3c135a037a..9f733924a44a29cf5f29b3b22251cd48ca7c6b96 100644 (file)
--- a/test/ins_wide.c
+++ b/test/ins_wide.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 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 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: ins_wide.c,v 1.9 2007/07/21 17:41:55 tom Exp $
+ * $Id: ins_wide.c,v 1.25 2020/02/02 23:34:34 tom Exp $

  *
  * Demonstrate the wins_wstr() and wins_wch functions.
  * Thomas Dickey - 2002/11/23
  *
  * Demonstrate the wins_wstr() and wins_wch functions.
  * Thomas Dickey - 2002/11/23


@@ -45,13 +46,16 @@
 
 #if USE_WIDEC_SUPPORT
 
 
 #if USE_WIDEC_SUPPORT
 

+#define WIDE_LINEDATA
+#include <linedata.h>
+

 /* definitions to make it simpler to compare with inserts.c */
 #define InsNStr    ins_nwstr
 #define InsStr     ins_wstr
 /* definitions to make it simpler to compare with inserts.c */
 #define InsNStr    ins_nwstr
 #define InsStr     ins_wstr

-#define MvInsNStr  mvins_nwstr
-#define MvInsStr   mvins_wstr
-#define MvWInsNStr mvwins_nwstr
-#define MvWInsStr  mvwins_wstr
+#define MvInsNStr  (void) mvins_nwstr
+#define MvInsStr   (void) mvins_wstr
+#define MvWInsNStr (void) mvwins_nwstr
+#define MvWInsStr  (void) mvwins_wstr

 #define WInsNStr   wins_nwstr
 #define WInsStr    wins_wstr
 
 #define WInsNStr   wins_nwstr
 #define WInsStr    wins_wstr
 


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

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

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


@@ -93,7 +97,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *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 <", level,
            showstate, length);
     wclrtoeol(win);
     wprintw(win, "Level %d,%s inserted %d characters <", level,
            showstate, length);


@@ -129,7 +133,7 @@ ColOf(wchar_t *buffer, int length, int margin)
            result += 2;
            break;
        default:
            result += 2;
            break;
        default:

-           result += wcwidth(ch);
+           result += wcwidth((wchar_t) ch);

            if (ch < 32)
                ++result;
            break;
            if (ch < 32)
                ++result;
            break;


@@ -143,7 +147,7 @@ ConvertCh(chtype source, cchar_t *target)
 {
     wchar_t tmp_wchar[2];
 
 {
     wchar_t tmp_wchar[2];
 

-    tmp_wchar[0] = source;
+    tmp_wchar[0] = (wchar_t) source;

     tmp_wchar[1] = 0;
     if (setcchar(target, tmp_wchar, A_NORMAL, 0, (void *) 0) == ERR) {
        beep();
     tmp_wchar[1] = 0;
     if (setcchar(target, tmp_wchar, A_NORMAL, 0, (void *) 0) == ERR) {
        beep();


@@ -214,8 +218,7 @@ test_inserts(int level)
 {
     static bool first = TRUE;
 
 {
     static bool first = TRUE;
 

-    wint_t ch;
-    int code;
+    int ch;

     int limit;
     int row = 1;
     int col;
     int limit;
     int row = 1;
     int col;


@@ -226,19 +229,30 @@ test_inserts(int level)
     WINDOW *work = 0;
     WINDOW *show = 0;
     int margin = (2 * MY_TABSIZE) - 1;
     WINDOW *work = 0;
     WINDOW *show = 0;
     int margin = (2 * MY_TABSIZE) - 1;

-    Options option = ((m_opt ? oMove : oDefault)
-                     | ((w_opt || (level > 0)) ? oWindow : oDefault));
+    Options option = (Options) ((int) (m_opt ? oMove : oDefault)
+                               | (int) ((w_opt || (level > 0))
+                                        ? oWindow : oDefault));

 
     if (first) {
        static char cmd[80];
        setlocale(LC_ALL, "");
 
 
     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 */
        (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;


@@ -256,14 +270,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';


@@ -272,53 +286,29 @@ 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 ((code = wget_wch(work, &ch)) != ERR) {
-
-       if (code == KEY_CODE_YES) {
-           switch (ch) {
-           case KEY_DOWN:
-               ch = CTRL('N');
-               break;
-           case KEY_BACKSPACE:
-               ch = '\b';
-               break;
-           default:
-               beep();
-               continue;
-           }
-       } else if (code == ERR) {
-           beep();
-           break;
-       }
-       if (ch == 'q')
-           break;
-
+    while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {

        wmove(work, row, margin + 1);
        switch (ch) {
        wmove(work, row, margin + 1);
        switch (ch) {

-       case 'w':
+       case key_RECUR:

            test_inserts(level + 1);
 
            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);
 
            doupdate();
            break;
            wnoutrefresh(work);
            wnoutrefresh(show);
 
            doupdate();
            break;

-       case CTRL('N'):
+       case key_NEWLINE:

            if (row < limit) {
                ++row;
                /* put the whole string in, all at once */
            if (row < limit) {
                ++row;
                /* put the whole string in, all at once */


@@ -401,11 +391,10 @@ test_inserts(int level)
                beep();
            }
            break;
                beep();
            }
            break;

-       case KEY_BACKSPACE:
-           ch = '\b';
-           /* FALLTHRU */

        default:
        default:

-           buffer[length++] = ch;
+           if (length >= BUFSIZ - 2)
+               break;
+           buffer[length++] = (wchar_t) ch;

            buffer[length] = '\0';
 
            /* put the string in, one character at a time */
            buffer[length] = '\0';
 
            /* put the string in, one character at a time */


@@ -433,19 +422,19 @@ test_inserts(int level)
            switch (option) {
            case oDefault:
                if (move(limit + row, col) != ERR) {
            switch (option) {
            case oDefault:
                if (move(limit + row, col) != ERR) {

-                   InsCh(ch);
+                   InsCh((chtype) ch);

                }
                break;
            case oMove:
                }
                break;
            case oMove:

-               MvInsCh(limit + row, col, ch);
+               MvInsCh(limit + row, col, (chtype) ch);

                break;
            case oWindow:
                if (wmove(work, limit + row, col) != ERR) {
                break;
            case oWindow:
                if (wmove(work, limit + row, col) != ERR) {

-                   WInsCh(work, ch);
+                   WInsCh(work, (chtype) ch);

                }
                break;
            case oMoveWindow:
                }
                break;
            case oMoveWindow:

-               MvWInsCh(work, limit + row, col, ch);
+               MvWInsCh(work, limit + row, col, (chtype) ch);

                break;
            }
 
                break;
            }
 


@@ -459,10 +448,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


@@ -470,9 +459,10 @@ usage(void)
 {
     static const char *tbl[] =
     {
 {
     static const char *tbl[] =
     {

-       "Usage: inserts [options]"
+       "Usage: ins_wide [options]"

        ,""
        ,"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"
        ,"  -w      use window-parameter even when stdscr would be implied"
        ,"  -n NUM  limit string-inserts to NUM bytes on ^N replay"
        ,"  -m      perform wmove/move separately from insert-functions"
        ,"  -w      use window-parameter even when stdscr would be implied"


@@ -490,8 +480,11 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
     setlocale(LC_ALL, "");
 
 
     setlocale(LC_ALL, "");
 

-    while ((ch = getopt(argc, argv, "mn:w")) != -1) {
+    while ((ch = getopt(argc, argv, "f:mn:w")) != -1) {

        switch (ch) {
        switch (ch) {

+       case 'f':
+           init_linedata(optarg);
+           break;

        case 'm':
            m_opt = TRUE;
            break;
        case 'm':
            m_opt = TRUE;
            break;