ncurses 6.1 - patch 20180929

[ncurses.git] / test / inchs.c

diff --git a/test/inchs.c b/test/inchs.c
index 180d3245db3388be1c9c268b93ce3ae8922d69f7..87a8e6706d5310683bb1049c6aa52ee2d6c0dfda 100644 (file)
--- a/test/inchs.c
+++ b/test/inchs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2007-2012,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 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: inchs.c,v 1.9 2007/07/21 19:01:43 tom Exp $
+ * $Id: inchs.c,v 1.16 2017/09/06 09:20:42 tom Exp $
  *
  * Author: Thomas E Dickey
  */
@@ -46,10 +46,21 @@
 */
 
 #include <test.priv.h>
+#include <popup_msg.h>
 
 #define BASE_Y 7
 #define MAX_COLS 1024
 
+static void
+failed(const char *s)
+{
+    int save = errno;
+    endwin();
+    errno = save;
+    perror(s);
+    ExitProgram(EXIT_FAILURE);
+}
+
 static bool
 Quit(int ch)
 {
@@ -59,6 +70,17 @@ Quit(int ch)
 static int
 test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 {
+    static const char *help[] =
+    {
+       "Test input from screen using inch(), etc., in a moveable viewport.",
+       "",
+       "Commands:",
+       " ESC/^Q                   - quit",
+       " h,j,k,l (and arrow-keys) - move viewport",
+       " w                        - recur to new window",
+       "                            for next input file",
+       0
+    };
     WINDOW *txtbox = 0;
     WINDOW *txtwin = 0;
     FILE *fp;
@@ -87,6 +109,8 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
        txtwin = stdscr;
        base_y = BASE_Y;
     }
+    if (txtwin == 0)
+       failed("cannot create txtwin");
 
     keypad(txtwin, TRUE);      /* enable keyboard mapping */
     (void) cbreak();           /* take input chars one at a time, no wait for \n */
@@ -147,21 +171,24 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
                wnoutrefresh(txtwin);
            }
            break;
+       case HELP_KEY_1:
+           popup_msg(txtwin, help);
+           break;
        default:
            beep();
            break;
        }
 
-       mvwprintw(chrwin, 0, 0, "char:");
+       MvWPrintw(chrwin, 0, 0, "char:");
        wclrtoeol(chrwin);
 
        if (txtwin != stdscr) {
            wmove(txtwin, txt_y, txt_x);
 
-           if ((ch = winch(txtwin)) != ERR) {
+           if ((ch = (int) winch(txtwin)) != ERR) {
                if (waddch(chrwin, (chtype) ch) != ERR) {
                    for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
-                       if ((ch = mvwinch(txtwin, txt_y, j)) != ERR) {
+                       if ((ch = (int) mvwinch(txtwin, txt_y, j)) != ERR) {
                            if (waddch(chrwin, (chtype) ch) == ERR) {
                                break;
                            }
@@ -174,10 +201,10 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
        } else {
            move(txt_y, txt_x);
 
-           if ((ch = inch()) != ERR) {
+           if ((ch = (int) inch()) != ERR) {
                if (waddch(chrwin, (chtype) ch) != ERR) {
                    for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
-                       if ((ch = mvinch(txt_y, j)) != ERR) {
+                       if ((ch = (int) mvinch(txt_y, j)) != ERR) {
                            if (waddch(chrwin, (chtype) ch) == ERR) {
                                break;
                            }
@@ -190,7 +217,7 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
        }
        wnoutrefresh(chrwin);
 
-       mvwprintw(strwin, 0, 0, "text:");
+       MvWPrintw(strwin, 0, 0, "text:");
        wclrtobot(strwin);
 
        limit = getmaxx(strwin) - 5;
@@ -198,38 +225,38 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
        if (txtwin != stdscr) {
            wmove(txtwin, txt_y, txt_x);
            if (winchstr(txtwin, text) != ERR) {
-               mvwaddchstr(strwin, 0, 5, text);
+               MvWAddChStr(strwin, 0, 5, text);
            }
 
            wmove(txtwin, txt_y, txt_x);
            if (winchnstr(txtwin, text, limit) != ERR) {
-               mvwaddchstr(strwin, 1, 5, text);
+               MvWAddChStr(strwin, 1, 5, text);
            }
 
            if (mvwinchstr(txtwin, txt_y, txt_x, text) != ERR) {
-               mvwaddchstr(strwin, 2, 5, text);
+               MvWAddChStr(strwin, 2, 5, text);
            }
 
            if (mvwinchnstr(txtwin, txt_y, txt_x, text, limit) != ERR) {
-               mvwaddchstr(strwin, 3, 5, text);
+               MvWAddChStr(strwin, 3, 5, text);
            }
        } else {
            move(txt_y, txt_x);
            if (inchstr(text) != ERR) {
-               mvwaddchstr(strwin, 0, 5, text);
+               MvWAddChStr(strwin, 0, 5, text);
            }
 
            move(txt_y, txt_x);
            if (inchnstr(text, limit) != ERR) {
-               mvwaddchstr(strwin, 1, 5, text);
+               MvWAddChStr(strwin, 1, 5, text);
            }
 
            if (mvinchstr(txt_y, txt_x, text) != ERR) {
-               mvwaddchstr(strwin, 2, 5, text);
+               MvWAddChStr(strwin, 2, 5, text);
            }
 
            if (mvinchnstr(txt_y, txt_x, text, limit) != ERR) {
-               mvwaddchstr(strwin, 3, 5, text);
+               MvWAddChStr(strwin, 3, 5, text);
            }
        }
 
@@ -252,7 +279,7 @@ main(int argc, char *argv[])
     setlocale(LC_ALL, "");
 
     if (argc < 2) {
-       fprintf(stderr, "usage: %s file\n", argv[0]);
+       fprintf(stderr, "usage: %s file1 [file2 [...]]\n", argv[0]);
        return EXIT_FAILURE;
     }