ncurses 5.9 - patch 20140831

[ncurses.git] / test / test_addstr.c

diff --git a/test/test_addstr.c b/test/test_addstr.c
index 5cc184a2d4b23a2e806d78b9c6c5040555376d06..a14cdedcc9e04f05956e4d6cdbb38c9a42f7f095 100644 (file)
--- a/test/test_addstr.c
+++ b/test/test_addstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2009,2010 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2009-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: test_addstr.c,v 1.6 2010/12/12 00:17:37 tom Exp $
+ * $Id: test_addstr.c,v 1.10 2012/12/16 00:14:10 tom Exp $

  *
  * Demonstrate the waddstr() and waddch functions.
  * Thomas Dickey - 2009/9/12
  *
  * Demonstrate the waddstr() and waddch functions.
  * Thomas Dickey - 2009/9/12


@@ -161,6 +161,15 @@ test_adds(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 added 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;


@@ -194,14 +203,8 @@ test_adds(int level)
 
     doupdate();
 
 
     doupdate();
 

-    /*
-     * Show the characters added 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)) {


@@ -210,11 +213,13 @@ test_adds(int level)
        case key_RECUR:
            test_adds(level + 1);
 
        case key_RECUR:
            test_adds(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);
 


@@ -361,8 +366,8 @@ test_adds(int level)
            break;
        }
     }
            break;
        }
     }

+    delwin(show);

     if (level > 0) {
     if (level > 0) {

-       delwin(show);

        delwin(work);
        delwin(look);
     }
        delwin(work);
        delwin(look);
     }