X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fncurses.c;h=37693ac4e6c07c19b2b507a0c2239a0848f2d125;hp=a01b6facfcce2060c50df37178a9376c11b91c28;hb=c2650100f80134924eda8f22cd7cc1d1d919ee3d;hpb=b5be26931d6488adcb1ff8bc07df9de378ce0d27 diff --git a/test/ncurses.c b/test/ncurses.c index a01b6fac..37693ac4 100644 --- a/test/ncurses.c +++ b/test/ncurses.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * + * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 1998-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 * @@ -40,7 +41,7 @@ AUTHOR Author: Eric S. Raymond 1993 Thomas E. Dickey (beginning revision 1.27 in 1996). -$Id: ncurses.c,v 1.487 2017/10/28 00:54:41 tom Exp $ +$Id: ncurses.c,v 1.524 2021/03/20 16:11:50 tom Exp $ ***************************************************************************/ @@ -165,7 +166,7 @@ static RGB_DATA *all_colors; #endif static void main_menu(bool); -static void failed(const char *s) GCC_NORETURN; +static GCC_NORETURN void failed(const char *s); static void failed(const char *s) @@ -210,7 +211,7 @@ wGetchar(WINDOW *win) } else { _nc_tracing = save_trace; } - trace(_nc_tracing); + curses_trace(_nc_tracing); if (_nc_tracing) Trace(("TOGGLE-TRACING ON")); } @@ -226,7 +227,7 @@ wGetchar(WINDOW *win) static void wGetstring(WINDOW *win, char *buffer, int limit) { - int y0, x0, x, ch; + int y0, x0, x; bool done = FALSE; echo(); @@ -235,6 +236,7 @@ wGetstring(WINDOW *win, char *buffer, int limit) x = (int) strlen(buffer); while (!done) { + int ch; if (x > (int) strlen(buffer)) x = (int) strlen(buffer); wmove(win, y0, x0); @@ -343,7 +345,7 @@ wGet_wchar(WINDOW *win, wint_t *result) } else { _nc_tracing = save_trace; } - trace(_nc_tracing); + curses_trace(_nc_tracing); if (_nc_tracing) Trace(("TOGGLE-TRACING ON")); } @@ -355,6 +357,7 @@ wGet_wchar(WINDOW *win, wint_t *result) #define Get_wchar(result) wGet_wchar(stdscr, result) /* replaces wgetn_wstr(), since we want to be able to edit values */ +#if USE_SOFTKEYS static void wGet_wstring(WINDOW *win, wchar_t *buffer, int limit) { @@ -460,8 +463,9 @@ wGet_wstring(WINDOW *win, wchar_t *buffer, int limit) wmove(win, y0, x0); noecho(); } +#endif /* USE_SOFTKEYS */ -#endif +#endif /* USE_WIDEC_SUPPORT */ static void Pause(void) @@ -486,7 +490,7 @@ ShellOut(bool message) addstr("Shelling out..."); def_prog_mode(); endwin(); -#ifdef __MINGW32__ +#ifdef _NC_WINDOWS system("cmd.exe"); #else IGNORE_RC(system("sh")); @@ -577,7 +581,6 @@ mouse_decode(MEVENT const *ep) static void show_mouse(WINDOW *win) { - int y, x; MEVENT event; bool outside; bool show_loc; @@ -600,6 +603,7 @@ show_mouse(WINDOW *win) show_loc = wmouse_trafo(win, &event.y, &event.x, FALSE); if (show_loc) { + int y, x; getyx(win, y, x); wmove(win, event.y, event.x); waddch(win, '*'); @@ -816,7 +820,6 @@ wgetch_test(unsigned level, WINDOW *win, int delay) { char buf[BUFSIZ]; int first_y, first_x; - int c; int incount = 0; GetchFlags flags; @@ -830,6 +833,8 @@ wgetch_test(unsigned level, WINDOW *win, int delay) scrollok(win, TRUE); for (;;) { + int c; + while ((c = wGetchar(win)) == ERR) { incount++; if (blocking_getch(flags, delay)) { @@ -1074,7 +1079,6 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) wint_t c; int incount = 0; GetchFlags flags; - int code; char *temp; init_getch(win, flags, delay); @@ -1087,6 +1091,8 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) scrollok(win, TRUE); for (;;) { + int code; + while ((code = wGet_wchar(win, &c)) == ERR) { incount++; if (blocking_getch(flags, delay)) { @@ -1383,9 +1389,10 @@ adjust_attr_string(int adjust) { char save = attr_test_string[0]; int first = ((int) UChar(save)) + adjust; - int j, k; if (first >= ATTRSTRING_1ST) { + int j, k; + for (j = 0, k = first; j < MAX_ATTRSTRING; ++j, ++k) { if (k > ATTRSTRING_END) break; @@ -1449,10 +1456,9 @@ show_attr(WINDOW *win, int row, int skip, bool arrow, chtype attr, const char *n werase(win); if (attr & A_ALTCHARSET) { const char *s; - chtype ch; for (s = attr_test_string; *s != '\0'; ++s) { - ch = UChar(*s); + chtype ch = UChar(*s); (void) waddch(win, ch | attr); } } else { @@ -1660,12 +1666,13 @@ attr_test(bool recur GCC_UNUSED) NCURSES_COLOR_T bg = COLOR_BLACK; NCURSES_COLOR_T tx = -1; int ac = 0; - unsigned j, k; WINDOW *my_wins[SIZEOF(attrs_to_test)]; ATTR_TBL my_list[SIZEOF(attrs_to_test)]; unsigned my_size = init_attr_list(my_list, termattrs()); if (my_size > 1) { + unsigned j, k; + for (j = 0; j < my_size; ++j) { my_wins[j] = subwin(stdscr, 1, LEN_ATTRSTRING, @@ -1789,9 +1796,10 @@ wide_adjust_attr_string(int adjust) { wchar_t save = wide_attr_test_string[0]; int first = ((int) normal_wchar(save)) + adjust; - int j, k; if (first >= ATTRSTRING_1ST) { + int j, k; + for (j = 0, k = first; j < MAX_ATTRSTRING; ++j, ++k) { if (k > ATTRSTRING_END) break; @@ -1841,10 +1849,11 @@ get_wide_background(void) attr_t attr; cchar_t ch; NCURSES_PAIRS_T pair; - wchar_t wch[CCHARW_MAX]; memset(&ch, 0, sizeof(ch)); if (getbkgrnd(&ch) != ERR) { + wchar_t wch[CCHARW_MAX]; + if (getcchar(&ch, wch, &attr, &pair, 0) != ERR) { result = attr; } @@ -2020,12 +2029,13 @@ x_attr_test(bool recur GCC_UNUSED) NCURSES_COLOR_T bg = COLOR_BLACK; NCURSES_COLOR_T tx = -1; int ac = 0; - unsigned j, k; W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)]; WINDOW *my_wins[SIZEOF(w_attrs_to_test)]; unsigned my_size = init_w_attr_list(my_list, term_attrs()); if (my_size > 1) { + unsigned j, k; + for (j = 0; j < my_size; ++j) { my_wins[j] = subwin(stdscr, 1, LEN_ATTRSTRING, @@ -2124,16 +2134,24 @@ static NCURSES_CONST char *the_color_names[] = }; static void -show_color_name(int y, int x, int color, bool wide) +show_color_name(int y, int x, int color, bool wide, int zoom) { if (move(y, x) != ERR) { char temp[80]; int width = 8; - if (wide) { + if (wide || zoom) { _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%02d", color); - width = 4; + if (wide) + width = 4; + if ((int) strlen(temp) >= width) { + int pwr2 = 0; + while ((1 << pwr2) < color) + ++pwr2; + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + width > 4 ? "2^%d" : "^%d", pwr2); + } } else if (color >= 8) { _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "[%02d]", color); @@ -2180,7 +2198,9 @@ color_legend(WINDOW *helpwin, bool wide) MvWPrintw(helpwin, row++, col, " r/R toggle reverse on/off"); MvWPrintw(helpwin, row++, col, - " w/W toggle width between 8/16 colors"); + " w/W switch width between 4/8 columns"); + MvWPrintw(helpwin, row++, col, + " z/Z zoom out (or in)"); #if USE_WIDEC_SUPPORT if (wide) { MvWPrintw(helpwin, row++, col, @@ -2246,6 +2266,7 @@ color_test(bool recur GCC_UNUSED) bool opt_revs = FALSE; bool opt_nums = FALSE; bool opt_wide = FALSE; + int opt_zoom = 0; WINDOW *helpwin; if (!UseColors) { @@ -2253,7 +2274,7 @@ color_test(bool recur GCC_UNUSED) return ERR; } - numbered = (char *) calloc((size_t) (COLS + 1), sizeof(char)); + numbered = typeCalloc(char, COLS + 1); done = ((COLS < 16) || (numbered == 0)); /* @@ -2262,28 +2283,33 @@ color_test(bool recur GCC_UNUSED) */ for (col_limit = 1; col_limit * 2 < COLS; col_limit *= 2) ; + reloop: while (!done) { int shown = 0; - double colors_max2 = (double) colors_max * (double) colors_max; + int zoom_size = (1 << opt_zoom); + int colors_max1 = colors_max / zoom_size; + double colors_max2 = (double) colors_max1 * (double) colors_max1; pairs_max = PAIR_NUMBER(A_COLOR) + 1; if (colors_max2 <= COLOR_PAIRS) { - int limit = (colors_max - MinColors) * (colors_max - MinColors); + int limit = (colors_max1 - MinColors) * (colors_max1 - MinColors); if (pairs_max > limit) pairs_max = limit; } - if (pairs_max < COLOR_PAIRS) + if (pairs_max > COLOR_PAIRS) pairs_max = COLOR_PAIRS; + if (pairs_max < colors_max1) + pairs_max = colors_max1; /* this assumes an 80-column line */ if (opt_wide) { width = 4; hello = "Test"; - per_row = (col_limit / ((colors_max > 8) ? 4 : 8)); + per_row = (col_limit / ((colors_max1 > 8) ? width : 8)); } else { width = 8; hello = "Hello"; - per_row = (col_limit / 8); + per_row = (col_limit / width); } per_row -= MinColors; @@ -2292,10 +2318,12 @@ color_test(bool recur GCC_UNUSED) move(0, 0); (void) printw("There are %d color pairs and %d colors", pairs_max, COLORS); - if (colors_max != COLORS) - (void) printw(" (using %d colors)", colors_max); + if (colors_max1 != COLORS) + (void) printw(" (using %d colors)", colors_max1); if (MinColors) (void) addstr(" besides 'default'"); + if (opt_zoom) + (void) printw(" zoom:%d", opt_zoom); clrtobot(); MvPrintw(top + 1, 0, @@ -2305,8 +2333,13 @@ color_test(bool recur GCC_UNUSED) opt_bold ? "on" : "off"); /* show color names/numbers across the top */ - for (i = 0; i < per_row; i++) - show_color_name(top + 2, (i + 1) * width, i + MinColors, opt_wide); + for (i = 0; i < per_row; i++) { + show_color_name(top + 2, + (i + 1) * width, + (int) i * zoom_size + MinColors, + opt_wide, + opt_zoom); + } /* show a grid of colors, with color names/ numbers on the left */ for (i = (NCURSES_PAIRS_T) (base_row * per_row); i < pairs_max; i++) { @@ -2317,11 +2350,11 @@ color_test(bool recur GCC_UNUSED) if ((i / per_row) > row_limit) break; -#define InxToFG(i) (NCURSES_COLOR_T) ((i % (colors_max - MinColors)) + MinColors) -#define InxToBG(i) (NCURSES_COLOR_T) ((i / (colors_max - MinColors)) + MinColors) +#define InxToFG(i) (int)((((unsigned long)(i) * (unsigned long)zoom_size) % (unsigned long)(colors_max1 - MinColors)) + (unsigned long)MinColors) +#define InxToBG(i) (int)((((unsigned long)(i) * (unsigned long)zoom_size) / (unsigned long)(colors_max1 - MinColors)) + (unsigned long)MinColors) if (row >= 0 && move(row, col) != ERR) { - NCURSES_COLOR_T fg = InxToFG(i); - NCURSES_COLOR_T bg = InxToBG(i); + NCURSES_COLOR_T fg = (NCURSES_COLOR_T) InxToFG(i); + NCURSES_COLOR_T bg = (NCURSES_COLOR_T) InxToBG(i); init_pair(pair, fg, bg); attron(COLOR_PAIR(pair)); @@ -2341,7 +2374,10 @@ color_test(bool recur GCC_UNUSED) (void) attrset(A_NORMAL); if ((i % per_row) == 0 && InxToFG(i) == MinColors) { - show_color_name(row, 0, InxToBG(i), opt_wide); + show_color_name(row, 0, + InxToBG(i), + opt_wide, + opt_zoom); } ++shown; } else if (shown) { @@ -2389,6 +2425,22 @@ color_test(bool recur GCC_UNUSED) case 'W': set_color_test(opt_wide, TRUE); break; + case 'z': + if (opt_zoom <= 0) { + beep(); + } else { + --opt_zoom; + goto reloop; + } + break; + case 'Z': + if ((1 << opt_zoom) >= colors_max) { + beep(); + } else { + ++opt_zoom; + goto reloop; + } + break; case CTRL('p'): case KEY_UP: if (base_row <= 0) { @@ -2450,16 +2502,27 @@ color_test(bool recur GCC_UNUSED) } #if USE_WIDEC_SUPPORT + +#if USE_EXTENDED_COLOR +#define InitExtendedPair(p,f,g) init_extended_pair((p),(f),(g)) +#define ExtendedColorSet(p) color_set((NCURSES_PAIRS_T) (p), &(p)) +#define EXTENDED_PAIRS_T int +#else +#define InitExtendedPair(p,f,g) init_pair((NCURSES_PAIRS_T) (p),(NCURSES_COLOR_T)(f),(NCURSES_COLOR_T)(g)) +#define ExtendedColorSet(p) color_set((NCURSES_PAIRS_T) (p), NULL) +#define EXTENDED_PAIRS_T NCURSES_PAIRS_T +#endif + /* generate a color test pattern */ static int x_color_test(bool recur GCC_UNUSED) { - int i; + long i; int top = 0, width; int base_row = 0; int grid_top = top + 3; int page_size = (LINES - grid_top); - int pairs_max = (unsigned short) (-1); + int pairs_max; int colors_max = COLORS; int col_limit; int row_limit; @@ -2473,6 +2536,7 @@ x_color_test(bool recur GCC_UNUSED) bool opt_wide = FALSE; bool opt_nums = FALSE; bool opt_xchr = FALSE; + int opt_zoom = 0; wchar_t *buffer = 0; WINDOW *helpwin; @@ -2480,8 +2544,8 @@ x_color_test(bool recur GCC_UNUSED) Cannot("does not support color."); return ERR; } - numbered = (char *) calloc((size_t) (COLS + 1), sizeof(char)); - buffer = (wchar_t *) calloc((size_t) (COLS + 1), sizeof(wchar_t)); + numbered = typeCalloc(char, COLS + 1); + buffer = typeCalloc(wchar_t, COLS + 1); done = ((COLS < 16) || (numbered == 0) || (buffer == 0)); /* @@ -2490,27 +2554,32 @@ x_color_test(bool recur GCC_UNUSED) */ for (col_limit = 1; col_limit * 2 < COLS; col_limit *= 2) ; + reloop: while (!done) { int shown = 0; - double colors_max2 = (double) colors_max * (double) colors_max; + int zoom_size = (1 << opt_zoom); + int colors_max1 = colors_max / zoom_size; + double colors_max2 = (double) colors_max1 * (double) colors_max1; pairs_max = ((unsigned) (-1)) / 2; if (colors_max2 <= COLOR_PAIRS) { - int limit = (colors_max - MinColors) * (colors_max - MinColors); + int limit = (colors_max1 - MinColors) * (colors_max1 - MinColors); if (pairs_max > limit) pairs_max = limit; } if (pairs_max > COLOR_PAIRS) pairs_max = COLOR_PAIRS; + if (pairs_max < colors_max1) + pairs_max = colors_max1; if (opt_wide) { width = 4; hello = "Test"; - per_row = (col_limit / ((colors_max > 8) ? 4 : 8)); + per_row = (col_limit / ((colors_max1 > 8) ? width : 8)); } else { width = 8; hello = "Hello"; - per_row = (col_limit / 8); + per_row = (col_limit / width); } per_row -= MinColors; @@ -2527,10 +2596,12 @@ x_color_test(bool recur GCC_UNUSED) move(0, 0); (void) printw("There are %d color pairs and %d colors", pairs_max, COLORS); - if (colors_max != COLORS) - (void) printw(" (using %d colors)", colors_max); + if (colors_max1 != COLORS) + (void) printw(" (using %d colors)", colors_max1); if (MinColors) (void) addstr(" besides 'default'"); + if (opt_zoom) + (void) printw(" zoom:%d", opt_zoom); clrtobot(); MvPrintw(top + 1, 0, @@ -2540,21 +2611,26 @@ x_color_test(bool recur GCC_UNUSED) opt_bold ? "on" : "off"); /* show color names/numbers across the top */ - for (i = 0; i < per_row; i++) - show_color_name(top + 2, (i + 1) * width, i + MinColors, opt_wide); + for (i = 0; i < per_row; i++) { + show_color_name(top + 2, + ((int) i + 1) * width, + (int) i * zoom_size + MinColors, + opt_wide, + opt_zoom); + } /* show a grid of colors, with color names/ numbers on the left */ for (i = (base_row * per_row); i < pairs_max; i++) { - int row = grid_top + (i / per_row) - base_row; - int col = (i % per_row + 1) * width; - NCURSES_PAIRS_T pair = (NCURSES_PAIRS_T) i; + int row = grid_top + ((int) i / per_row) - base_row; + int col = ((int) i % per_row + 1) * width; + int pair = (int) i; if ((i / per_row) > row_limit) break; if (row >= 0 && move(row, col) != ERR) { - init_pair(pair, InxToFG(i), InxToBG(i)); - (void) color_set(pair, NULL); + InitExtendedPair(pair, InxToFG(i), InxToBG(i)); + (void) ExtendedColorSet(pair); if (opt_acsc) attr_on(WA_ALTCHARSET, NULL); if (opt_bold) @@ -2565,7 +2641,7 @@ x_color_test(bool recur GCC_UNUSED) if (opt_nums) { _nc_SPRINTF(numbered, _nc_SLIMIT((size_t) (COLS + 1) * sizeof(wchar_t)) - "{%02X}", i); + "{%02X}", (unsigned) i); if (opt_xchr) { make_fullwidth_text(buffer, numbered); } else { @@ -2576,7 +2652,10 @@ x_color_test(bool recur GCC_UNUSED) (void) attr_set(A_NORMAL, 0, NULL); if ((i % per_row) == 0 && InxToFG(i) == MinColors) { - show_color_name(row, 0, InxToBG(i), opt_wide); + show_color_name(row, 0, + InxToBG(i), + opt_wide, + opt_zoom); } ++shown; } else if (shown) { @@ -2630,6 +2709,22 @@ x_color_test(bool recur GCC_UNUSED) case 'X': opt_xchr = TRUE; break; + case 'z': + if (opt_zoom <= 0) { + beep(); + } else { + --opt_zoom; + goto reloop; + } + break; + case 'Z': + if ((1 << opt_zoom) >= colors_max) { + beep(); + } else { + ++opt_zoom; + goto reloop; + } + break; case CTRL('p'): case KEY_UP: if (base_row <= 0) { @@ -2750,14 +2845,16 @@ init_all_colors(bool xterm_colors, char *palette_file) */ if (xterm_colors) { int n; - int got; char result[BUFSIZ]; int check_n; unsigned check_r, check_g, check_b; raw(); noecho(); + for (n = 0; n < MaxColors; ++n) { + int got; + fprintf(stderr, "\033]4;%d;?\007", n); got = (int) read(0, result, sizeof(result) - 1); if (got < 0) @@ -3411,14 +3508,15 @@ x_slk_test(bool recur GCC_UNUSED) char *temp = strdup(s); size_t used = strlen(temp); size_t want = SLKLEN; - size_t test; #ifndef state_unused mbstate_t state; #endif buf[0] = L'\0'; while (want > 0 && used != 0) { + size_t test; const char *base = s; + reset_mbytes(state); test = count_mbytes(base, 0, &state); if (test == (size_t) -1) { @@ -3637,7 +3735,6 @@ show_box_chars(int repeat, attr_t attr, NCURSES_PAIRS_T pair) MvAddCh(LINES / 2, 0, colored_chtype(ACS_LTEE, attr, pair)); MvAddCh(LINES / 2, COLS - 1, colored_chtype(ACS_RTEE, attr, pair)); /* *INDENT-ON* */ - } static int @@ -3834,15 +3931,14 @@ acs_test(bool recur GCC_UNUSED) static cchar_t * merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, NCURSES_PAIRS_T pair) { - int count; *dst = *src; do { + int count; TEST_CCHAR(src, count, { attr |= (test_attrs & A_ALTCHARSET); setcchar(dst, test_wch, attr, pair, NULL); - } - , { + }, { ; }); } while (0); @@ -3856,15 +3952,15 @@ merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, NCURSES_PAIRS_T p * into account, use 256 characters for the page. */ static void -show_paged_widechars(int base, - int pagesize, +show_paged_widechars(unsigned base, + unsigned pagesize, int repeat, int space, attr_t attr, NCURSES_PAIRS_T pair) { - int first = base * pagesize; - int last = first + pagesize - 1; + unsigned first = base * pagesize; + unsigned last = first + pagesize - 1; int per_line = 16; cchar_t temp; wchar_t code; @@ -3875,8 +3971,8 @@ show_paged_widechars(int base, MvPrintw(0, 20, "Display of Character Codes %#x to %#x", first, last); attroff(A_BOLD); - for (code = (wchar_t) first; (int) code <= last; code++) { - int row = (2 + ((int) code - first) / per_line); + for (code = (wchar_t) first; code <= (wchar_t) last; code++) { + int row = (2 + (int) (code - (wchar_t) first) / per_line); int col = 5 * ((int) code % per_line); int count; @@ -3897,24 +3993,23 @@ show_paged_widechars(int base, } static void -show_upper_widechars(int first, int repeat, int space, attr_t attr, NCURSES_PAIRS_T pair) +show_upper_widechars(unsigned first, int repeat, int space, attr_t attr, NCURSES_PAIRS_T pair) { cchar_t temp; wchar_t code; - int last = first + 31; + unsigned last = first + 31; erase(); attron(A_BOLD); MvPrintw(0, 20, "Display of Character Codes %d to %d", first, last); attroff(A_BOLD); - for (code = (wchar_t) first; (int) code <= last; code++) { - int row = 2 + ((code - first) % 16); - int col = ((code - first) / 16) * COLS / 2; + for (code = (wchar_t) first; code <= (wchar_t) last; code++) { + int row = 2 + ((int) (code - (wchar_t) first) % 16); + int col = ((int) (code - (wchar_t) first) / 16) * COLS / 2; wchar_t codes[10]; char tmp[80]; int count = repeat; - int y, x; _nc_SPRINTF(tmp, _nc_SLIMIT(sizeof(tmp)) "%3ld (0x%lx)", (long) code, (long) code); @@ -3925,6 +4020,8 @@ show_upper_widechars(int first, int repeat, int space, attr_t attr, NCURSES_PAIR setcchar(&temp, codes, attr, pair, 0); do { + int y, x; + /* * Give non-spacing characters something to combine with. If we * don't, they'll bunch up in a heap on the space after the ":". @@ -4185,7 +4282,6 @@ show_wbox_chars(int repeat, attr_t attr, NCURSES_PAIRS_T pair) (void) mvadd_wch(LINES / 2, 0, MERGE_ATTR(0, WACS_LTEE)); (void) mvadd_wch(LINES / 2, COLS - 1, MERGE_ATTR(0, WACS_RTEE)); /* *INDENT-ON* */ - } #undef MERGE_ATTR @@ -4258,7 +4354,6 @@ show_utf8_chars(int repeat, attr_t attr, NCURSES_PAIRS_T pair) n = SHOW_UTF8(n, "WACS_S7", "\342\216\274"); (void) SHOW_UTF8(n, "WACS_S9", "\342\216\275"); /* *INDENT-ON* */ - } /* display the wide-ACS character set */ @@ -4266,10 +4361,10 @@ static int x_acs_test(bool recur GCC_UNUSED) { int c = 'a'; - int digit = 0; + unsigned digit = 0; int repeat = 1; int space = ' '; - int pagesize = 32; + unsigned pagesize = 32; attr_t attr = WA_NORMAL; int fg = COLOR_BLACK; int bg = COLOR_BLACK; @@ -4278,7 +4373,10 @@ x_acs_test(bool recur GCC_UNUSED) void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = 0; W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)]; unsigned my_size = init_w_attr_list(my_list, term_attrs()); + char at_page[20]; + bool pending_code = FALSE; + at_page[0] = '\0'; do { switch (c) { case CTRL('L'): @@ -4310,15 +4408,40 @@ x_acs_test(bool recur GCC_UNUSED) case 'u': ToggleAcs(last_show_wacs, show_utf8_chars); break; + case '@': + pending_code = !pending_code; + if (pending_code) { + _nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x", digit); + } else if (at_page[0] != '\0') { + _nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%x", digit); + } + break; default: - if (c < 256 && isdigit(c)) { - digit = (c - '0'); + if (pending_code && isxdigit(c)) { + size_t len = strlen(at_page); + if (len && at_page[0] == '0') { + memmove(at_page, at_page + 1, len--); + } + if (len < sizeof(at_page) - 1) { + at_page[len++] = (char) c; + at_page[len] = '\0'; + } + } else if (pending_code + && (c == '\b' || c == KEY_BACKSPACE || c == KEY_DC)) { + size_t len = strlen(at_page); + if (len) + at_page[--len] = '\0'; + } else if (c < 256 && isdigit(c)) { + digit = (unsigned) (c - '0'); last_show_wacs = 0; } else if (c == '+') { ++digit; + _nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x", digit); last_show_wacs = 0; } else if (c == '-' && digit > 0) { --digit; + _nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x", + UChar(digit)); last_show_wacs = 0; } else if (c == '>' && repeat < (COLS / 4)) { ++repeat; @@ -4346,7 +4469,11 @@ x_acs_test(bool recur GCC_UNUSED) } MvPrintw(LINES - 4, 0, - "Select: a/d/t WACS, w=all x=box, u UTF-8, ^L repaint"); + "Select: a/d/t WACS, w=%d/page, @", + pagesize); + printw("%s", + pending_code ? at_page : "page"); + addstr(", x=box, u UTF-8, ^L repaint"); MvPrintw(LINES - 3, 2, "0-9,+/- non-ASCII, repeat, _ space, ESC=quit"); if (UseColors) { @@ -4532,13 +4659,15 @@ newwin_legend(FRAME * curp) }; #undef DATA size_t n; - int x; bool do_keypad = HaveKeypad(curp); bool do_scroll = HaveScroll(curp); char buf[BUFSIZ]; move(LINES - 4, 0); + for (n = 0; n < SIZEOF(legend); n++) { + int x; + switch (legend[n].code) { default: _nc_STRCPY(buf, legend[n].msg, sizeof(buf)); @@ -4882,7 +5011,7 @@ scroll_test(bool recur GCC_UNUSED) case CTRL('X'): /* resize window */ if (current) { pair *tmp, ul, lr; - int i, mx, my; + int mx, my; move(0, 0); clrtoeol(); @@ -4911,11 +5040,13 @@ scroll_test(bool recur GCC_UNUSED) wclrtobot(current->wind); wmove(current->wind, lr.y, lr.x); } - if (mx > tmp->x - ul.x) + if (mx > tmp->x - ul.x) { + int i; for (i = 0; i < my; i++) { wmove(current->wind, i, tmp->x - ul.x + 1); wclrtoeol(current->wind); } + } wnoutrefresh(current->wind); memcpy(&lr, tmp, sizeof(pair)); @@ -5729,13 +5860,13 @@ padgetch(WINDOW *win) { static int count; static int last; - int c; if ((pending_pan = (count > 0)) != FALSE) { count--; pending_pan = (count != 0); } else { for (;;) { + int c; switch (c = wGetchar(win)) { case '!': ShellOut(FALSE); @@ -6212,7 +6343,7 @@ trace_set(bool recur GCC_UNUSED) for (ip = menu_items(m); *ip; ip++) if (item_value(*ip)) newtrace |= t_tbl[item_index(*ip)].mask; - trace(newtrace); + curses_trace(newtrace); Trace(("trace level interactively set to %s", tracetrace(_nc_tracing))); MvPrintw(LINES - 2, 0, @@ -6304,9 +6435,9 @@ edit_secure(FIELD *me, int c) size_t have = (source ? strlen(source) : 0) + 1; size_t need = 80 + have; char *temp = malloc(need); - size_t len; if (temp != 0) { + size_t len; _nc_STRNCPY(temp, source ? source : "", have + 1); len = (size_t) (char *) field_userptr(me); if (c <= KEY_MAX) { @@ -6409,7 +6540,6 @@ form_virtualize(FORM *f, WINDOW *w) static int mode = REQ_INS_MODE; int c = wGetchar(w); - unsigned n; FIELD *me = current_field(f); bool current = TRUE; @@ -6421,6 +6551,7 @@ form_virtualize(FORM *f, WINDOW *w) } c = mode; } else { + unsigned n; for (n = 0; n < SIZEOF(lookup); n++) { if (lookup[n].code == c) { c = lookup[n].result; @@ -6555,12 +6686,11 @@ CHAR_CHECK_CB(pw_char_check) static int form_test(bool recur GCC_UNUSED) { - WINDOW *w; FORM *form; FIELD *f[12], *secure; FIELDTYPE *fty_middle = new_fieldtype(mi_field_check, mi_char_check); FIELDTYPE *fty_passwd = new_fieldtype(pw_field_check, pw_char_check); - int finished = 0, c; + int c; unsigned n = 0; #ifdef NCURSES_MOUSE_VERSION @@ -6610,6 +6740,8 @@ form_test(bool recur GCC_UNUSED) f[n] = (FIELD *) 0; if ((form = new_form(f)) != 0) { + WINDOW *w; + int finished = 0; display_form(form); @@ -6658,6 +6790,9 @@ form_test(bool recur GCC_UNUSED) #if HAVE_COPYWIN /* ...and overlay, overwrite */ +static const int overlap_HEAD = 1; +static const int overlap_FOOT = 6; + static WINDOW * make_overlap(int n) { @@ -6669,9 +6804,7 @@ make_overlap(int n) Cannot("The screen is too small for this test"); result = 0; } else { - const int H_SIZE = 1; /* header-size */ - const int F_SIZE = 6; /* footer-size */ - int ymax = y - (H_SIZE + F_SIZE); + int ymax = y - (overlap_HEAD + overlap_FOOT); int high = ymax / 5; /* equal-sized parts for cross */ int xmax = x - 2; /* margin */ int wide = (xmax / 5) & ~1; @@ -6683,7 +6816,7 @@ make_overlap(int n) if (wide > 8) wide = 8; - tmar = (ymax - (5 * high)) / 2 + H_SIZE; + tmar = (ymax - (5 * high)) / 2 + overlap_HEAD; lmar = (xmax - (5 * wide)) / 2; if (n == 0) { @@ -6695,6 +6828,35 @@ make_overlap(int n) return result; } +static void +clear_overlap(void) +{ + int row; + + for (row = overlap_HEAD; row < LINES - overlap_FOOT; ++row) { + move(row, 0); + clrtoeol(); + } +} + +static int +move_overlap(int shift, WINDOW *win1) +{ + int ymax = getmaxy(stdscr) - (overlap_HEAD + overlap_FOOT); + int high = ymax / 5; /* equal-sized parts for cross */ + int tmar; + int xmax1 = getmaxx(win1) + 1; + int lmar1 = (COLS - (5 * (xmax1) / 3)) / 2; + int rc = ERR; + + if (high > 8) + high = 8; + tmar = (ymax - (5 * high)) / 2 + overlap_HEAD; + + rc = mvwin(win1, tmar, lmar1 + shift); + return rc; +} + static void fillwin(WINDOW *win, char ch) { @@ -6873,11 +7035,8 @@ overlap_test_2_attr(WINDOW *win, int flavor, int col) static int overlap_help(int state, int flavors[OVERLAP_FLAVORS]) { - int row; - int col; int item; int limit[OVERLAP_FLAVORS]; - const char *ths, *tht; char msg[80]; if (state < 0) @@ -6886,10 +7045,10 @@ overlap_help(int state, int flavors[OVERLAP_FLAVORS]) assert(state >= 0 && state < OVERLAP_FLAVORS); for (item = 0; item < (2 * OVERLAP_FLAVORS); ++item) { - row = item / 2; - col = item % 2; - ths = col ? "B" : "A"; - tht = col ? "A" : "B"; + int row = item / 2; + int col = item % 2; + const char *ths = col ? "B" : "A"; + const char *tht = col ? "A" : "B"; switch ((otBASE) row) { case otBASE_refresh: @@ -6965,7 +7124,7 @@ overlap_help(int state, int flavors[OVERLAP_FLAVORS]) wbkgdset(stdscr, ' ' | A_NORMAL); } move(LINES - 1, 0); - printw("^Q/ESC = terminate test. Up/down/space select tests (row %d", + printw("^Q/ESC = terminate test. shift. Up/down/space select (row %d", state + 1); if (limit[state] > 1) printw(" test %d:%d", 1 + flavors[state], limit[state]); @@ -7048,11 +7207,15 @@ overlap_test(bool recur GCC_UNUSED) { WINDOW *win1, *win2; int ch; + int shift = 0, last_refresh = -1; int state, flavor[OVERLAP_FLAVORS]; - if ((win1 = make_overlap(0)) == 0 - || (win2 = make_overlap(1)) == 0) + if ((win1 = make_overlap(0)) == 0) { + return ERR; + } else if ((win2 = make_overlap(1)) == 0) { + delwin(win1); return ERR; + } curs_set(0); raw(); @@ -7124,16 +7287,50 @@ overlap_test(bool recur GCC_UNUSED) state = overlap_help(state, flavor); break; + case '<': + /* FALLTHRU */ + case '>': + /* see below */ + break; + default: beep(); break; } + + switch (ch) { + case 'a': + /* FALLTHRU */ + case 'b': + last_refresh = ch; + break; + case '<': + shift -= 2; + /* FALLTHRU */ + case '>': + shift += 1; + if (move_overlap(shift, win1) != OK) { + flash(); + shift += (ch == '>') ? -1 : 1; + } else if (last_refresh > 0) { + clear_overlap(); + wnoutrefresh(stdscr); + if (last_refresh == 'a') + overlap_test_0(win1, win2); + else + overlap_test_0(win2, win1); + } + break; + default: + last_refresh = -1; + break; + } } delwin(win2); delwin(win1); erase(); - exit_curses(); + stop_curses(); return OK; } @@ -7210,11 +7407,15 @@ x_overlap_test(bool recur GCC_UNUSED) const wchar_t WIDE_B = 0xff22; WINDOW *win1, *win2; int ch; + int shift = 0, last_refresh = -1; int state, flavor[OVERLAP_FLAVORS]; - if ((win1 = make_overlap(0)) == 0 - || (win2 = make_overlap(1)) == 0) + if ((win1 = make_overlap(0)) == 0) { + return ERR; + } else if ((win2 = make_overlap(1)) == 0) { + delwin(win1); return ERR; + } curs_set(0); raw(); @@ -7286,16 +7487,50 @@ x_overlap_test(bool recur GCC_UNUSED) state = overlap_help(state, flavor); break; + case '<': + /* FALLTHRU */ + case '>': + /* see below */ + break; + default: beep(); break; } + + switch (ch) { + case 'a': + /* FALLTHRU */ + case 'b': + last_refresh = ch; + break; + case '<': + shift -= 2; + /* FALLTHRU */ + case '>': + shift += 1; + if (move_overlap(shift, win1) != OK) { + flash(); + shift += (ch == '>') ? -1 : 1; + } else if (last_refresh > 0) { + clear_overlap(); + wnoutrefresh(stdscr); + if (last_refresh == 'a') + overlap_test_0(win1, win2); + else + overlap_test_0(win2, win1); + } + break; + default: + last_refresh = -1; + break; + } } delwin(win2); delwin(win1); erase(); - exit_curses(); + stop_curses(); return OK; } #endif /* USE_WIDEC_SUPPORT */ @@ -7383,9 +7618,13 @@ settings_test(bool recur GCC_UNUSED) #if HAVE_COLOR_CONTENT show_boolean_setting("can_change_color", can_change_color()); #endif + show_setting_name("LINES"); + printw("%d\n", LINES); + show_setting_name("COLS"); + printw("%d\n", COLS); Pause(); erase(); - exit_curses(); + stop_curses(); return OK; } @@ -7424,7 +7663,7 @@ usage(void) #if USE_LIBPANEL ," -s msec specify nominal time for panel-demo (default: 1, to hold)" #endif -#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(__MINGW32__) +#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_NC_WINDOWS) ," -T call use_tioctl(TRUE) to allow SIGWINCH to override environment" #endif #ifdef TRACE @@ -7527,7 +7766,7 @@ main_menu(bool top) #if USE_LIBMENU CMDS(TRUE, ONLY(menu_test), 'm', "exercise menu library"), #endif -#if USE_LIBMENU +#if USE_LIBPANEL CMDS(TRUE, BOTH(panel_test), 'o', "exercise panel library"), #endif #if HAVE_NEWPAD @@ -7551,7 +7790,6 @@ main_menu(bool top) int (*doit) (bool); char command; unsigned n; - do { printf("This is the ncurses main menu (uppercase for wide-characters)\n"); for (n = 0; n < SIZEOF(cmds); ++n) { @@ -7578,8 +7816,14 @@ main_menu(bool top) for (;;) { char ch = '\0'; if (read(fileno(stdin), &ch, (size_t) 1) <= 0) { - if (command == 0) + int save_err = errno; + perror("\nOOPS"); + if (save_err == EINTR) { + clearerr(stdin); + continue; + } else if (command == 0) { command = 'q'; + } break; } else if (command == 0 && !isspace(UChar(ch))) { command = ch; @@ -7645,11 +7889,15 @@ main(int argc, char *argv[]) { int c; int my_e_param = 1; -#ifdef NCURSES_VERSION +#ifdef NCURSES_VERSION_PATCH +#if HAVE_USE_DEFAULT_COLORS int default_fg = COLOR_WHITE; int default_bg = COLOR_BLACK; - bool assumed_colors = FALSE; bool default_colors = FALSE; +#if HAVE_ASSUME_DEFAULT_COLORS + bool assumed_colors = FALSE; +#endif +#endif #endif bool monochrome = FALSE; #if HAVE_COLOR_CONTENT @@ -7661,7 +7909,9 @@ main(int argc, char *argv[]) while ((c = getopt(argc, argv, "a:dEe:fhmp:s:Tt:x")) != -1) { switch (c) { -#ifdef NCURSES_VERSION +#ifdef NCURSES_VERSION_PATCH +#if HAVE_USE_DEFAULT_COLORS +#if HAVE_ASSUME_DEFAULT_COLORS case 'a': assumed_colors = TRUE; switch (sscanf(optarg, "%d,%d", &default_fg, &default_bg)) { @@ -7673,10 +7923,12 @@ main(int argc, char *argv[]) break; } break; +#endif case 'd': default_colors = TRUE; break; #endif +#endif #if HAVE_USE_ENV case 'E': use_env(FALSE); @@ -7713,7 +7965,7 @@ main(int argc, char *argv[]) nap_msec = (int) atol(optarg); break; #endif -#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(__MINGW32__) +#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_NC_WINDOWS) case 'T': use_tioctl(TRUE); break; @@ -7741,10 +7993,10 @@ main(int argc, char *argv[]) #ifdef TRACE /* enable debugging */ #if !USE_LIBMENU - trace(save_trace); + curses_trace(save_trace); #else if (!isatty(fileno(stdin))) - trace(save_trace); + curses_trace(save_trace); #endif /* USE_LIBMENU */ #endif /* TRACE */