ncurses 6.0 - patch 20170610

[ncurses.git] / test / redraw.c

diff --git a/test/redraw.c b/test/redraw.c
index ce98259c321734baee31572131146f84f3571a5c..b74c6e53739c9ec6d141c3794d9df89656ac8106 100644 (file)
--- a/test/redraw.c
+++ b/test/redraw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2006-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,13 +26,14 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: redraw.c,v 1.3 2006/11/04 23:20:27 tom Exp $
+ * $Id: redraw.c,v 1.9 2017/04/15 19:57:47 tom Exp $
  *
  * Demonstrate the redrawwin() and wredrawln() functions.
  * Thomas Dickey - 2006/11/4
  */
 
 #include <test.priv.h>
+#include <popup_msg.h>
 
 static void
 trash(int beg_x, int max_x, int cur_x)
@@ -53,11 +54,30 @@ trash(int beg_x, int max_x, int cur_x)
     for (x = max_x; x > cur_x; --x) {
        putchar('\b');
     }
+    fflush(stdout);
 }
 
 static void
 test_redraw(WINDOW *win)
 {
+    static const char *help[] =
+    {
+       "Commands:",
+       "  ^Q/ESC/q   - quit",
+       "  w          - recur in a new window",
+       "  !          - overwrite current line using stdio outside curses.",
+#ifdef NCURSES_VERSION
+       "  @          - run \"date\" command, to put its output on screen.",
+#endif
+       "  ^L         - call redrawwin() for current window.",
+       "  ^W         - call wredrawln() for current line/current window.",
+       "  arrow-keys - move cursor on the screen",
+       "",
+       "Other control characters are added to the screen in printable form.",
+       "Other printable characters are added to the screen as is.",
+       0
+    };
+
     WINDOW *win1;
     WINDOW *win2;
     bool done = FALSE;
@@ -65,6 +85,8 @@ test_redraw(WINDOW *win)
     int max_y, max_x;
     int beg_y, beg_x;
 
+    assert(win != 0);
+
     scrollok(win, TRUE);
     keypad(win, TRUE);
     getmaxyx(win, max_y, max_x);
@@ -75,6 +97,7 @@ test_redraw(WINDOW *win)
        switch (ch) {
        case 'q':
            /* FALLTHRU */
+       case QUIT:
        case ESCAPE:
            done = TRUE;
            break;
@@ -111,7 +134,7 @@ test_redraw(WINDOW *win)
             * using mvcur().  It is ifdef'd for NCURSES, since X/Open does
             * not define the case where the old location is unknown. 
             */
-           system("date");
+           IGNORE_RC(system("date"));
            mvcur(-1, -1, y, x);
            break;
 #endif
@@ -144,11 +167,16 @@ test_redraw(WINDOW *win)
                wmove(win, y, x + 1);
            break;
 
+       case HELP_KEY_1:
+           popup_msg(win, help);
+           break;
+
        default:
            if (ch > KEY_MIN) {
                waddstr(win, keyname(ch));
+               waddch(win, '\n');
            } else {
-               waddstr(win, unctrl(ch));
+               waddstr(win, unctrl(UChar(ch)));
            }
            break;
        }