ncurses 6.0 - patch 20150822

[ncurses.git] / test / inserts.c

diff --git a/test/inserts.c b/test/inserts.c
index 308793e03f25c4c7578e1ae1d4d765ba4361ac46..ae38fa21752167566de9d00a92f67521c916f50a 100644 (file)
--- a/test/inserts.c
+++ b/test/inserts.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2010,2012 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 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: inserts.c,v 1.21 2010/05/01 19:12:26 tom Exp $
+ * $Id: inserts.c,v 1.27 2012/12/16 00:35:27 tom Exp $

  *
  * Demonstrate the winsstr() and winsch functions.
  * Thomas Dickey - 2002/10/19
  *
  * Demonstrate the winsstr() and winsch functions.
  * Thomas Dickey - 2002/10/19


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

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

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


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


@@ -167,6 +167,15 @@ test_inserts(int level)
        (void) cbreak();        /* take input chars one at a time, no wait for \n */
        (void) noecho();        /* don't echo input */
        keypad(stdscr, TRUE);
        (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;


@@ -200,14 +209,8 @@ 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 ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {
     }
 
     while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {


@@ -216,11 +219,13 @@ test_inserts(int level)
        case key_RECUR:
            test_inserts(level + 1);
 
        case key_RECUR:
            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);
 
            wnoutrefresh(work);
            wnoutrefresh(show);
 


@@ -368,10 +373,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