ncurses 5.9 - patch 20121124

[ncurses.git] / test / test_add_wchstr.c

diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c
index 08ff6ee06f1c80b186df0efb4b9e57d6fcb70a41..6b1b2d7a54be7c18babbabeae266d8e4437b67dd 100644 (file)
--- a/test/test_add_wchstr.c
+++ b/test/test_add_wchstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2009,2010 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2010-2011,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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_add_wchstr.c,v 1.12 2010/12/12 00:17:13 tom Exp $
+ * $Id: test_add_wchstr.c,v 1.19 2012/11/24 20:04:13 tom Exp $
  *
  * Demonstrate the waddwchstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
@@ -90,6 +90,8 @@ static size_t temp_length;
        if (need > temp_length) { \
            temp_length = need * 2; \
            temp_buffer = typeRealloc(cchar_t, temp_length, temp_buffer); \
+           if (!temp_buffer) \
+               failed("TempBuffer"); \
        } \
        have[0] = 0; \
        have[1] = 0; \
@@ -123,7 +125,7 @@ ChWLen(const wchar_t *source)
     if (!pass_ctls) {
        size_t adjust = 0;
        size_t n;
-       char *s;
+       const char *s;
 
        for (n = 0; n < result; ++n) {
            if (source[n] < 256 && (s = unctrl((chtype) source[n])) != 0) {
@@ -317,6 +319,15 @@ test_add_wchstr(int level)
        (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;
@@ -350,14 +361,8 @@ test_add_wchstr(int level)
 
     doupdate();
 
-    /*
-     * 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);
-       wbkgdset(work, COLOR_PAIR(1) | ' ');
+       wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' '));
     }
 
     while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {
@@ -514,8 +519,8 @@ test_add_wchstr(int level)
            break;
        }
     }
+    delwin(show);
     if (level > 0) {
-       delwin(show);
        delwin(work);
        delwin(look);
     }