ncurses 6.0 - patch 20160206

[ncurses.git] / test / test_add_wchstr.c

diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c
index 78c8f37141a22e7328d16f843b1d17a07880b362..c59a3395628b536babb0953f5045af6186dff2dd 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-2012,2014 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_add_wchstr.c,v 1.13 2010/12/25 22:49:28 tom Exp $
+ * $Id: test_add_wchstr.c,v 1.21 2014/08/02 17:24:55 tom Exp $

  *
  * Demonstrate the waddwchstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
  *
  * 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 (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; \
        } \
        have[0] = 0; \
        have[1] = 0; \


@@ -101,7 +103,7 @@ static size_t temp_length;
             && (temp = unctrl((chtype) have[0])) != 0 \
             && strlen(temp) > 1) { \
                while (*temp != '\0') { \
             && (temp = unctrl((chtype) have[0])) != 0 \
             && strlen(temp) > 1) { \
                while (*temp != '\0') { \

-                   have[0] = *temp++; \
+                   have[0] = (wchar_t) *temp++; \

                    setcchar(&temp_buffer[n++], have, A_NORMAL, 0, NULL); \
                } \
            } else { \
                    setcchar(&temp_buffer[n++], have, A_NORMAL, 0, NULL); \
                } \
            } else { \


@@ -123,7 +125,7 @@ ChWLen(const wchar_t *source)
     if (!pass_ctls) {
        size_t adjust = 0;
        size_t n;
     if (!pass_ctls) {
        size_t adjust = 0;
        size_t n;

-       NCURSES_CONST char *s;
+       const char *s;

 
        for (n = 0; n < result; ++n) {
            if (source[n] < 256 && (s = unctrl((chtype) source[n])) != 0) {
 
        for (n = 0; n < result; ++n) {
            if (source[n] < 256 && (s = unctrl((chtype) source[n])) != 0) {


@@ -208,7 +210,7 @@ ColOf(wchar_t *buffer, int length, int margin)
            result += 2;
            break;
        default:
            result += 2;
            break;
        default:

-           result += wcwidth(ch);
+           result += wcwidth((wchar_t) ch);

            if (ch < 32)
                ++result;
            break;
            if (ch < 32)
                ++result;
            break;


@@ -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);
        (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;


@@ -350,14 +361,8 @@ test_add_wchstr(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)) {


@@ -366,11 +371,13 @@ test_add_wchstr(int level)
        case key_RECUR:
            test_add_wchstr(level + 1);
 
        case key_RECUR:
            test_add_wchstr(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);
 


@@ -461,7 +468,7 @@ test_add_wchstr(int level)
            }
            break;
        default:
            }
            break;
        default:

-           buffer[length++] = ch;
+           buffer[length++] = (wchar_t) ch;

            buffer[length] = '\0';
 
            /* put the string in, one character at a time */
            buffer[length] = '\0';
 
            /* put the string in, one character at a time */


@@ -514,8 +521,8 @@ test_add_wchstr(int level)
            break;
        }
     }
            break;
        }
     }

+    delwin(show);

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

-       delwin(show);

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