X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fncurses.c;h=f50530ab63723e9b134ede62433829412f34921b;hp=c9367296ace95f6ea3be339a00aa3f44ae2803fa;hb=HEAD;hpb=b73ae15cdc71aecdfd306f85bd3c37f9fd5024f4 diff --git a/test/ncurses.c b/test/ncurses.c index c9367296..a272d142 100644 --- a/test/ncurses.c +++ b/test/ncurses.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * + * Copyright 2018-2022,2023 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,24 +41,24 @@ AUTHOR Author: Eric S. Raymond 1993 Thomas E. Dickey (beginning revision 1.27 in 1996). -$Id: ncurses.c,v 1.508 2018/09/22 21:21:43 tom Exp $ +$Id: ncurses.c,v 1.538 2023/11/11 01:23:59 tom Exp $ ***************************************************************************/ +#define NEED_TIME_H 1 #include #ifdef __hpux #undef mvwdelch /* HPUX 11.23 macro will not compile */ #endif -#if HAVE_GETTIMEOFDAY #if HAVE_SYS_TIME_H && HAVE_SYS_TIME_SELECT #include #endif + #if HAVE_SYS_SELECT_H #include #endif -#endif #if USE_LIBPANEL #include @@ -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")); } @@ -488,7 +490,7 @@ ShellOut(bool message) addstr("Shelling out..."); def_prog_mode(); endwin(); -#ifdef _WIN32 +#ifdef _NC_WINDOWS system("cmd.exe"); #else IGNORE_RC(system("sh")); @@ -579,7 +581,6 @@ mouse_decode(MEVENT const *ep) static void show_mouse(WINDOW *win) { - int y, x; MEVENT event; bool outside; bool show_loc; @@ -602,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, '*'); @@ -768,7 +770,7 @@ slk_repaint(void) * Resize both and paint the box in the parent. */ static void -resize_boxes(unsigned level, WINDOW *win) +resize_boxes(unsigned level, const WINDOW *const win) { unsigned n; int base = 5; @@ -818,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; @@ -832,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)) { @@ -852,7 +855,7 @@ wgetch_test(unsigned level, WINDOW *win, int delay) setup_getch(win, flags); wgetch_help(win, flags); } else if (c == 'g') { - waddstr(win, "getstr test: "); + waddstr(win, "wgetnstr test: "); echo(); c = wgetnstr(win, buf, sizeof(buf) - 1); noecho(); @@ -1009,7 +1012,7 @@ getch_test(bool recur GCC_UNUSED) */ #if defined(KEY_RESIZE) && HAVE_WRESIZE static void -resize_wide_boxes(unsigned level, WINDOW *win) +resize_wide_boxes(unsigned level, const WINDOW *const win) { unsigned n; int base = 5; @@ -1076,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); @@ -1089,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)) { @@ -1109,7 +1113,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) setup_getch(win, flags); wgetch_help(win, flags); } else if (c == 'g') { - waddstr(win, "getstr test: "); + waddstr(win, "wgetn_str test: "); echo(); code = wgetn_wstr(win, wint_buf, BUFSIZ - 1); noecho(); @@ -1385,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; @@ -1451,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 { @@ -1662,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, @@ -1791,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; @@ -1843,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; } @@ -2022,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, @@ -2133,13 +2141,11 @@ show_color_name(int y, int x, int color, bool wide, int zoom) int width = 8; if (wide || zoom) { - int have; - _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%02d", color); if (wide) width = 4; - if ((have = (int) strlen(temp)) >= width) { + if ((int) strlen(temp) >= width) { int pwr2 = 0; while ((1 << pwr2) < color) ++pwr2; @@ -2497,12 +2503,12 @@ color_test(bool recur GCC_UNUSED) #if USE_WIDEC_SUPPORT -#if HAVE_INIT_EXTENDED_COLOR +#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),(f),(g)) +#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 @@ -2516,7 +2522,7 @@ x_color_test(bool recur GCC_UNUSED) 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; @@ -2839,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) @@ -2877,6 +2885,10 @@ init_all_colors(bool xterm_colors, char *palette_file) while (fgets(buffer, sizeof(buffer), fp) != 0) { if (sscanf(buffer, "scale:%d", &c) == 1) { scale = c; + if (scale < 100) + scale = 100; + if (scale > 1000) + scale = 1000; } else if (sscanf(buffer, "%d:%d %d %d", &c, &red, @@ -3145,7 +3157,7 @@ color_edit(bool recur GCC_UNUSED) * ****************************************************************************/ static bool -cycle_attr(int ch, unsigned *at_code, chtype *attr, ATTR_TBL * list, unsigned limit) +cycle_attr(int ch, unsigned *at_code, attr_t *attr, ATTR_TBL * list, unsigned limit) { bool result = TRUE; @@ -3306,7 +3318,7 @@ slk_test(bool recur GCC_UNUSED) int c, fmt = 1; char buf[9]; char *s; - chtype attr = A_NORMAL; + attr_t attr = A_NORMAL; unsigned at_code = 0; #if HAVE_SLK_COLOR int fg = COLOR_BLACK; @@ -3396,7 +3408,7 @@ slk_test(bool recur GCC_UNUSED) default: if (cycle_attr(c, &at_code, &attr, my_list, my_size)) { - slk_attrset(attr); + slk_attrset((chtype) attr); slk_touch(); slk_noutrefresh(); break; @@ -3500,14 +3512,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) { @@ -3726,7 +3739,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 @@ -3812,7 +3824,7 @@ acs_test(bool recur GCC_UNUSED) const char *pch_kludge = ((term != 0 && strstr(term, "linux")) ? "p=PC, " : ""); - chtype attr = A_NORMAL; + attr_t attr = A_NORMAL; int digit = 0; int repeat = 1; int fg = COLOR_BLACK; @@ -3923,15 +3935,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); @@ -3945,15 +3956,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; @@ -3964,8 +3975,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; @@ -3986,24 +3997,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); @@ -4014,6 +4024,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 ":". @@ -4274,7 +4286,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 @@ -4347,7 +4358,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 */ @@ -4355,10 +4365,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; @@ -4367,7 +4377,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'): @@ -4399,15 +4412,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') { + sscanf(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; @@ -4435,7 +4473,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) { @@ -4621,13 +4663,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)); @@ -4971,7 +5015,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(); @@ -5000,11 +5044,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)); @@ -5489,7 +5535,7 @@ panner_legend(int line) "Number repeats. Toggle legend:? filler:a timer:t scrollmark:s." }; int n = ((int) SIZEOF(legend) - (LINES - line)); - if (n >= 0) { + if (n >= 0 && n < (int) SIZEOF(legend)) { if (move(line, 0) != ERR) { if (show_panner_legend) printw("%s", legend[n]); @@ -5554,10 +5600,8 @@ panner(WINDOW *pad, int (*pgetc) (WINDOW *), bool colored) { -#if HAVE_GETTIMEOFDAY - struct timeval before, after; + TimeType before, after; bool timing = TRUE; -#endif bool pan_lines = FALSE; bool scrollers = TRUE; int basex = 0; @@ -5603,13 +5647,11 @@ panner(WINDOW *pad, pending_pan = FALSE; break; -#if HAVE_GETTIMEOFDAY case 't': timing = !timing; if (!timing) panner_legend(LINES - 1); break; -#endif case 's': scrollers = !scrollers; break; @@ -5782,9 +5824,7 @@ panner(WINDOW *pad, MvAddCh(porty - 1, portx - 1, ACS_LRCORNER); if (!pending_pan) { -#if HAVE_GETTIMEOFDAY - gettimeofday(&before, 0); -#endif + GetClockTime(&before); wnoutrefresh(stdscr); pnoutrefresh(pad, @@ -5794,17 +5834,12 @@ panner(WINDOW *pad, portx - (pymax > porty) - 1); doupdate(); -#if HAVE_GETTIMEOFDAY -#define TIMEVAL2S(data) ((double) data.tv_sec + ((double) data.tv_usec / 1.0e6)) if (timing) { - double elapsed; - gettimeofday(&after, 0); - elapsed = (TIMEVAL2S(after) - TIMEVAL2S(before)); + GetClockTime(&after); move(LINES - 1, COLS - 12); - printw("Secs: %2.03f", elapsed); + printw("Secs: %6.03f", ElapsedSeconds(&before, &after)); refresh(); } -#endif } } while @@ -5818,13 +5853,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); @@ -6126,7 +6161,6 @@ menu_test(bool recur GCC_UNUSED) break; if (c == E_REQUEST_DENIED) beep(); - continue; } MvPrintw(LINES - 2, 0, @@ -6190,7 +6224,7 @@ tracetrace(unsigned tlevel) } _nc_SPRINTF(buf, _nc_SLIMIT(need) "0x%02x = {", tlevel); if (tlevel == 0) { - _nc_STRCAT(buf, t_tbl[0].name, need); + _nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need); _nc_STRCAT(buf, ", ", need); } else { for (n = 1; t_tbl[n].name != 0; n++) @@ -6294,14 +6328,15 @@ trace_set(bool recur GCC_UNUSED) set_item_value(*ip, TRUE); } - while (run_trace_menu(m)) - continue; + while (run_trace_menu(m)) { + /* EMPTY */ ; + } newtrace = 0; 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, @@ -6334,7 +6369,7 @@ make_label(int frow, int fcol, NCURSES_CONST char *label) if (f) { set_field_buffer(f, 0, label); - set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE)); + set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE)); } return (f); } @@ -6393,9 +6428,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) { @@ -6498,7 +6533,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; @@ -6510,6 +6544,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; @@ -6644,12 +6679,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 @@ -6699,6 +6733,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); @@ -6992,11 +7028,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) @@ -7005,10 +7038,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: @@ -7196,11 +7229,11 @@ overlap_test(bool recur GCC_UNUSED) overlap_test_0(win2, win1); break; - case 'c': /* fill window A so it's visible */ + case 'c': /* fill window A so it is visible */ overlap_test_1(flavor[otBASE_fill], 0, win1, 'A'); break; - case 'd': /* fill window B so it's visible */ + case 'd': /* fill window B so it is visible */ overlap_test_1(flavor[otBASE_fill], 1, win2, 'B'); break; @@ -7290,7 +7323,7 @@ overlap_test(bool recur GCC_UNUSED) delwin(win2); delwin(win1); erase(); - exit_curses(); + stop_curses(); return OK; } @@ -7396,11 +7429,11 @@ x_overlap_test(bool recur GCC_UNUSED) overlap_test_0(win2, win1); break; - case 'c': /* fill window A so it's visible */ + case 'c': /* fill window A so it is visible */ x_overlap_test_1(flavor[otBASE_fill], 0, win1, WIDE_A); break; - case 'd': /* fill window B so it's visible */ + case 'd': /* fill window B so it is visible */ x_overlap_test_1(flavor[otBASE_fill], 1, win2, WIDE_B); break; @@ -7490,7 +7523,7 @@ x_overlap_test(bool recur GCC_UNUSED) delwin(win2); delwin(win1); erase(); - exit_curses(); + stop_curses(); return OK; } #endif /* USE_WIDEC_SUPPORT */ @@ -7578,9 +7611,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; } @@ -7591,48 +7628,49 @@ settings_test(bool recur GCC_UNUSED) ****************************************************************************/ static void -usage(void) +usage(int ok) { static const char *const tbl[] = { "Usage: ncurses [options]" ,"" + ,USAGE_COMMON ,"Options:" #ifdef NCURSES_VERSION - ," -a f,b set default-colors (assumed white-on-black)" - ," -d use default-colors if terminal supports them" + ," -a f,b set default-colors (assumed white-on-black)" + ," -d use default-colors if terminal supports them" #endif #if HAVE_USE_ENV - ," -E call use_env(FALSE) to ignore $LINES and $COLUMNS" + ," -E call use_env(FALSE) to ignore $LINES and $COLUMNS" #endif #if USE_SOFTKEYS - ," -e fmt specify format for soft-keys test (e)" + ," -e fmt specify format for soft-keys test (e)" #endif #if HAVE_RIPOFFLINE - ," -f rip-off footer line (can repeat)" - ," -h rip-off header line (can repeat)" + ," -F rip-off footer line (can repeat)" + ," -H rip-off header line (can repeat)" #endif - ," -m do not use colors" + ," -m do not use colors" #if HAVE_COLOR_CONTENT - ," -p file rgb values to use in 'd' rather than ncurses's builtin" + ," -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)" + ," -s msec specify nominal time for panel-demo (default: 1, to hold)" #endif -#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_WIN32) - ," -T call use_tioctl(TRUE) to allow SIGWINCH to override environment" +#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 - ," -t mask specify default trace-level (may toggle with ^T)" + ," -t mask specify default trace-level (may toggle with ^T)" #endif #if HAVE_COLOR_CONTENT - ," -x use xterm-compatible control for reading color palette" + ," -x use xterm-compatible control for reading color palette" #endif }; size_t n; for (n = 0; n < SIZEOF(tbl); n++) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } static void @@ -7746,7 +7784,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) { @@ -7773,11 +7810,13 @@ main_menu(bool top) for (;;) { char ch = '\0'; if (read(fileno(stdin), &ch, (size_t) 1) <= 0) { - if (command == 0) - command = 'q'; - if (errno == EINTR) { + 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))) { @@ -7810,7 +7849,7 @@ main_menu(bool top) if (doit != NULL && doit(FALSE) == OK) { /* - * This may be overkill; it's intended to reset everything back + * This may be overkill; it is intended to reset everything back * to the initial terminal modes so that tests don't get in * each other's way. */ @@ -7838,17 +7877,24 @@ main_menu(bool top) /*+------------------------------------------------------------------------- main(argc,argv) --------------------------------------------------------------------------*/ +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int c; + int ch; 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 @@ -7858,9 +7904,11 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((c = getopt(argc, argv, "a:dEe:fhmp:s:Tt:x")) != -1) { - switch (c) { -#ifdef NCURSES_VERSION + while ((ch = getopt(argc, argv, OPTS_COMMON "a:dEe:FHmp:s:Tt:x")) != -1) { + switch (ch) { +#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)) { @@ -7872,10 +7920,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); @@ -7885,17 +7935,17 @@ main(int argc, char *argv[]) my_e_param = atoi(optarg); #ifdef NCURSES_VERSION if (my_e_param > 3) /* allow extended layouts */ - usage(); + usage(FALSE); #else if (my_e_param > 1) - usage(); + usage(FALSE); #endif break; #if HAVE_RIPOFFLINE - case 'f': + case 'F': ripoffline(-1, rip_footer); break; - case 'h': + case 'H': ripoffline(1, rip_header); break; #endif /* HAVE_RIPOFFLINE */ @@ -7912,7 +7962,7 @@ main(int argc, char *argv[]) nap_msec = (int) atol(optarg); break; #endif -#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_WIN32) +#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_NC_WINDOWS) case 'T': use_tioctl(TRUE); break; @@ -7927,8 +7977,12 @@ main(int argc, char *argv[]) xterm_colors = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -7940,10 +7994,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 */