X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest_add_wchstr.c;h=58ff87d5af212b0e9a1517ad63a76222ab1404eb;hp=3413a37b969782cd7ece067189ebef0620a1dc8a;hb=a924c24b2535cccdc0f5f991cd8ddcadcfa1f0d2;hpb=52aa842907b31bb56fb5133da3f023b45bd4355f diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c index 3413a37b..58ff87d5 100644 --- 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) 2009-2016,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,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_add_wchstr.c,v 1.9 2010/11/13 21:14:50 tom Exp $ + * $Id: test_add_wchstr.c,v 1.23 2017/04/08 23:10:35 tom Exp $ * * Demonstrate the waddwchstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -73,6 +73,7 @@ typedef enum { } Options; static bool m_opt = FALSE; +static bool pass_ctls = FALSE; static bool w_opt = FALSE; static int n_opt = -1; @@ -81,6 +82,7 @@ static size_t temp_length; #define TempBuffer(source_len, source_cast) \ if (source != 0) { \ + const char *temp; \ size_t need = source_len + 1; \ wchar_t have[2]; \ int n = 0; \ @@ -88,12 +90,25 @@ 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; \ do { \ have[0] = source_cast; \ - setcchar(&temp_buffer[n++], have, A_NORMAL, 0, NULL); \ + if (!pass_ctls \ + && have[0] != 0 \ + && have[0] < 256 \ + && (temp = unctrl((chtype) have[0])) != 0 \ + && strlen(temp) > 1) { \ + while (*temp != '\0') { \ + have[0] = (wchar_t) *temp++; \ + setcchar(&temp_buffer[n++], have, A_NORMAL, 0, NULL); \ + } \ + } else { \ + setcchar(&temp_buffer[n++], have, A_NORMAL, 0, NULL); \ + } \ } while (have[0] != 0); \ } else if (temp_buffer != 0) { \ free(temp_buffer); \ @@ -102,6 +117,26 @@ static size_t temp_length; } \ return temp_buffer; +static size_t +ChWLen(const wchar_t *source) +{ + size_t result = wcslen(source); + + if (!pass_ctls) { + size_t adjust = 0; + size_t n; + const char *s; + + for (n = 0; n < result; ++n) { + if (source[n] < 256 && (s = unctrl((chtype) source[n])) != 0) { + adjust += (strlen(s) - 1); + } + } + result += adjust; + } + return result; +} + static cchar_t * ChStr(const char *source) { @@ -111,13 +146,13 @@ ChStr(const char *source) static cchar_t * ChWStr(const wchar_t *source) { - TempBuffer(wcslen(source), *source++); + TempBuffer(ChWLen(source), *source++); } static void legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) { - NCURSES_CONST char *showstate; + const char *showstate; switch (state) { default: @@ -139,7 +174,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) 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 added %d characters <", level, showstate, length); @@ -175,7 +210,7 @@ ColOf(wchar_t *buffer, int length, int margin) result += 2; break; default: - result += wcwidth(ch); + result += wcwidth((wchar_t) ch); if (ch < 32) ++result; break; @@ -278,12 +313,22 @@ test_add_wchstr(int level) static char cmd[80]; setlocale(LC_ALL, ""); - putenv(strcpy(cmd, "TABSIZE=8")); + _nc_STRCPY(cmd, "TABSIZE=8", sizeof(cmd)); + putenv(cmd); initscr(); (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; @@ -317,14 +362,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)) { @@ -333,11 +372,13 @@ test_add_wchstr(int level) case key_RECUR: test_add_wchstr(level + 1); - touchwin(look); + if (look) + touchwin(look); touchwin(work); touchwin(show); - wnoutrefresh(look); + if (look) + wnoutrefresh(look); wnoutrefresh(work); wnoutrefresh(show); @@ -428,7 +469,7 @@ test_add_wchstr(int level) } break; default: - buffer[length++] = ch; + buffer[length++] = (wchar_t) ch; buffer[length] = '\0'; /* put the string in, one character at a time */ @@ -481,8 +522,8 @@ test_add_wchstr(int level) break; } } + delwin(show); if (level > 0) { - delwin(show); delwin(work); delwin(look); } @@ -499,6 +540,7 @@ usage(void) ," -f FILE read data from given file" ," -n NUM limit string-adds to NUM bytes on ^N replay" ," -m perform wmove/move separately from add-functions" + ," -p pass-thru control characters without using unctrl()" ," -w use window-parameter even when stdscr would be implied" }; unsigned n; @@ -514,7 +556,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "f:mn:w")) != -1) { + while ((ch = getopt(argc, argv, "f:mn:pw")) != -1) { switch (ch) { case 'f': init_linedata(optarg); @@ -527,6 +569,9 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) if (n_opt == 0) n_opt = -1; break; + case 'p': + pass_ctls = TRUE; + break; case 'w': w_opt = TRUE; break; @@ -540,6 +585,9 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) test_add_wchstr(0); endwin(); +#if NO_LEAKS + free(temp_buffer); +#endif ExitProgram(EXIT_SUCCESS); } #else