X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fncurses.c;h=c1ed6ca736be86783687ae141c22e4d9196223ba;hp=5764dd75c2451d15da18f53507d7077e393995f8;hb=cd142df6d9934f1bda19f5b968cc666291be5072;hpb=603f0cb25b7acc8f04f4b18d2a2fe6f90039829a diff --git a/test/ncurses.c b/test/ncurses.c index 5764dd75..c1ed6ca7 100644 --- a/test/ncurses.c +++ b/test/ncurses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 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 +40,7 @@ AUTHOR Author: Eric S. Raymond 1993 Thomas E. Dickey (beginning revision 1.27 in 1996). -$Id: ncurses.c,v 1.438 2016/06/11 21:05:48 tom Exp $ +$Id: ncurses.c,v 1.469 2017/10/01 18:22:48 tom Exp $ ***************************************************************************/ @@ -77,7 +77,6 @@ $Id: ncurses.c,v 1.438 2016/06/11 21:05:48 tom Exp $ #ifdef TRACE static unsigned save_trace = TRACE_ORDINARY | TRACE_ICALLS | TRACE_CALLS; -extern unsigned _nc_tracing; #endif #else @@ -142,20 +141,20 @@ extern unsigned _nc_tracing; #define state_unused #endif -#define ToggleAcs(temp,real) temp = ((temp == real) ? 0 : real) +#define ToggleAcs(temp,real) temp = ((temp == real) ? NULL : real) #define P(string) printw("%s\n", string) #define BLANK ' ' /* this is the background character */ -#undef max_colors -static int max_colors; /* the actual number of colors we'll use */ -static int min_colors; /* the minimum color code */ -static bool use_colors; /* true if we use colors */ +static int MaxColors; /* the actual number of colors we'll use */ +static int MinColors; /* the minimum color code */ +static bool UseColors; /* true if we use colors */ #undef max_pairs static int max_pairs; /* ...and the number of color pairs */ +#if HAVE_COLOR_CONTENT typedef struct { NCURSES_COLOR_T red; NCURSES_COLOR_T green; @@ -163,8 +162,10 @@ typedef struct { } RGB_DATA; static RGB_DATA *all_colors; +#endif static void main_menu(bool); +static void failed(const char *s) GCC_NORETURN; static void failed(const char *s) @@ -174,29 +175,16 @@ failed(const char *s) ExitProgram(EXIT_FAILURE); } -/* The behavior of mvhline, mvvline for negative/zero length is unspecified, - * though we can rely on negative x/y values to stop the macro. - */ -static void -do_h_line(int y, int x, chtype c, int to) -{ - if ((to) > (x)) - MvHLine(y, x, c, (to) - (x)); -} - -static void -do_v_line(int y, int x, chtype c, int to) -{ - if ((to) > (y)) - MvVLine(y, x, c, (to) - (y)); -} - static void Repaint(void) { touchwin(stdscr); +#if HAVE_CURSCR touchwin(curscr); wrefresh(curscr); +#else + wrefresh(stdscr); +#endif } static bool @@ -233,6 +221,7 @@ wGetchar(WINDOW *win) } #define Getchar() wGetchar(stdscr) +#if USE_SOFTKEYS /* replaces wgetnstr(), since we want to be able to edit values */ static void wGetstring(WINDOW *win, char *buffer, int limit) @@ -300,6 +289,7 @@ wGetstring(WINDOW *win, char *buffer, int limit) wmove(win, y0, x0); noecho(); } +#endif #if USE_WIDEC_SUPPORT static wchar_t @@ -515,10 +505,15 @@ mouse_decode(MEVENT const *ep) { static char buf[80 + (5 * 10) + (32 * 15)]; - (void) sprintf(buf, "id %2d at (%2d, %2d, %d) state %4lx = {", - ep->id, ep->x, ep->y, ep->z, (unsigned long) ep->bstate); + (void) _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + "id %2d at (%2d, %2d, %d) state %4lx = {", + ep->id, ep->x, ep->y, ep->z, (unsigned long) ep->bstate); -#define SHOW(m, s) if ((ep->bstate & m)==m) {strcat(buf,s); strcat(buf, ", ");} +#define SHOW(m, s) \ + if ((ep->bstate & m)==m) { \ + _nc_STRCAT(buf, s, sizeof(buf)); \ + _nc_STRCAT(buf, ", ", sizeof(buf)); \ + } SHOW(BUTTON1_RELEASED, "release-1"); SHOW(BUTTON1_PRESSED, "press-1"); @@ -574,7 +569,7 @@ mouse_decode(MEVENT const *ep) if (buf[strlen(buf) - 1] == ' ') buf[strlen(buf) - 2] = '\0'; - (void) strcat(buf, "}"); + _nc_STRCAT(buf, "}", sizeof(buf)); return (buf); } @@ -991,8 +986,8 @@ finish_getch_test(void) endwin(); } -static void -getch_test(void) +static int +getch_test(bool recur GCC_UNUSED) { int delay = begin_getch_test(); @@ -1001,6 +996,7 @@ getch_test(void) forget_boxes(); finish_getch_test(); slk_clear(); + return OK; } #if USE_WIDEC_SUPPORT @@ -1208,8 +1204,8 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) init_getch(win, flags, delay); } -static void -get_wch_test(void) +static int +x_getch_test(bool recur GCC_UNUSED) { int delay = begin_getch_test(); @@ -1218,6 +1214,7 @@ get_wch_test(void) forget_boxes(); finish_getch_test(); slk_clear(); + return OK; } #endif @@ -1304,9 +1301,9 @@ attr_legend(WINDOW *helpwin) ++row; MvWPrintw(helpwin, row++, col, "Toggles:"); - if (use_colors) { + if (UseColors) { MvWPrintw(helpwin, row++, col, - " f/F/b/F toggle foreground/background background color"); + " f/F/b/B toggle foreground/background background color"); MvWPrintw(helpwin, row++, col, " t/T toggle text/background color attribute"); } @@ -1323,7 +1320,7 @@ attr_legend(WINDOW *helpwin) static void show_color_attr(int fg, int bg, int tx) { - if (use_colors) { + if (UseColors) { printw(" Colors (fg %d, bg %d", fg, bg); if (tx >= 0) printw(", text %d", tx); @@ -1336,7 +1333,7 @@ cycle_color_attr(int ch, NCURSES_COLOR_T *fg, NCURSES_COLOR_T *bg, NCURSES_COLOR { bool error = FALSE; - if (use_colors) { + if (UseColors) { switch (ch) { case 'f': *fg = (NCURSES_COLOR_T) (*fg + 1); @@ -1362,12 +1359,12 @@ cycle_color_attr(int ch, NCURSES_COLOR_T *fg, NCURSES_COLOR_T *bg, NCURSES_COLOR break; } if (*fg >= COLORS) - *fg = (NCURSES_COLOR_T) min_colors; - if (*fg < min_colors) + *fg = (NCURSES_COLOR_T) MinColors; + if (*fg < MinColors) *fg = (NCURSES_COLOR_T) (COLORS - 1); if (*bg >= COLORS) - *bg = (NCURSES_COLOR_T) min_colors; - if (*bg < min_colors) + *bg = (NCURSES_COLOR_T) MinColors; + if (*bg < MinColors) *bg = (NCURSES_COLOR_T) (COLORS - 1); if (*tx >= COLORS) *tx = -1; @@ -1508,7 +1505,7 @@ show_attr(WINDOW *win, int row, int skip, bool arrow, chtype attr, const char *n } typedef struct { - attr_t attr; + chtype attr; NCURSES_CONST char *name; } ATTR_TBL; /* *INDENT-OFF* */ @@ -1545,6 +1542,46 @@ init_attr_list(ATTR_TBL * target, attr_t attrs) return result; } +#if USE_WIDEC_SUPPORT +typedef struct { + attr_t attr; + NCURSES_CONST char *name; +} W_ATTR_TBL; +/* *INDENT-OFF* */ +static const W_ATTR_TBL w_attrs_to_test[] = { + { WA_STANDOUT, "STANDOUT" }, + { WA_REVERSE, "REVERSE" }, + { WA_BOLD, "BOLD" }, + { WA_UNDERLINE, "UNDERLINE" }, + { WA_DIM, "DIM" }, + { WA_BLINK, "BLINK" }, + { WA_PROTECT, "PROTECT" }, +#ifdef WA_INVIS + { WA_INVIS, "INVISIBLE" }, +#endif +#ifdef WA_ITALIC + { WA_ITALIC, "ITALIC" }, +#endif + { WA_NORMAL, "NORMAL" }, +}; +/* *INDENT-ON* */ + +static unsigned +init_w_attr_list(W_ATTR_TBL * target, attr_t attrs) +{ + unsigned result = 0; + size_t n; + + for (n = 0; n < SIZEOF(w_attrs_to_test); ++n) { + attr_t test = w_attrs_to_test[n].attr; + if (test == WA_NORMAL || (test & attrs) != 0) { + target[result++] = w_attrs_to_test[n]; + } + } + return result; +} +#endif + static bool attr_getc(int *skip, NCURSES_COLOR_T *fg, @@ -1569,7 +1606,7 @@ attr_getc(int *skip, case CTRL('L'): Repaint(); break; - case '?': + case HELP_KEY_1: if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { box(helpwin, 0, 0); attr_legend(helpwin); @@ -1612,8 +1649,8 @@ attr_getc(int *skip, return result; } -static void -attr_test(void) +static int +attr_test(bool recur GCC_UNUSED) /* test text attributes */ { int n; @@ -1647,7 +1684,7 @@ attr_test(void) chtype normal = A_NORMAL | BLANK; chtype extras = (chtype) ac; - if (use_colors) { + if (UseColors) { NCURSES_PAIRS_T pair = 0; if ((fg != COLOR_BLACK) || (bg != COLOR_BLACK)) { pair = 1; @@ -1697,8 +1734,10 @@ attr_test(void) bkgdset(A_NORMAL | BLANK); erase(); endwin(); + return OK; } else { Cannot("does not support video attributes."); + return ERR; } } @@ -1797,7 +1836,7 @@ set_wide_background(NCURSES_PAIRS_T pair) static attr_t get_wide_background(void) { - attr_t result = A_NORMAL; + attr_t result = WA_NORMAL; attr_t attr; cchar_t ch; NCURSES_PAIRS_T pair; @@ -1817,12 +1856,12 @@ wide_show_attr(WINDOW *win, int row, int skip, bool arrow, - chtype attr, + attr_t attr, NCURSES_PAIRS_T pair, const char *name) { int ncv = get_ncv(); - chtype test = attr & ~WA_ALTCHARSET; + attr_t test = attr & ~WA_ALTCHARSET; if (arrow) MvPrintw(row, COLS_PRE_ATTRS - 3, "-->"); @@ -1919,7 +1958,7 @@ wide_attr_getc(int *skip, case CTRL('L'): Repaint(); break; - case '?': + case HELP_KEY_1: if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { box_set(helpwin, 0, 0); attr_legend(helpwin); @@ -1970,8 +2009,8 @@ wide_attr_getc(int *skip, return result; } -static void -wide_attr_test(void) +static int +x_attr_test(bool recur GCC_UNUSED) /* test text attributes using wide-character calls */ { int n; @@ -1981,9 +2020,9 @@ wide_attr_test(void) NCURSES_COLOR_T tx = -1; int ac = 0; unsigned j, k; - ATTR_TBL my_list[SIZEOF(attrs_to_test)]; - WINDOW *my_wins[SIZEOF(attrs_to_test)]; - unsigned my_size = init_attr_list(my_list, term_attrs()); + 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) { for (j = 0; j < my_size; ++j) { @@ -2005,7 +2044,7 @@ wide_attr_test(void) NCURSES_PAIRS_T pair = 0; NCURSES_PAIRS_T extras = 0; - if (use_colors) { + if (UseColors) { pair = (NCURSES_PAIRS_T) (fg != COLOR_BLACK || bg != COLOR_BLACK); if (pair != 0) { pair = 1; @@ -2049,8 +2088,10 @@ wide_attr_test(void) set_wide_background(0); erase(); endwin(); + return OK; } else { Cannot("does not support extended video attributes."); + return ERR; } } #endif @@ -2089,14 +2130,17 @@ show_color_name(int y, int x, int color, bool wide) int width = 8; if (wide) { - sprintf(temp, "%02d", color); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "%02d", color); width = 4; } else if (color >= 8) { - sprintf(temp, "[%02d]", color); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "[%02d]", color); } else if (color < 0) { - strcpy(temp, "default"); + _nc_STRCPY(temp, "default", sizeof(temp)); } else { - sprintf(temp, "%.*s", 16, the_color_names[color]); + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "%.*s", 16, the_color_names[color]); } printw("%-*.*s", width, width, temp); } @@ -2180,8 +2224,8 @@ color_cycle(int current, int step) } /* generate a color test pattern */ -static void -color_test(void) +static int +color_test(bool recur GCC_UNUSED) { NCURSES_PAIRS_T i; int top = 0, width; @@ -2203,6 +2247,11 @@ color_test(void) bool opt_wide = FALSE; WINDOW *helpwin; + if (!UseColors) { + Cannot("does not support color."); + return ERR; + } + numbered = (char *) calloc((size_t) (COLS + 1), sizeof(char)); done = ((COLS < 16) || (numbered == 0)); @@ -2217,7 +2266,7 @@ color_test(void) pairs_max = PAIR_NUMBER(A_COLOR) + 1; if (colors_max * colors_max <= COLOR_PAIRS) { - int limit = (colors_max - min_colors) * (colors_max - min_colors); + int limit = (colors_max - MinColors) * (colors_max - MinColors); if (pairs_max > limit) pairs_max = limit; } else { @@ -2235,7 +2284,7 @@ color_test(void) hello = "Hello"; per_row = (col_limit / 8); } - per_row -= min_colors; + per_row -= MinColors; row_limit = (pairs_max + per_row - 1) / per_row; @@ -2244,7 +2293,7 @@ color_test(void) pairs_max, COLORS); if (colors_max != COLORS) (void) printw(" (using %d colors)", colors_max); - if (min_colors) + if (MinColors) (void) addstr(" besides 'default'"); clrtobot(); @@ -2256,7 +2305,7 @@ color_test(void) /* show color names/numbers across the top */ for (i = 0; i < per_row; i++) - show_color_name(top + 2, (i + 1) * width, i + min_colors, opt_wide); + show_color_name(top + 2, (i + 1) * width, i + MinColors, opt_wide); /* 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++) { @@ -2267,8 +2316,8 @@ color_test(void) if ((i / per_row) > row_limit) break; -#define InxToFG(i) (NCURSES_COLOR_T) ((i % (colors_max - min_colors)) + min_colors) -#define InxToBG(i) (NCURSES_COLOR_T) ((i / (colors_max - min_colors)) + min_colors) +#define InxToFG(i) (NCURSES_COLOR_T) ((i % (colors_max - MinColors)) + MinColors) +#define InxToBG(i) (NCURSES_COLOR_T) ((i / (colors_max - MinColors)) + MinColors) if (row >= 0 && move(row, col) != ERR) { NCURSES_COLOR_T fg = InxToFG(i); NCURSES_COLOR_T bg = InxToBG(i); @@ -2283,13 +2332,14 @@ color_test(void) attron(A_REVERSE); if (opt_nums) { - sprintf(numbered, "{%02X}", (int) i); + _nc_SPRINTF(numbered, _nc_SLIMIT((size_t) (COLS + 1)) + "{%02X}", (int) i); hello = numbered; } printw("%-*.*s", width, width, hello); (void) attrset(A_NORMAL); - if ((i % per_row) == 0 && InxToFG(i) == min_colors) { + if ((i % per_row) == 0 && InxToFG(i) == MinColors) { show_color_name(row, 0, InxToBG(i), opt_wide); } ++shown; @@ -2377,7 +2427,7 @@ color_test(void) } } break; - case '?': + case HELP_KEY_1: if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { box(helpwin, 0, 0); color_legend(helpwin, FALSE); @@ -2395,12 +2445,13 @@ color_test(void) endwin(); free(numbered); + return OK; } #if USE_WIDEC_SUPPORT /* generate a color test pattern */ -static void -wide_color_test(void) +static int +x_color_test(bool recur GCC_UNUSED) { int i; int top = 0, width; @@ -2424,6 +2475,10 @@ wide_color_test(void) wchar_t *buffer = 0; WINDOW *helpwin; + if (!UseColors) { + 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)); done = ((COLS < 16) || (numbered == 0) || (buffer == 0)); @@ -2439,7 +2494,7 @@ wide_color_test(void) pairs_max = (unsigned short) (-1); if (colors_max * colors_max <= COLOR_PAIRS) { - int limit = (colors_max - min_colors) * (colors_max - min_colors); + int limit = (colors_max - MinColors) * (colors_max - MinColors); if (pairs_max > limit) pairs_max = limit; } else { @@ -2456,7 +2511,7 @@ wide_color_test(void) hello = "Hello"; per_row = (col_limit / 8); } - per_row -= min_colors; + per_row -= MinColors; if (opt_xchr) { make_fullwidth_text(buffer, hello); @@ -2473,7 +2528,7 @@ wide_color_test(void) pairs_max, COLORS); if (colors_max != COLORS) (void) printw(" (using %d colors)", colors_max); - if (min_colors) + if (MinColors) (void) addstr(" besides 'default'"); clrtobot(); @@ -2485,7 +2540,7 @@ wide_color_test(void) /* show color names/numbers across the top */ for (i = 0; i < per_row; i++) - show_color_name(top + 2, (i + 1) * width, i + min_colors, opt_wide); + show_color_name(top + 2, (i + 1) * width, i + MinColors, opt_wide); /* show a grid of colors, with color names/ numbers on the left */ for (i = (base_row * per_row); i < pairs_max; i++) { @@ -2500,14 +2555,16 @@ wide_color_test(void) init_pair(pair, InxToFG(i), InxToBG(i)); (void) color_set(pair, NULL); if (opt_acsc) - attr_on(A_ALTCHARSET, NULL); + attr_on(WA_ALTCHARSET, NULL); if (opt_bold) - attr_on(A_BOLD, NULL); + attr_on(WA_BOLD, NULL); if (opt_revs) - attr_on(A_REVERSE, NULL); + attr_on(WA_REVERSE, NULL); if (opt_nums) { - sprintf(numbered, "{%02X}", i); + _nc_SPRINTF(numbered, + _nc_SLIMIT((size_t) (COLS + 1) * sizeof(wchar_t)) + "{%02X}", i); if (opt_xchr) { make_fullwidth_text(buffer, numbered); } else { @@ -2517,7 +2574,7 @@ wide_color_test(void) addnwstr(buffer, width); (void) attr_set(A_NORMAL, 0, NULL); - if ((i % per_row) == 0 && InxToFG(i) == min_colors) { + if ((i % per_row) == 0 && InxToFG(i) == MinColors) { show_color_name(row, 0, InxToBG(i), opt_wide); } ++shown; @@ -2611,7 +2668,7 @@ wide_color_test(void) } } break; - case '?': + case HELP_KEY_1: if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { box(helpwin, 0, 0); color_legend(helpwin, TRUE); @@ -2630,9 +2687,11 @@ wide_color_test(void) free(numbered); free(buffer); + return OK; } #endif /* USE_WIDEC_SUPPORT */ +#if HAVE_COLOR_CONTENT static void change_color(NCURSES_PAIRS_T current, int field, int value, int usebase) { @@ -2668,7 +2727,7 @@ reset_all_colors(void) all_colors[c].blue); } -#define okCOLOR(n) ((n) >= 0 && (n) < max_colors) +#define okCOLOR(n) ((n) >= 0 && (n) < MaxColors) #define okRGB(n) ((n) >= 0 && (n) <= 1000) #define DecodeRGB(n) (NCURSES_COLOR_T) ((n * 1000) / 0xffff) @@ -2676,10 +2735,10 @@ static void init_all_colors(bool xterm_colors, char *palette_file) { NCURSES_PAIRS_T cp; - all_colors = typeMalloc(RGB_DATA, (unsigned) max_colors); + all_colors = typeMalloc(RGB_DATA, (unsigned) MaxColors); if (!all_colors) failed("all_colors"); - for (cp = 0; cp < max_colors; ++cp) { + for (cp = 0; cp < MaxColors; ++cp) { color_content(cp, &all_colors[cp].red, &all_colors[cp].green, @@ -2692,11 +2751,12 @@ init_all_colors(bool xterm_colors, char *palette_file) int n; int got; char result[BUFSIZ]; - int check_n, check_r, check_g, check_b; + int check_n; + unsigned check_r, check_g, check_b; raw(); noecho(); - for (n = 0; n < max_colors; ++n) { + for (n = 0; n < MaxColors; ++n) { fprintf(stderr, "\033]4;%d;?\007", n); got = (int) read(0, result, sizeof(result) - 1); if (got < 0) @@ -2749,8 +2809,8 @@ init_all_colors(bool xterm_colors, char *palette_file) #define scaled_rgb(n) ((255 * (n)) / 1000) -static void -color_edit(void) +static int +color_edit(bool recur GCC_UNUSED) /* display the color test pattern, without trying to edit colors */ { int i; @@ -2760,6 +2820,14 @@ color_edit(void) int top_color; int page_size; + if (!UseColors) { + Cannot("does not support color."); + return ERR; + } else if (!can_change_color()) { + Cannot("has hardwired color values."); + return ERR; + } + reset_all_colors(); #ifdef KEY_RESIZE retry: @@ -2772,7 +2840,7 @@ color_edit(void) page_size = (LINES - 6); erase(); - for (i = 0; i < max_colors; i++) + for (i = 0; i < MaxColors; i++) init_pair((NCURSES_PAIRS_T) i, (NCURSES_COLOR_T) COLOR_WHITE, (NCURSES_COLOR_T) i); @@ -2788,10 +2856,10 @@ color_edit(void) for (i = (NCURSES_COLOR_T) top_color; (i - top_color < page_size) - && (i < max_colors); i++) { + && (i < MaxColors); i++) { char numeric[80]; - sprintf(numeric, "[%d]", i); + _nc_SPRINTF(numeric, _nc_SLIMIT(sizeof(numeric)) "[%d]", i); MvPrintw(2 + i - top_color, 0, "%c %-8s:", (i == current ? '>' : ' '), (i < (int) SIZEOF(the_color_names) @@ -2864,7 +2932,7 @@ color_edit(void) case CTRL('f'): case KEY_NPAGE: - if (current < (max_colors - 1)) + if (current < (MaxColors - 1)) current += (page_size - 1); else beep(); @@ -2872,12 +2940,12 @@ color_edit(void) case CTRL('p'): case KEY_UP: - current = (current == 0 ? (max_colors - 1) : current - 1); + current = (current == 0 ? (MaxColors - 1) : current - 1); break; case CTRL('n'): case KEY_DOWN: - current = (current == (max_colors - 1) ? 0 : current + 1); + current = (current == (MaxColors - 1) ? 0 : current + 1); break; case '\t': @@ -2915,7 +2983,7 @@ color_edit(void) change_color((NCURSES_PAIRS_T) current, field, value, 0); break; - case '?': + case HELP_KEY_1: erase(); P(" RGB Value Editing Help"); P(""); @@ -2940,7 +3008,7 @@ color_edit(void) case 'm': endwin(); main_menu(FALSE); - for (i = 0; i < max_colors; i++) + for (i = 0; i < MaxColors; i++) init_pair((NCURSES_PAIRS_T) i, (NCURSES_COLOR_T) COLOR_WHITE, (NCURSES_COLOR_T) i); @@ -2957,8 +3025,8 @@ color_edit(void) if (current < 0) current = 0; - if (current >= max_colors) - current = max_colors - 1; + if (current >= MaxColors) + current = MaxColors - 1; if (current < top_color) top_color = current; if (current - top_color >= page_size) @@ -2977,7 +3045,9 @@ color_edit(void) reset_all_colors(); endwin(); + return OK; } +#endif /* HAVE_COLOR_CONTENT */ /**************************************************************************** * @@ -3009,12 +3079,39 @@ cycle_attr(int ch, unsigned *at_code, chtype *attr, ATTR_TBL * list, unsigned li return result; } +#if USE_WIDEC_SUPPORT +static bool +cycle_w_attr(int ch, unsigned *at_code, attr_t *attr, W_ATTR_TBL * list, unsigned limit) +{ + bool result = TRUE; + + switch (ch) { + case 'v': + if ((*at_code += 1) >= limit) + *at_code = 0; + break; + case 'V': + if (*at_code == 0) + *at_code = limit - 1; + else + *at_code -= 1; + break; + default: + result = FALSE; + break; + } + if (result) + *attr = list[*at_code].attr; + return result; +} +#endif + static bool cycle_colors(int ch, int *fg, int *bg, NCURSES_PAIRS_T *pair) { bool result = FALSE; - if (use_colors) { + if (UseColors) { result = TRUE; switch (ch) { case 'F': @@ -3112,8 +3209,8 @@ call_slk_color(int fg, int bg) } #endif -static void -slk_test(void) +static int +slk_test(bool recur GCC_UNUSED) /* exercise the soft keys */ { int c, fmt = 1; @@ -3131,7 +3228,7 @@ slk_test(void) c = CTRL('l'); #if HAVE_SLK_COLOR - if (use_colors) { + if (UseColors) { call_slk_color(fg, bg); } #endif @@ -3159,7 +3256,7 @@ slk_test(void) case 's': MvPrintw(SLK_WORK, 0, "Press Q to stop the scrolling-test: "); while ((c = Getchar()) != 'Q' && (c != ERR)) - addch((chtype) c); + AddCh(c); break; case 'd': @@ -3187,9 +3284,9 @@ slk_test(void) case '7': case '8': MvAddStr(SLK_WORK, 0, "Please enter the label value: "); - strcpy(buf, ""); + _nc_STRCPY(buf, "", sizeof(buf)); if ((s = slk_label(c - '0')) != 0) { - strncpy(buf, s, (size_t) 8); + _nc_STRNCPY(buf, s, (size_t) 8); } wGetstring(stdscr, buf, 8); slk_set((c - '0'), buf, fmt); @@ -3216,7 +3313,7 @@ slk_test(void) } #if HAVE_SLK_COLOR if (cycle_colors(c, &fg, &bg, &pair)) { - if (use_colors) { + if (UseColors) { call_slk_color(fg, bg); } else { beep(); @@ -3233,27 +3330,28 @@ slk_test(void) slk_clear(); erase(); endwin(); + return OK; } #if USE_WIDEC_SUPPORT #define SLKLEN 8 -static void -wide_slk_test(void) +static int +x_slk_test(bool recur GCC_UNUSED) /* exercise the soft keys */ { int c, fmt = 1; wchar_t buf[SLKLEN + 1]; char *s; - chtype attr = A_NORMAL; + attr_t attr = WA_NORMAL; unsigned at_code = 0; int fg = COLOR_BLACK; int bg = COLOR_WHITE; NCURSES_PAIRS_T pair = 0; - ATTR_TBL my_list[SIZEOF(attrs_to_test)]; - unsigned my_size = init_attr_list(my_list, term_attrs()); + W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)]; + unsigned my_size = init_w_attr_list(my_list, term_attrs()); c = CTRL('l'); - if (use_colors) { + if (UseColors) { call_slk_color(fg, bg); } do { @@ -3279,7 +3377,7 @@ wide_slk_test(void) case 's': MvPrintw(SLK_WORK, 0, "Press Q to stop the scrolling-test: "); while ((c = Getchar()) != 'Q' && (c != ERR)) - addch((chtype) c); + AddCh(c); break; case 'd': @@ -3345,13 +3443,13 @@ wide_slk_test(void) goto done; case 'F': - if (use_colors) { + if (UseColors) { fg = (NCURSES_COLOR_T) ((fg + 1) % COLORS); call_slk_color(fg, bg); } break; case 'B': - if (use_colors) { + if (UseColors) { bg = (NCURSES_COLOR_T) ((bg + 1) % COLORS); call_slk_color(fg, bg); } @@ -3362,7 +3460,7 @@ wide_slk_test(void) break; #endif default: - if (cycle_attr(c, &at_code, &attr, my_list, my_size)) { + if (cycle_w_attr(c, &at_code, &attr, my_list, my_size)) { slk_attr_set(attr, (NCURSES_COLOR_T) (fg || bg), NULL); slk_touch(); slk_noutrefresh(); @@ -3370,7 +3468,7 @@ wide_slk_test(void) } #if HAVE_SLK_COLOR if (cycle_colors(c, &fg, &bg, &pair)) { - if (use_colors) { + if (UseColors) { call_slk_color(fg, bg); } else { beep(); @@ -3387,6 +3485,7 @@ wide_slk_test(void) slk_clear(); erase(); endwin(); + return OK; } #endif #endif /* SLK_INIT */ @@ -3411,7 +3510,7 @@ show_256_chars(int repeat, attr_t attr, NCURSES_PAIRS_T pair) int col = (int) (5 * (code % 16)); IGNORE_RC(mvaddch(row, col, colored_chtype(code, attr, pair))); for (count = 1; count < repeat; ++count) { - addch(colored_chtype(code, attr, pair)); + AddCh(colored_chtype(code, attr, pair)); } } @@ -3445,7 +3544,7 @@ show_upper_chars(int base, int pagesize, int repeat, attr_t attr, NCURSES_PAIRS_ int row = 2 + ((int) (code - first) % (pagesize / 2)); int col = ((int) (code - first) / (pagesize / 2)) * COLS / 2; char tmp[80]; - sprintf(tmp, "%3u (0x%x)", code, code); + _nc_SPRINTF(tmp, _nc_SLIMIT(sizeof(tmp)) "%3u (0x%x)", code, code); MvPrintw(row, col, "%*s: ", COLS / 4, tmp); do { @@ -3455,7 +3554,7 @@ show_upper_chars(int base, int pagesize, int repeat, attr_t attr, NCURSES_PAIRS_ if (C1) { /* (yes, this _is_ crude) */ while ((reply = Getchar()) != ERR) { - addch(UChar(reply)); + AddCh(UChar(reply)); napms(10); } nodelay(stdscr, FALSE); @@ -3500,7 +3599,7 @@ show_pc_chars(int repeat, attr_t attr, NCURSES_PAIRS_T pair) */ break; default: - addch(colored_chtype(code, A_ALTCHARSET | attr, pair)); + AddCh(colored_chtype(code, A_ALTCHARSET | attr, pair)); break; } } while (--count > 0); @@ -3549,7 +3648,7 @@ show_1_acs(int n, int repeat, const char *name, chtype code) MvPrintw(row, col, "%*s : ", COLS / 4, name); do { - addch(code); + AddCh(code); } while (--repeat > 0); return n + 1; } @@ -3611,10 +3710,11 @@ show_acs_chars(int repeat, attr_t attr, NCURSES_PAIRS_T pair) n = show_1_acs(n, repeat, BOTH(ACS_S7)); (void) show_1_acs(n, repeat, BOTH(ACS_S9)); #endif +#undef BOTH } -static void -acs_display(void) +static int +acs_test(bool recur GCC_UNUSED) { int c = 'a'; int pagesize = 32; @@ -3710,7 +3810,7 @@ acs_display(void) MvPrintw(LINES - 2, 0, "Select: a=ACS, w=all x=box, %s0=C1, 1-3,+/- non-ASCII, repeat, ESC=quit", pch_kludge); - if (use_colors) { + if (UseColors) { MvPrintw(LINES - 1, 0, "v/V, f/F, b/B cycle through video attributes (%s) and color %d/%d.", my_list[at_code].name, @@ -3726,6 +3826,7 @@ acs_display(void) Pause(); erase(); endwin(); + return OK; } #if USE_WIDEC_SUPPORT @@ -3783,7 +3884,7 @@ show_paged_widechars(int base, setcchar(&temp, codes, attr, pair, 0); move(row, col); if (wcwidth(code) == 0 && code != 0) { - addch((chtype) space | + AddCh((chtype) space | (A_REVERSE ^ attr) | (attr_t) COLOR_PAIR(pair)); } @@ -3814,7 +3915,8 @@ show_upper_widechars(int first, int repeat, int space, attr_t attr, NCURSES_PAIR int count = repeat; int y, x; - sprintf(tmp, "%3ld (0x%lx)", (long) code, (long) code); + _nc_SPRINTF(tmp, _nc_SLIMIT(sizeof(tmp)) + "%3ld (0x%lx)", (long) code, (long) code); MvPrintw(row, col, "%*s: ", COLS / 4, tmp); memset(&codes, 0, sizeof(codes)); @@ -3829,7 +3931,7 @@ show_upper_widechars(int first, int repeat, int space, attr_t attr, NCURSES_PAIR * the display. */ if (wcwidth(code) == 0) { - addch((chtype) space | + AddCh((chtype) space | (A_REVERSE ^ attr) | (attr_t) COLOR_PAIR(pair)); } @@ -3970,7 +4072,7 @@ show_wacs_chars_double(int repeat, attr_t attr, NCURSES_PAIRS_T pair) n = show_1_wacs(n, repeat, BOTH2(WACS_DEGREE)); n = show_1_wacs(n, repeat, BOTH2(WACS_DIAMOND)); n = show_1_wacs(n, repeat, BOTH2(WACS_PLMINUS)); - n = show_1_wacs(n, repeat, BOTH2(WACS_PLUS)); + n = show_1_wacs(n, repeat, BOTH2(WACS_D_PLUS)); #ifdef CURSES_WACS_ARRAY n = show_1_wacs(n, repeat, BOTH2(WACS_GEQUAL)); @@ -4031,7 +4133,7 @@ show_wacs_chars_thick(int repeat, attr_t attr, NCURSES_PAIRS_T pair) n = show_1_wacs(n, repeat, BOTH2(WACS_DEGREE)); n = show_1_wacs(n, repeat, BOTH2(WACS_DIAMOND)); n = show_1_wacs(n, repeat, BOTH2(WACS_PLMINUS)); - n = show_1_wacs(n, repeat, BOTH2(WACS_PLUS)); + n = show_1_wacs(n, repeat, BOTH2(WACS_T_PLUS)); #ifdef CURSES_WACS_ARRAY n = show_1_wacs(n, repeat, BOTH2(WACS_GEQUAL)); @@ -4097,7 +4199,8 @@ show_2_wacs(int n, const char *name, const char *code, attr_t attr, NCURSES_PAIR MvPrintw(row, col, "%*s : ", COLS / 4, name); (void) attr_set(attr, pair, 0); - addstr(strncpy(temp, code, 20)); + _nc_STRNCPY(temp, code, 20); + addstr(temp); (void) attr_set(A_NORMAL, 0, 0); return n + 1; } @@ -4158,22 +4261,22 @@ show_utf8_chars(int repeat, attr_t attr, NCURSES_PAIRS_T pair) } /* display the wide-ACS character set */ -static void -wide_acs_display(void) +static int +x_acs_test(bool recur GCC_UNUSED) { int c = 'a'; int digit = 0; int repeat = 1; int space = ' '; int pagesize = 32; - chtype attr = A_NORMAL; + attr_t attr = WA_NORMAL; int fg = COLOR_BLACK; int bg = COLOR_BLACK; unsigned at_code = 0; NCURSES_PAIRS_T pair = 0; void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = 0; - ATTR_TBL my_list[SIZEOF(attrs_to_test)]; - unsigned my_size = init_attr_list(my_list, term_attrs()); + W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)]; + unsigned my_size = init_w_attr_list(my_list, term_attrs()); do { switch (c) { @@ -4223,7 +4326,7 @@ wide_acs_display(void) } else if (c == '_') { space = (space == ' ') ? '_' : ' '; last_show_wacs = 0; - } else if (cycle_attr(c, &at_code, &attr, my_list, my_size) + } else if (cycle_w_attr(c, &at_code, &attr, my_list, my_size) || cycle_colors(c, &fg, &bg, &pair)) { if (last_show_wacs != 0) break; @@ -4245,7 +4348,7 @@ wide_acs_display(void) "Select: a/d/t WACS, w=all x=box, u UTF-8, ^L repaint"); MvPrintw(LINES - 3, 2, "0-9,+/- non-ASCII, repeat, _ space, ESC=quit"); - if (use_colors) { + if (UseColors) { MvPrintw(LINES - 2, 2, "v/V, f/F, b/B cycle through video attributes (%s) and color %d/%d.", my_list[at_code].name, @@ -4261,6 +4364,7 @@ wide_acs_display(void) Pause(); erase(); endwin(); + return OK; } #endif @@ -4268,8 +4372,8 @@ wide_acs_display(void) /* * Graphic-rendition test (adapted from vttest) */ -static void -test_sgr_attributes(void) +static int +sgr_attr_test(bool recur GCC_UNUSED) { int pass; @@ -4277,7 +4381,7 @@ test_sgr_attributes(void) chtype normal = ((pass == 0 ? A_NORMAL : A_REVERSE)) | BLANK; /* Use non-default colors if possible to exercise bce a little */ - if (use_colors) { + if (UseColors) { init_pair(1, COLOR_WHITE, COLOR_BLUE); normal |= (chtype) COLOR_PAIR(1); } @@ -4343,6 +4447,7 @@ test_sgr_attributes(void) bkgdset(A_NORMAL | BLANK); erase(); endwin(); + return OK; } /**************************************************************************** @@ -4435,16 +4540,19 @@ newwin_legend(FRAME * curp) for (n = 0; n < SIZEOF(legend); n++) { switch (legend[n].code) { default: - strcpy(buf, legend[n].msg); + _nc_STRCPY(buf, legend[n].msg, sizeof(buf)); break; case 1: - sprintf(buf, legend[n].msg, do_keypad ? "yes" : "no"); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + legend[n].msg, do_keypad ? "yes" : "no"); break; case 2: - sprintf(buf, legend[n].msg, do_scroll ? "yes" : "no"); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + legend[n].msg, do_scroll ? "yes" : "no"); break; case 3: - sprintf(buf, legend[n].msg, do_keypad ? "/ESC" : ""); + _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) + legend[n].msg, do_keypad ? "/ESC" : ""); break; } x = getcurx(stdscr); @@ -4533,8 +4641,8 @@ selectcell(int uli, int ulj, int lri, int lrj) break; } } - /* FALLTHRU */ #endif + /* FALLTHRU */ default: res.y = uli + i; res.x = ulj + j; @@ -4635,14 +4743,14 @@ delete_framed(FRAME * fp, bool showit) } delwin(fp->wind); - np = (fp == fp->next) ? 0 : fp->next; + np = (fp == fp->next) ? NULL : fp->next; free(fp); } return np; } -static void -acs_and_scroll(void) +static int +scroll_test(bool recur GCC_UNUSED) /* Demonstrate windows */ { int c; @@ -4664,11 +4772,11 @@ acs_and_scroll(void) switch (c) { case CTRL('C'): if ((neww = typeCalloc(FRAME, (size_t) 1)) == 0) { - failed("acs_and_scroll"); + failed("scroll_test"); goto breakout; } if ((neww->wind = getwindow()) == (WINDOW *) 0) { - failed("acs_and_scroll"); + failed("scroll_test"); free(neww); goto breakout; } @@ -4762,7 +4870,7 @@ acs_and_scroll(void) wrefresh(neww->wind); } else { - failed("acs_and_scroll"); + failed("scroll_test"); } (void) fclose(fp); } @@ -4884,6 +4992,7 @@ acs_and_scroll(void) noraw(); erase(); endwin(); + return OK; } /**************************************************************************** @@ -4953,7 +5062,7 @@ mkpanel(NCURSES_COLOR_T color, int rows, int cols, int tly, int tlx) if ((win = newwin(rows, cols, tly, tlx)) != 0) { if ((pan = new_panel(win)) == 0) { delwin(win); - } else if (use_colors) { + } else if (UseColors) { NCURSES_COLOR_T fg = (NCURSES_COLOR_T) ((color == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK); @@ -4972,7 +5081,7 @@ mkpanel(NCURSES_COLOR_T color, int rows, int cols, int tly, int tlx) rmpanel(pan) --------------------------------------------------------------------------*/ static void -rmpanel(PANEL * pan) +rmpanel(PANEL *pan) { WINDOW *win = panel_window(pan); del_panel(pan); @@ -5004,7 +5113,7 @@ init_panel(WINDOW *win) } static void -fill_panel(PANEL * pan) +fill_panel(PANEL *pan) { WINDOW *win = panel_window(pan); const char *userptr = (const char *) panel_userptr(pan); @@ -5041,7 +5150,7 @@ init_wide_panel(WINDOW *win) } static void -fill_wide_panel(PANEL * pan) +fill_wide_panel(PANEL *pan) { WINDOW *win = panel_window(pan); const char *userptr = (const char *) panel_userptr(pan); @@ -5064,7 +5173,7 @@ fill_wide_panel(PANEL * pan) #define MAX_PANELS 5 static void -canned_panel(PANEL * px[MAX_PANELS + 1], NCURSES_CONST char *cmd) +canned_panel(PANEL *px[MAX_PANELS + 1], NCURSES_CONST char *cmd) { int which = cmd[1] - '0'; @@ -5090,7 +5199,7 @@ canned_panel(PANEL * px[MAX_PANELS + 1], NCURSES_CONST char *cmd) wait_a_while(nap_msec); } -static void +static int demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (PANEL *)) { int count; @@ -5229,7 +5338,24 @@ demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (PANEL *)) erase(); endwin(); + return OK; +} + +#if USE_LIBPANEL +static int +panel_test(bool recur GCC_UNUSED) +{ + return demo_panels(init_panel, fill_panel); } +#endif + +#if USE_WIDEC_SUPPORT && USE_LIBPANEL +static int +x_panel_test(bool recur GCC_UNUSED) +{ + return demo_panels(init_wide_panel, fill_wide_panel); +} +#endif #endif /* USE_LIBPANEL */ /**************************************************************************** @@ -5238,6 +5364,25 @@ demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (PANEL *)) * ****************************************************************************/ +#if HAVE_NEWPAD + +/* The behavior of mvhline, mvvline for negative/zero length is unspecified, + * though we can rely on negative x/y values to stop the macro. + */ +static void +do_h_line(int y, int x, chtype c, int to) +{ + if ((to) > (x)) + MvHLine(y, x, c, (to) - (x)); +} + +static void +do_v_line(int y, int x, chtype c, int to) +{ + if ((to) > (y)) + MvVLine(y, x, c, (to) - (y)); +} + #define GRIDSIZE 3 static bool pending_pan = FALSE; @@ -5354,8 +5499,8 @@ panner(WINDOW *pad, erase(); /* FALLTHRU */ - case '?': - if (c == '?') + case HELP_KEY_1: + if (c == HELP_KEY_1) show_panner_legend = !show_panner_legend; panner_legend(LINES - 4); panner_legend(LINES - 3); @@ -5650,24 +5795,24 @@ padgetch(WINDOW *win) #define PAD_HIGH 200 #define PAD_WIDE 200 -static void -demo_pad(bool colored) +static int +pad_test(bool recur GCC_UNUSED) /* Demonstrate pads. */ { WINDOW *panpad = newpad(PAD_HIGH, PAD_WIDE); if (panpad == 0) { Cannot("cannot create requested pad"); - return; + return ERR; } #ifdef A_COLOR - if (colored && use_colors) { + if (UseColors) { init_pair(1, COLOR_BLACK, COLOR_GREEN); init_pair(2, COLOR_CYAN, COLOR_BLUE); wbkgd(panpad, (chtype) (COLOR_PAIR(2) | ' ')); } #endif - fill_pad(panpad, FALSE, colored); + fill_pad(panpad, FALSE, TRUE); panner_legend(LINES - 4); panner_legend(LINES - 3); @@ -5680,12 +5825,14 @@ demo_pad(bool colored) * We'll still be able to widen it during a test, since that's required * for testing boundaries. */ - panner(panpad, 2, 2, LINES - 5, COLS - 15, padgetch, colored); + panner(panpad, 2, 2, LINES - 5, COLS - 15, padgetch, TRUE); delwin(panpad); endwin(); erase(); + return OK; } +#endif /* HAVE_NEWPAD */ /**************************************************************************** * @@ -5703,10 +5850,11 @@ Continue(WINDOW *win) wGetchar(win); } -static void -flushinp_test(WINDOW *win) +static int +flushinp_test(bool recur GCC_UNUSED) /* Input test, adapted from John Burnell's PDCurses tester */ { + WINDOW *win = stdscr; int w, h, bx, by, sw, sh, i; WINDOW *subWin; @@ -5717,10 +5865,10 @@ flushinp_test(WINDOW *win) sw = w / 3; sh = h / 3; if ((subWin = subwin(win, sh, sw, by + h - sh - 2, bx + w - sw - 2)) == 0) - return; + return ERR; #ifdef A_COLOR - if (use_colors) { + if (UseColors) { init_pair(2, COLOR_CYAN, COLOR_BLUE); wbkgd(subWin, (chtype) (COLOR_PAIR(2) | ' ')); } @@ -5784,6 +5932,7 @@ flushinp_test(WINDOW *win) Continue(win); cbreak(); + return OK; } /**************************************************************************** @@ -5841,8 +5990,8 @@ static CONST_MENUS char *animals[] = (char *) 0 }; -static void -menu_test(void) +static int +menu_test(bool recur GCC_UNUSED) { MENU *m; ITEM *items[SIZEOF(animals)]; @@ -5904,6 +6053,7 @@ menu_test(void) #ifdef NCURSES_MOUSE_VERSION mousemask(0, (mmask_t *) 0); #endif + return OK; } #ifdef TRACE @@ -5938,29 +6088,31 @@ static char * tracetrace(unsigned tlevel) { static char *buf; + static size_t need = 12; int n; if (buf == 0) { - size_t need = 12; for (n = 0; t_tbl[n].name != 0; n++) need += strlen(t_tbl[n].name) + 2; buf = typeMalloc(char, need); if (!buf) failed("tracetrace"); } - sprintf(buf, "0x%02x = {", tlevel); + _nc_SPRINTF(buf, _nc_SLIMIT(need) "0x%02x = {", tlevel); if (tlevel == 0) { - sprintf(buf + strlen(buf), "%s, ", t_tbl[0].name); + _nc_STRCAT(buf, t_tbl[0].name, need); + _nc_STRCAT(buf, ", ", need); } else { for (n = 1; t_tbl[n].name != 0; n++) if ((tlevel & t_tbl[n].mask) == t_tbl[n].mask) { - strcat(buf, t_tbl[n].name); - strcat(buf, ", "); + _nc_STRCAT(buf, t_tbl[n].name, need); + _nc_STRCAT(buf, ", ", need); } } if (buf[strlen(buf) - 2] == ',') buf[strlen(buf) - 2] = '\0'; - return (strcat(buf, "}")); + _nc_STRCAT(buf, "}", need); + return buf; } /* fake a dynamically reconfigurable menu using the 0th entry to deselect @@ -6002,8 +6154,8 @@ run_trace_menu(MENU * m) } } -static void -trace_set(void) +static int +trace_set(bool recur GCC_UNUSED) /* interactively set the trace level */ { MENU *m; @@ -6073,6 +6225,8 @@ trace_set(void) free_menu(m); for (ip = items; *ip; ip++) free_item(*ip); + + return OK; } #endif /* TRACE */ #endif /* USE_LIBMENU */ @@ -6108,7 +6262,7 @@ make_field(int frow, int fcol, int rows, int cols, bool secure) } static void -display_form(FORM * f) +display_form(FORM *f) { WINDOW *w; int rows, cols; @@ -6126,7 +6280,7 @@ display_form(FORM * f) } static void -erase_form(FORM * f) +erase_form(FORM *f) { WINDOW *w = form_win(f); WINDOW *s = form_sub(f); @@ -6139,7 +6293,7 @@ erase_form(FORM * f) } static int -edit_secure(FIELD * me, int c) +edit_secure(FIELD *me, int c) { int rows, cols, frow, fcol, nrow, nbuf; @@ -6152,7 +6306,7 @@ edit_secure(FIELD * me, int c) size_t len; if (temp != 0) { - strncpy(temp, source ? source : "", have + 1); + _nc_STRNCPY(temp, source ? source : "", have + 1); len = (size_t) (char *) field_userptr(me); if (c <= KEY_MAX) { if (isgraph(c) && (len + 1) < sizeof(temp)) { @@ -6205,7 +6359,7 @@ edit_secure(FIELD * me, int c) } static int -form_virtualize(FORM * f, WINDOW *w) +form_virtualize(FORM *f, WINDOW *w) { /* *INDENT-OFF* */ static const struct { @@ -6312,7 +6466,7 @@ form_virtualize(FORM * f, WINDOW *w) } static int -my_form_driver(FORM * form, int c) +my_form_driver(FORM *form, int c) { if (c == (MAX_FORM_COMMAND + 1) && form_driver(form, REQ_VALIDATION) == E_OK) @@ -6397,8 +6551,8 @@ CHAR_CHECK_CB(pw_char_check) return (isgraph(ch) ? TRUE : FALSE); } -static void -demo_forms(void) +static int +form_test(bool recur GCC_UNUSED) { WINDOW *w; FORM *form; @@ -6491,6 +6645,7 @@ demo_forms(void) #ifdef NCURSES_MOUSE_VERSION mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0); #endif + return OK; } #endif /* USE_LIBFORM */ @@ -6500,6 +6655,7 @@ demo_forms(void) * ****************************************************************************/ +#if HAVE_COPYWIN /* ...and overlay, overwrite */ static void fillwin(WINDOW *win, char ch) { @@ -6612,56 +6768,67 @@ overlap_help(int state, int flavors[OVERLAP_FLAVORS]) switch (row) { case 0: flavors[row] = 0; - sprintf(msg, "refresh %s, then %s, then doupdate.", ths, tht); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "refresh %s, then %s, then doupdate.", ths, tht); break; case 1: - if (use_colors) { + if (UseColors) { flavors[row] %= 4; } else { flavors[row] %= 2; } overlap_test_1_attr(stdscr, flavors[row], col); - sprintf(msg, "fill window %s with letter %s.", ths, ths); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "fill window %s with letter %s.", ths, ths); break; case 2: - if (use_colors) { + if (UseColors) { flavors[row] %= 4; } else { flavors[row] %= 2; } switch (flavors[row]) { case 0: - sprintf(msg, "cross pattern in window %s.", ths); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "cross pattern in window %s.", ths); break; case 1: - sprintf(msg, "draw box in window %s.", ths); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "draw box in window %s.", ths); break; case 2: - sprintf(msg, "set background of window %s.", ths); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "set background of window %s.", ths); break; case 3: - sprintf(msg, "reset background of window %s.", ths); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "reset background of window %s.", ths); break; } break; case 3: flavors[row] = 0; - sprintf(msg, "clear window %s.", ths); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "clear window %s.", ths); break; case 4: flavors[row] %= 4; switch (flavors[row]) { case 0: - sprintf(msg, "overwrite %s onto %s.", ths, tht); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "overwrite %s onto %s.", ths, tht); break; case 1: - sprintf(msg, "copywin(FALSE) %s onto %s.", ths, tht); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "copywin(FALSE) %s onto %s.", ths, tht); break; case 2: - sprintf(msg, "copywin(TRUE) %s onto %s.", ths, tht); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "copywin(TRUE) %s onto %s.", ths, tht); break; case 3: - sprintf(msg, "overlay %s onto %s.", ths, tht); + _nc_SPRINTF(msg, _nc_SLIMIT(sizeof(msg)) + "overlay %s onto %s.", ths, tht); break; } break; @@ -6742,8 +6909,8 @@ overlap_test_4(int flavor, WINDOW *a, WINDOW *b) } /* test effects of overlapping windows */ -static void -overlap_test(void) +static int +overlap_test(bool recur GCC_UNUSED) { int ch; int state, flavor[OVERLAP_FLAVORS]; @@ -6819,7 +6986,7 @@ overlap_test(void) state = overlap_help(state, flavor); break; - case '?': + case HELP_KEY_1: state = overlap_help(state, flavor); break; @@ -6831,152 +6998,105 @@ overlap_test(void) delwin(win2); delwin(win1); erase(); - curs_set(1); - endwin(); + exit_curses(); + return OK; } -/**************************************************************************** - * - * Main sequence - * - ****************************************************************************/ +#endif /* HAVE_COPYWIN */ -static bool -do_single_test(const char c) -/* perform a single specified test */ +static void +show_setting_name(const char *name) { - switch (c) { - case 'a': - getch_test(); - break; - -#if USE_WIDEC_SUPPORT - case 'A': - get_wch_test(); - break; -#endif - - case 'b': - attr_test(); - break; - -#if USE_WIDEC_SUPPORT - case 'B': - wide_attr_test(); - break; -#endif - - case 'c': - if (!use_colors) - Cannot("does not support color."); - else - color_test(); - break; + printw("%-25s ", name); +} -#if USE_WIDEC_SUPPORT - case 'C': - if (!use_colors) - Cannot("does not support color."); - else - wide_color_test(); - break; -#endif +static void +show_string_setting(const char *name, const char *value) +{ + show_setting_name(name); + if (value) { + printw("\"%s\"", value); + } else { + attron(A_REVERSE); + addstr(""); + attroff(A_REVERSE); + } + AddCh('\n'); +} - case 'd': - if (!use_colors) - Cannot("does not support color."); - else if (!can_change_color()) - Cannot("has hardwired color values."); - else - color_edit(); - break; +static void +show_number_setting(const char *name, int value) +{ + show_setting_name(name); + if (value >= 0) { + printw("%d", value); + } else { + attron(A_REVERSE); + printw("%d", value); + attroff(A_REVERSE); + } + AddCh('\n'); +} -#if USE_SOFTKEYS - case 'e': - slk_test(); - break; +static void +show_boolean_setting(const char *name, int value) +{ + show_setting_name(name); + if (value >= 0) { + printw("%s", value ? "TRUE" : "FALSE"); + } else { + attron(A_REVERSE); + printw("%d", value); + attroff(A_REVERSE); + } + AddCh('\n'); +} +static int +settings_test(bool recur GCC_UNUSED) +{ #if USE_WIDEC_SUPPORT - case 'E': - wide_slk_test(); - break; -#endif + wchar_t ch; #endif - case 'f': - acs_display(); - break; - + move(0, 0); + show_string_setting("termname", termname()); + show_string_setting("longname", longname()); + show_number_setting("baudrate", baudrate()); + if (erasechar() > 0) { + show_string_setting("unctrl(erasechar)", unctrl((chtype) erasechar())); + show_string_setting("keyname(erasechar)", keyname(erasechar())); + } + if (killchar() > 0) { + show_string_setting("unctrl(killchar)", unctrl((chtype) killchar())); + show_string_setting("keyname(killchar)", keyname(killchar())); + } #if USE_WIDEC_SUPPORT - case 'F': - wide_acs_display(); - break; -#endif - -#if USE_LIBPANEL - case 'o': - demo_panels(init_panel, fill_panel); - break; -#endif - -#if USE_WIDEC_SUPPORT && USE_LIBPANEL - case 'O': - demo_panels(init_wide_panel, fill_wide_panel); - break; -#endif - - case 'g': - acs_and_scroll(); - break; - - case 'i': - flushinp_test(stdscr); - break; - - case 'k': - test_sgr_attributes(); - break; - -#if USE_LIBMENU - case 'm': - menu_test(); - break; -#endif - - case 'p': - demo_pad(FALSE); - break; - - case 'P': - demo_pad(TRUE); - break; - -#if USE_LIBFORM - case 'r': - demo_forms(); - break; + if (erasewchar(&ch) == OK) { + show_string_setting("key_name(erasewchar)", key_name(ch)); + } + if (killwchar(&ch) == OK) { + show_string_setting("key_name(killwchar)", key_name(ch)); + } #endif - - case 's': - overlap_test(); - break; - -#if USE_LIBMENU && defined(TRACE) - case 't': - trace_set(); - break; + show_boolean_setting("has_ic", has_ic()); + show_boolean_setting("has_il", has_il()); + show_boolean_setting("has_colors", has_colors()); +#if HAVE_COLOR_CONTENT + show_boolean_setting("can_change_color", can_change_color()); #endif - - case '?': - break; - - default: - return FALSE; - } - - return TRUE; + Pause(); + erase(); + exit_curses(); + return OK; } +/**************************************************************************** + * + * Main sequence + * + ****************************************************************************/ + static void usage(void) { @@ -7000,7 +7120,9 @@ usage(void) ," -h rip-off header line (can repeat)" #endif ," -m do not use colors" +#if HAVE_COLOR_CONTENT ," -p file rgb values to use in 'd' rather than ncurses's builtin" +#endif #if USE_LIBPANEL ," -s msec specify nominal time for panel-demo (default: 1, to hold)" #endif @@ -7010,7 +7132,9 @@ usage(void) #ifdef TRACE ," -t mask specify default trace-level (may toggle with ^T)" #endif +#if HAVE_COLOR_CONTENT ," -x use xterm-compatible control for reading color palette" +#endif }; size_t n; for (n = 0; n < SIZEOF(tbl); n++) @@ -7064,57 +7188,85 @@ rip_header(WINDOW *win, int cols) static void main_menu(bool top) { - char command; - - do { - (void) puts("This is the ncurses main menu"); - (void) puts("a = keyboard and mouse input test"); #if USE_WIDEC_SUPPORT - (void) puts("A = wide-character keyboard and mouse input test"); -#endif - (void) puts("b = character attribute test"); -#if USE_WIDEC_SUPPORT - (void) puts("B = wide-character attribute test"); + typedef struct { + bool recur; + int (*narrow_func) (bool); + int (*wide_func) (bool); + int code; + const char *help; + } MyCmds; +#define BOTH(a) a, x_ ## a +#define ONLY(a) a, NULL +#define CMDS(recur, funcs,code,help) { recur, funcs, code, help } +#else + typedef struct { + bool recur; + int (*narrow_func) (bool); + int code; + const char *help; + } MyCmds; +#define BOTH(a) a +#define ONLY(a) a +#define CMDS(recur, funcs,code,help) { recur, funcs, code, help } #endif - (void) puts("c = color test pattern"); -#if USE_WIDEC_SUPPORT - (void) puts("C = color test pattern using wide-character calls"); + /* *INDENT-OFF* */ + static MyCmds cmds[] = + { + CMDS(TRUE, BOTH(getch_test), 'a', "keyboard and mouse input test"), + CMDS(TRUE, BOTH(attr_test), 'b', "character attribute test"), + CMDS(TRUE, BOTH(color_test), 'c', "color test pattern"), +#if HAVE_COLOR_CONTENT + CMDS(FALSE, ONLY(color_edit), 'd', "edit RGB color values"), #endif - if (top) - (void) puts("d = edit RGB color values"); #if USE_SOFTKEYS - (void) puts("e = exercise soft keys"); -#if USE_WIDEC_SUPPORT - (void) puts("E = exercise soft keys using wide-characters"); -#endif + CMDS(TRUE, BOTH(slk_test), 'e', "exercise soft keys"), #endif - (void) puts("f = display ACS characters"); -#if USE_WIDEC_SUPPORT - (void) puts("F = display Wide-ACS characters"); + CMDS(TRUE, BOTH(acs_test), 'f', "display ACS characters"), + CMDS(TRUE, ONLY(scroll_test), 'g', "display windows and scrolling"), + CMDS(TRUE, ONLY(flushinp_test), 'i', "test flushinp()"), + CMDS(TRUE, ONLY(sgr_attr_test), 'k', "display character attributes"), +#if USE_LIBMENU + CMDS(TRUE, ONLY(menu_test), 'm', "exercise menu library"), #endif - (void) puts("g = display windows and scrolling"); - (void) puts("i = test of flushinp()"); - (void) puts("k = display character attributes"); #if USE_LIBMENU - (void) puts("m = menu code test"); + CMDS(TRUE, BOTH(panel_test), 'o', "exercise panel library"), #endif -#if USE_LIBPANEL - (void) puts("o = exercise panels library"); -#if USE_WIDEC_SUPPORT - (void) puts("O = exercise panels with wide-characters"); +#if HAVE_NEWPAD + CMDS(TRUE, ONLY(pad_test), 'p', "exercise pad features"), #endif + CMDS(TRUE, ONLY(NULL), 'q', "quit"), +#if USE_LIBMENU + CMDS(TRUE, ONLY(form_test), 'r', "exercise form library"), #endif - (void) puts("p = exercise pad features"); - (void) puts("P = exercise pad features, using color"); - (void) puts("q = quit"); -#if USE_LIBFORM - (void) puts("r = exercise forms code"); +#if HAVE_COPYWIN + CMDS(TRUE, ONLY(overlap_test), 's', "overlapping-refresh test"), #endif - (void) puts("s = overlapping-refresh test"); #if USE_LIBMENU && defined(TRACE) - (void) puts("t = set trace level"); + CMDS(TRUE, ONLY(trace_set), 't', "set trace level"), #endif - (void) puts("? = repeat this command summary"); + CMDS(TRUE, ONLY(settings_test), 'v', "show terminal name and settings"), + CMDS(FALSE, ONLY(NULL), '?', "repeat this command summary") + }; + /* *INDENT-ON* */ + + 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) { + if (top || cmds[n].recur) { + putchar(' '); +#if USE_WIDEC_SUPPORT + if (cmds[n].wide_func) { + printf("%c,", toupper(cmds[n].code)); + } +#endif + printf("%c\t= %s\n", cmds[n].code, cmds[n].help); + } + } (void) fputs("> ", stdout); (void) fflush(stdout); /* necessary under SVr4 curses */ @@ -7145,7 +7297,21 @@ main_menu(bool top) } } - if (do_single_test(command)) { + doit = NULL; + for (n = 0; n < SIZEOF(cmds); ++n) { + if (cmds[n].code == command) { + doit = cmds[n].narrow_func; + break; + } +#if USE_WIDEC_SUPPORT + if (toupper(cmds[n].code) == command) { + doit = cmds[n].wide_func; + break; + } +#endif + } + + if (doit != NULL && doit(FALSE) == OK) { /* * This may be overkill; it's intended to reset everything back * to the initial terminal modes so that tests don't get in @@ -7187,9 +7353,11 @@ main(int argc, char *argv[]) bool assumed_colors = FALSE; bool default_colors = FALSE; #endif - char *palette_file = 0; bool monochrome = FALSE; +#if HAVE_COLOR_CONTENT bool xterm_colors = FALSE; + char *palette_file = 0; +#endif setlocale(LC_ALL, ""); @@ -7237,9 +7405,11 @@ main(int argc, char *argv[]) case 'm': monochrome = TRUE; break; +#if HAVE_COLOR_CONTENT case 'p': palette_file = optarg; break; +#endif #if USE_LIBPANEL case 's': nap_msec = (int) atol(optarg); @@ -7255,9 +7425,11 @@ main(int argc, char *argv[]) save_trace = (unsigned) strtol(optarg, 0, 0); break; #endif +#if HAVE_COLOR_CONTENT case 'x': xterm_colors = TRUE; break; +#endif default: usage(); } @@ -7296,16 +7468,16 @@ main(int argc, char *argv[]) def_prog_mode(); /* tests, in general, will want these modes */ - use_colors = (bool) (monochrome ? FALSE : has_colors()); + UseColors = (bool) (monochrome ? FALSE : has_colors()); - if (use_colors) { + if (UseColors) { start_color(); #ifdef NCURSES_VERSION_PATCH - max_colors = COLORS; /* was > 16 ? 16 : COLORS */ + MaxColors = COLORS; /* was > 16 ? 16 : COLORS */ #if HAVE_USE_DEFAULT_COLORS if (default_colors) { use_default_colors(); - min_colors = -1; + MinColors = -1; } #if HAVE_ASSUME_DEFAULT_COLORS if (assumed_colors) @@ -7313,13 +7485,15 @@ main(int argc, char *argv[]) #endif #endif #else /* normal SVr4 curses */ - max_colors = COLORS; /* was > 8 ? 8 : COLORS */ + MaxColors = COLORS; /* was > 8 ? 8 : COLORS */ #endif max_pairs = COLOR_PAIRS; /* was > 256 ? 256 : COLOR_PAIRS */ +#if HAVE_COLOR_CONTENT if (can_change_color()) { init_all_colors(xterm_colors, palette_file); } +#endif } /*