ncurses 6.2 - patch 20200301

[ncurses.git] / test / inch_wide.c

diff --git a/test/inch_wide.c b/test/inch_wide.c
index 3d31f1787fa2e84b645698b8c01b5e8f1c2da678..e44a5f5128604c4dc1c5ee1bdc2ccb8e0869c267 100644 (file)
--- a/test/inch_wide.c
+++ b/test/inch_wide.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2007,2010 Free Software Foundation, Inc.                   *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2007-2010,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: inch_wide.c,v 1.7 2010/05/01 19:13:46 tom Exp $
+ * $Id: inch_wide.c,v 1.11 2020/02/02 23:34:34 tom Exp $

  */
 /*
        int in_wch(cchar_t *wcval);
  */
 /*
        int in_wch(cchar_t *wcval);


@@ -44,6 +45,7 @@
 */
 
 #include <test.priv.h>
 */
 
 #include <test.priv.h>

+#include <popup_msg.h>

 
 #if USE_WIDEC_SUPPORT
 
 
 #if USE_WIDEC_SUPPORT
 


@@ -59,13 +61,24 @@ Quit(int ch)
 static int
 test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
 {
 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;
     int j;
     int txt_x = 0, txt_y = 0;
     int base_y;
     WINDOW *txtbox = 0;
     WINDOW *txtwin = 0;
     FILE *fp;
     int j;
     int txt_x = 0, txt_y = 0;
     int base_y;

-    int limit;

     cchar_t ch;
     cchar_t text[MAX_COLS];
 
     cchar_t ch;
     cchar_t text[MAX_COLS];
 


@@ -109,6 +122,8 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     }
 
     while (!Quit(j = mvwgetch(txtwin, txt_y, txt_x))) {
     }
 
     while (!Quit(j = mvwgetch(txtwin, txt_y, txt_x))) {

+       int limit;
+

        switch (j) {
        case KEY_DOWN:
        case 'j':
        switch (j) {
        case KEY_DOWN:
        case 'j':


@@ -148,6 +163,9 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
                wnoutrefresh(txtwin);
            }
            break;
                wnoutrefresh(txtwin);
            }
            break;

+       case HELP_KEY_1:
+           popup_msg(txtwin, help);
+           break;

        default:
            beep();
            break;
        default:
            beep();
            break;


@@ -251,7 +269,7 @@ main(int argc, char *argv[])
     setlocale(LC_ALL, "");
 
     if (argc < 2) {
     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;
     }
 
        return EXIT_FAILURE;
     }