ncurses 5.7 - patch 20100116

[ncurses.git] / test / ins_wide.c

diff --git a/test/ins_wide.c b/test/ins_wide.c
index c9c1a66cba2a8161504b16269140ac18a3ef6d7f..4b95216951ca2fa0435cd7b0930d06fd62577485 100644 (file)
--- a/test/ins_wide.c
+++ b/test/ins_wide.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2007,2009 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: ins_wide.c,v 1.8 2007/03/11 00:18:29 tom Exp $
+ * $Id: ins_wide.c,v 1.11 2009/09/12 23:02:26 tom Exp $
  *
  * Demonstrate the wins_wstr() and wins_wch functions.
  * Thomas Dickey - 2002/11/23
@@ -45,6 +45,9 @@
 
 #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
@@ -214,8 +217,7 @@ test_inserts(int level)
 {
     static bool first = TRUE;
 
-    wint_t ch;
-    int code;
+    int ch;
     int limit;
     int row = 1;
     int col;
@@ -282,30 +284,10 @@ test_inserts(int level)
        wbkgdset(work, 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) {
-       case 'w':
+       case key_RECUR:
            test_inserts(level + 1);
 
            touchwin(look);
@@ -318,7 +300,7 @@ test_inserts(int level)
 
            doupdate();
            break;
-       case CTRL('N'):
+       case key_NEWLINE:
            if (row < limit) {
                ++row;
                /* put the whole string in, all at once */
@@ -401,9 +383,6 @@ test_inserts(int level)
                beep();
            }
            break;
-       case KEY_BACKSPACE:
-           ch = '\b';
-           /* FALLTHRU */
        default:
            buffer[length++] = ch;
            buffer[length] = '\0';
@@ -473,6 +452,7 @@ usage(void)
        "Usage: inserts [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"
@@ -490,8 +470,11 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, "mn:w")) != EOF) {
+    while ((ch = getopt(argc, argv, "f:mn:w")) != -1) {
        switch (ch) {
+       case 'f':
+           init_linedata(optarg);
+           break;
        case 'm':
            m_opt = TRUE;
            break;