X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fncurses.c;h=15f732964e8b950eb671780afd48b4929ee8bc94;hp=0e724a65df0bb51ad52ce834710eb1c13d952ee7;hb=938680fa3bc29d2a086031a2f648dfd6cadcb51e;hpb=d44d7f381ba0173521cb788ba3adb12e261e5c96 diff --git a/test/ncurses.c b/test/ncurses.c index 0e724a65..15f73296 100644 --- a/test/ncurses.c +++ b/test/ncurses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2012 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.302 2008/02/23 23:07:28 tom Exp $ +$Id: ncurses.c,v 1.386 2012/12/29 23:37:55 tom Exp $ ***************************************************************************/ @@ -106,6 +106,7 @@ extern unsigned _nc_tracing; #endif #endif /* ACS_S3 */ +#ifndef WACS_S3 #ifdef CURSES_WACS_ARRAY #define WACS_S3 (&(CURSES_WACS_ARRAY['p'])) /* scan line 3 */ #define WACS_S7 (&(CURSES_WACS_ARRAY['r'])) /* scan line 7 */ @@ -114,10 +115,35 @@ extern unsigned _nc_tracing; #define WACS_PI (&(CURSES_WACS_ARRAY['{'])) /* Pi */ #define WACS_NEQUAL (&(CURSES_WACS_ARRAY['|'])) /* not equal */ #define WACS_STERLING (&(CURSES_WACS_ARRAY['}'])) /* UK pound sign */ +#endif +#endif + #endif +#if HAVE_WCSRTOMBS +#define count_wchars(src, len, state) wcsrtombs(0, &src, len, state) +#define trans_wchars(dst, src, len, state) wcsrtombs(dst, &src, len, state) +#define reset_wchars(state) init_mb(state) +#elif HAVE_WCSTOMBS && HAVE_MBTOWC && HAVE_MBLEN +#define count_wchars(src, len, state) wcstombs(0, src, len) +#define trans_wchars(dst, src, len, state) wcstombs(dst, src, len) +#define reset_wchars(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0)) +#define state_unused #endif +#if HAVE_MBSRTOWCS +#define count_mbytes(src, len, state) mbsrtowcs(0, &src, len, state) +#define trans_mbytes(dst, src, len, state) mbsrtowcs(dst, &src, len, state) +#define reset_mbytes(state) init_mb(state) +#elif HAVE_MBSTOWCS && HAVE_MBTOWC && HAVE_MBLEN +#define count_mbytes(src, len, state) mbstowcs(0, src, len) +#define trans_mbytes(dst, src, len, state) mbstowcs(dst, src, len) +#define reset_mbytes(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0)) +#define state_unused +#endif + +#define ToggleAcs(temp,real) temp = ((temp == real) ? 0 : real) + #define P(string) printw("%s\n", string) #define BLANK ' ' /* this is the background character */ @@ -140,6 +166,14 @@ static RGB_DATA *all_colors; static void main_menu(bool); +static void +failed(const char *s) +{ + perror(s); + endwin(); + 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. */ @@ -147,14 +181,14 @@ static void do_h_line(int y, int x, chtype c, int to) { if ((to) > (x)) - mvhline(y, x, c, (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)); + MvVLine(y, x, c, (to) - (y)); } static void @@ -170,7 +204,7 @@ isQuit(int c) { return ((c) == QUIT || (c) == ESCAPE); } -#define case_QUIT case QUIT: case ESCAPE +#define case_QUIT QUIT: case ESCAPE /* Common function to allow ^T to toggle trace-mode in the middle of a test * so that trace-files can be made smaller. @@ -208,9 +242,9 @@ wGetstring(WINDOW *win, char *buffer, int limit) echo(); getyx(win, y0, x0); - wattrset(win, A_REVERSE); + (void) wattrset(win, A_REVERSE); - x = strlen(buffer); + x = (int) strlen(buffer); while (!done) { if (x > (int) strlen(buffer)) x = (int) strlen(buffer); @@ -252,10 +286,10 @@ wGetstring(WINDOW *win, char *buffer, int limit) beep(); } else if ((int) strlen(buffer) < limit) { int j; - for (j = strlen(buffer) + 1; j > x; --j) { + for (j = (int) strlen(buffer) + 1; j > x; --j) { buffer[j] = buffer[j - 1]; } - buffer[x++] = ch; + buffer[x++] = (char) ch; } else { flash(); } @@ -268,6 +302,44 @@ wGetstring(WINDOW *win, char *buffer, int limit) } #if USE_WIDEC_SUPPORT +static wchar_t +fullwidth_of(int ch) +{ + return (ch + 0xff10 - '0'); +} + +static void +make_fullwidth_text(wchar_t *target, const char *source) +{ + int ch; + while ((ch = *source++) != 0) { + *target++ = fullwidth_of(ch); + } + *target = 0; +} + +static void +make_narrow_text(wchar_t *target, const char *source) +{ + int ch; + while ((ch = *source++) != 0) { + *target++ = ch; + } + *target = 0; +} + +#if USE_LIBPANEL +static void +make_fullwidth_digit(cchar_t *target, int digit) +{ + wchar_t source[2]; + + source[0] = fullwidth_of(digit + '0'); + source[1] = 0; + setcchar(target, source, A_NORMAL, 0, 0); +} +#endif + static int wGet_wchar(WINDOW *win, wint_t *result) { @@ -303,9 +375,9 @@ wGet_wstring(WINDOW *win, wchar_t *buffer, int limit) echo(); getyx(win, y0, x0); - wattrset(win, A_REVERSE); + (void) wattrset(win, A_REVERSE); - x = wcslen(buffer); + x = (int) wcslen(buffer); while (!done) { if (x > (int) wcslen(buffer)) x = (int) wcslen(buffer); @@ -384,10 +456,10 @@ wGet_wstring(WINDOW *win, wchar_t *buffer, int limit) beep(); } else if ((int) wcslen(buffer) < limit) { int j; - for (j = wcslen(buffer) + 1; j > x; --j) { + for (j = (int) wcslen(buffer) + 1; j > x; --j) { buffer[j] = buffer[j - 1]; } - buffer[x++] = ch; + buffer[x++] = (wchar_t) ch; } else { beep(); } @@ -423,7 +495,11 @@ ShellOut(bool message) addstr("Shelling out..."); def_prog_mode(); endwin(); - system("sh"); +#ifdef __MINGW32__ + system("cmd.exe"); +#else + IGNORE_RC(system("sh")); +#endif if (message) addstr("returned from shellout.\n"); refresh(); @@ -439,7 +515,7 @@ mouse_decode(MEVENT const *ep) { static char buf[80 + (5 * 10) + (32 * 15)]; - (void) sprintf(buf, "id %2d at (%2d, %2d, %2d) state %4lx = {", + (void) sprintf(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, ", ");} @@ -501,6 +577,42 @@ mouse_decode(MEVENT const *ep) (void) strcat(buf, "}"); return (buf); } + +static void +show_mouse(WINDOW *win) +{ + int y, x; + MEVENT event; + bool outside; + bool show_loc; + + getmouse(&event); + outside = !wenclose(win, event.y, event.x); + + if (outside) { + (void) wstandout(win); + waddstr(win, "KEY_MOUSE"); + (void) wstandend(win); + } else { + waddstr(win, "KEY_MOUSE"); + } + wprintw(win, ", %s", mouse_decode(&event)); + + if (outside) + win = stdscr; + + show_loc = wmouse_trafo(win, &event.y, &event.x, FALSE); + + if (show_loc) { + getyx(win, y, x); + wmove(win, event.y, event.x); + waddch(win, '*'); + wmove(win, y, x); + } + + if (outside) + wnoutrefresh(win); +} #endif /* NCURSES_MOUSE_VERSION */ /**************************************************************************** @@ -509,8 +621,11 @@ mouse_decode(MEVENT const *ep) * ****************************************************************************/ +#define NUM_GETCH_FLAGS 256 +typedef bool GetchFlags[NUM_GETCH_FLAGS]; + static void -setup_getch(WINDOW *win, bool flags[]) +setup_getch(WINDOW *win, GetchFlags flags) { keypad(win, flags['k']); /* should be redundant, but for testing */ meta(win, flags['m']); /* force this to a known state */ @@ -521,7 +636,17 @@ setup_getch(WINDOW *win, bool flags[]) } static void -wgetch_help(WINDOW *win, bool flags[]) +init_getch(WINDOW *win, GetchFlags flags) +{ + memset(flags, FALSE, NUM_GETCH_FLAGS); + flags[UChar('k')] = (win == stdscr); + flags[UChar('m')] = TRUE; + + setup_getch(win, flags); +} + +static void +wgetch_help(WINDOW *win, GetchFlags flags) { static const char *help[] = { @@ -545,17 +670,17 @@ wgetch_help(WINDOW *win, bool flags[]) printw("Type any key to see its %s value. Also:\n", flags['k'] ? "keypad" : "literal"); for (n = 0; n < SIZEOF(help); ++n) { - int row = 1 + (n % chk); + int row = 1 + (int) (n % chk); int col = (n >= chk) ? COLS / 2 : 0; int flg = ((strstr(help[n], "toggle") != 0) && (flags[UChar(*help[n])] != FALSE)); if (flg) - standout(); - mvprintw(row, col, "%s", help[n]); + (void) standout(); + MvPrintw(row, col, "%s", help[n]); if (col == 0) clrtoeol(); if (flg) - standend(); + (void) standend(); } wrefresh(stdscr); wmove(win, y, x); @@ -573,7 +698,7 @@ wgetch_wrap(WINDOW *win, int first_y) wclrtoeol(win); } -#if defined(NCURSES_VERSION) && defined(KEY_RESIZE) && HAVE_WRESIZE +#if defined(KEY_RESIZE) && HAVE_WRESIZE typedef struct { WINDOW *text; WINDOW *frame; @@ -597,18 +722,22 @@ remember_boxes(unsigned level, WINDOW *txt_win, WINDOW *box_win) { unsigned need = (level + 1) * 2; + assert(level < (unsigned) COLS); + if (winstack == 0) { len_winstack = 20; - winstack = (WINSTACK *) malloc(len_winstack * sizeof(WINSTACK)); + winstack = typeMalloc(WINSTACK, len_winstack); } else if (need >= len_winstack) { len_winstack = need; - winstack = (WINSTACK *) realloc(winstack, len_winstack * sizeof(WINSTACK)); + winstack = typeRealloc(WINSTACK, len_winstack, winstack); } + if (!winstack) + failed("remember_boxes"); winstack[level].text = txt_win; winstack[level].frame = box_win; } -#if USE_SOFTKEYS && (NCURSES_VERSION_PATCH < 20071229) && NCURSES_EXT_FUNCS +#if USE_SOFTKEYS && (defined(NCURSES_VERSION_PATCH) && NCURSES_VERSION_PATCH < 20071229) && NCURSES_EXT_FUNCS static void slk_repaint(void) { @@ -622,6 +751,7 @@ slk_repaint(void) #define slk_repaint() /* nothing */ #endif +#if defined(NCURSES_VERSION) && defined(KEY_RESIZE) && HAVE_WRESIZE /* * For wgetch_test(), we create pairs of windows - one for a box, one for text. * Resize both and paint the box in the parent. @@ -657,11 +787,21 @@ resize_boxes(unsigned level, WINDOW *win) } doupdate(); } +#endif /* resize_boxes */ #else #define forget_boxes() /* nothing */ #define remember_boxes(level,text,frame) /* nothing */ #endif +/* + * Return-code is OK/ERR or a keyname. + */ +static const char * +ok_keyname(int code) +{ + return ((code == OK) ? "OK" : ((code == ERR) ? "ERR" : keyname(code))); +} + static void wgetch_test(unsigned level, WINDOW *win, int delay) { @@ -669,13 +809,10 @@ wgetch_test(unsigned level, WINDOW *win, int delay) int first_y, first_x; int c; int incount = 0; - bool flags[256]; + GetchFlags flags; bool blocking = (delay < 0); - memset(flags, FALSE, sizeof(flags)); - flags[UChar('k')] = (win == stdscr); - - setup_getch(win, flags); + init_getch(win, flags); wtimeout(win, delay); getyx(win, first_y, first_x); @@ -706,9 +843,11 @@ wgetch_test(unsigned level, WINDOW *win, int delay) } else if (c == 'g') { waddstr(win, "getstr test: "); echo(); - wgetnstr(win, buf, sizeof(buf) - 1); + c = wgetnstr(win, buf, sizeof(buf) - 1); noecho(); - wprintw(win, "I saw %d characters:\n\t`%s'.", (int) strlen(buf), buf); + wprintw(win, "I saw %d characters:\n\t`%s' (%s).", + (int) strlen(buf), buf, + ok_keyname(c)); wclrtoeol(win); wgetch_wrap(win, first_y); } else if (c == 'k') { @@ -755,15 +894,7 @@ wgetch_test(unsigned level, WINDOW *win, int delay) wprintw(win, "Key pressed: %04o ", c); #ifdef NCURSES_MOUSE_VERSION if (c == KEY_MOUSE) { - int y, x; - MEVENT event; - - getmouse(&event); - wprintw(win, "KEY_MOUSE, %s", mouse_decode(&event)); - getyx(win, y, x); - move(event.y, event.x); - addch('*'); - wmove(win, y, x); + show_mouse(win); } else #endif /* NCURSES_MOUSE_VERSION */ if (c >= KEY_MIN) { @@ -773,12 +904,18 @@ wgetch_test(unsigned level, WINDOW *win, int delay) } #endif (void) waddstr(win, keyname(c)); - } else if (c > 0x80) { - unsigned c2 = (c & 0x7f); - if (isprint(c2)) - (void) wprintw(win, "M-%c", UChar(c2)); - else + } else if (c >= 0x80) { + unsigned c2 = (unsigned) c; +#if !(defined(NCURSES_VERSION) || defined(_XOPEN_CURSES)) + /* at least Solaris SVR4 curses breaks unctrl(128), etc. */ + c2 &= 0x7f; +#endif + if (isprint(c)) + (void) wprintw(win, "%c", UChar(c)); + else if (c2 != UChar(c)) (void) wprintw(win, "M-%s", unctrl(c2)); + else + (void) wprintw(win, "%s", unctrl(c2)); waddstr(win, " (high-half character)"); } else { if (isprint(c)) @@ -792,6 +929,9 @@ wgetch_test(unsigned level, WINDOW *win, int delay) } wtimeout(win, -1); + + if (!level) + init_getch(win, flags); } static int @@ -843,6 +983,7 @@ getch_test(void) wgetch_test(0, stdscr, delay); forget_boxes(); finish_getch_test(); + slk_clear(); } #if USE_WIDEC_SUPPORT @@ -888,18 +1029,23 @@ static char * wcstos(const wchar_t *src) { int need; - mbstate_t state; char *result = 0; const wchar_t *tmp = src; +#ifndef state_unused + mbstate_t state; +#endif - memset(&state, 0, sizeof(state)); - if ((need = wcsrtombs(0, &tmp, 0, &state)) > 0) { - unsigned have = need; - result = (char *) calloc(have + 1, 1); - tmp = src; - if (wcsrtombs(result, &tmp, have, &state) != have) { - free(result); - result = 0; + reset_wchars(state); + if ((need = (int) count_wchars(tmp, 0, &state)) > 0) { + unsigned have = (unsigned) need; + if ((result = typeCalloc(char, have + 1)) != 0) { + tmp = src; + if (trans_wchars(result, tmp, have, &state) != have) { + free(result); + result = 0; + } + } else { + failed("wcstos"); } } return result; @@ -913,15 +1059,12 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) int first_y, first_x; wint_t c; int incount = 0; - bool flags[256]; + GetchFlags flags; bool blocking = (delay < 0); - int y, x, code; + int code; char *temp; - memset(flags, FALSE, sizeof(flags)); - flags[UChar('k')] = (win == stdscr); - - setup_getch(win, flags); + init_getch(win, flags); wtimeout(win, delay); getyx(win, first_y, first_x); @@ -952,13 +1095,15 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) } else if (c == 'g') { waddstr(win, "getstr test: "); echo(); - code = wgetn_wstr(win, wint_buf, sizeof(wint_buf) - 1); + code = wgetn_wstr(win, wint_buf, BUFSIZ - 1); noecho(); if (code == ERR) { wprintw(win, "wgetn_wstr returns an error."); } else { int n; - for (n = 0; (wchar_buf[n] = wint_buf[n]) != 0; ++n) ; + for (n = 0; (wchar_buf[n] = (wchar_t) wint_buf[n]) != 0; ++n) { + ; + } if ((temp = wcstos(wchar_buf)) != 0) { wprintw(win, "I saw %d characters:\n\t`%s'.", (int) wcslen(wchar_buf), temp); @@ -1010,17 +1155,10 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) kill(getpid(), SIGTSTP); #endif } else { - wprintw(win, "Key pressed: %04o ", c); + wprintw(win, "Key pressed: %04o ", (int) c); #ifdef NCURSES_MOUSE_VERSION if (c == KEY_MOUSE) { - MEVENT event; - - getmouse(&event); - wprintw(win, "KEY_MOUSE, %s", mouse_decode(&event)); - getyx(win, y, x); - move(event.y, event.x); - addch('*'); - wmove(win, y, x); + show_mouse(win); } else #endif /* NCURSES_MOUSE_VERSION */ if (code == KEY_CODE_YES) { @@ -1029,14 +1167,14 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) resize_wide_boxes(level, win); } #endif - (void) waddstr(win, key_name((wchar_t) c)); + (void) waddstr(win, keyname((wchar_t) c)); } else { + (void) waddstr(win, key_name((wchar_t) c)); if (c < 256 && iscntrl(c)) { - (void) wprintw(win, "%s (control character)", unctrl(c)); + (void) wprintw(win, " (control character)"); } else { - wchar_t c2 = c; - waddnwstr(win, &c2, 1); - (void) wprintw(win, " = %#x (printable character)", c); + (void) wprintw(win, " = %#x (printable character)", + (unsigned) c); } } wgetch_wrap(win, first_y); @@ -1044,6 +1182,9 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) } wtimeout(win, -1); + + if (!level) + init_getch(win, flags); } static void @@ -1055,6 +1196,7 @@ get_wch_test(void) wget_wch_test(0, stdscr, delay); forget_boxes(); finish_getch_test(); + slk_clear(); } #endif @@ -1121,29 +1263,29 @@ attr_legend(WINDOW *helpwin) int row = 1; int col = 1; - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, "ESC to exit."); - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, "^L repaints."); ++row; - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, "Modify the test strings:"); - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, " A digit sets gaps on each side of displayed attributes"); - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, " shifts the text left/right. "); ++row; - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, "Toggles:"); if (use_colors) { - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, " f/F/b/F toggle foreground/background background color"); - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, " t/T toggle text/background color attribute"); } - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, " a/A toggle ACS (alternate character set) mapping"); - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row, col, " v/V toggle video attribute to combine with each line"); } @@ -1166,22 +1308,22 @@ cycle_color_attr(int ch, short *fg, short *bg, short *tx) if (use_colors) { switch (ch) { case 'f': - *fg = (*fg + 1); + *fg = (short) (*fg + 1); break; case 'F': - *fg = (*fg - 1); + *fg = (short) (*fg - 1); break; case 'b': - *bg = (*bg + 1); + *bg = (short) (*bg + 1); break; case 'B': - *bg = (*bg - 1); + *bg = (short) (*bg - 1); break; case 't': - *tx = (*tx + 1); + *tx = (short) (*tx + 1); break; case 'T': - *tx = (*tx - 1); + *tx = (short) (*tx - 1); break; default: beep(); @@ -1189,17 +1331,17 @@ cycle_color_attr(int ch, short *fg, short *bg, short *tx) break; } if (*fg >= COLORS) - *fg = min_colors; + *fg = (short) min_colors; if (*fg < min_colors) - *fg = COLORS - 1; + *fg = (short) (COLORS - 1); if (*bg >= COLORS) - *bg = min_colors; + *bg = (short) min_colors; if (*bg < min_colors) - *bg = COLORS - 1; + *bg = (short) (COLORS - 1); if (*tx >= COLORS) *tx = -1; if (*tx < -1) - *tx = COLORS - 1; + *tx = (short) (COLORS - 1); } else { beep(); error = TRUE; @@ -1216,11 +1358,11 @@ adjust_attr_string(int adjust) if (first >= ' ' && last <= '~') { /* 32..126 */ int j, k; for (j = 0, k = first; j < MAX_ATTRSTRING && k <= last; ++j, ++k) { - attr_test_string[j] = k; + attr_test_string[j] = (char) k; if (((k + 1 - first) % 5) == 0) { - ++j; - if (j < MAX_ATTRSTRING) - attr_test_string[j] = ' '; + if (++j >= MAX_ATTRSTRING) + break; + attr_test_string[j] = ' '; } } while (j < MAX_ATTRSTRING) @@ -1245,9 +1387,9 @@ show_attr(int row, int skip, bool arrow, chtype attr, const char *name) chtype test = attr & (chtype) (~A_ALTCHARSET); if (arrow) - mvprintw(row, 5, "-->"); - mvprintw(row, 8, "%s mode:", name); - mvprintw(row, 24, "|"); + MvPrintw(row, 5, "-->"); + MvPrintw(row, 8, "%s mode:", name); + MvPrintw(row, 24, "|"); if (skip) printw("%*s", skip, " "); /* @@ -1264,7 +1406,7 @@ show_attr(int row, int skip, bool arrow, chtype attr, const char *name) addch(ch | attr); } } else { - attrset(attr); + (void) attrset(attr); addstr(attr_test_string); attroff(attr); } @@ -1275,7 +1417,7 @@ show_attr(int row, int skip, bool arrow, chtype attr, const char *name) if (!(termattrs() & test)) { printw(" (N/A)"); } else { - if (ncv > 0 && (getbkgd(stdscr) & A_COLOR)) { + if (ncv > 0 && stdscr && (getbkgd(stdscr) & A_COLOR)) { static const chtype table[] = { A_STANDOUT, @@ -1376,7 +1518,7 @@ attr_getc(int *skip, short *fg, short *bg, short *tx, int *ac, unsigned *kc) case '>': adjust_attr_string(1); break; - case_QUIT: + case case_QUIT: result = FALSE; break; default: @@ -1410,16 +1552,16 @@ attr_test(void) do { int row = 2; chtype normal = A_NORMAL | BLANK; - chtype extras = ac; + chtype extras = (chtype) ac; if (use_colors) { - short pair = (fg != COLOR_BLACK || bg != COLOR_BLACK); + short pair = (short) (fg != COLOR_BLACK || bg != COLOR_BLACK); if (pair != 0) { pair = 1; if (init_pair(pair, fg, bg) == ERR) { beep(); } else { - normal |= COLOR_PAIR(pair); + normal |= (chtype) COLOR_PAIR(pair); } } if (tx >= 0) { @@ -1427,7 +1569,7 @@ attr_test(void) if (init_pair(pair, tx, bg) == ERR) { beep(); } else { - extras |= COLOR_PAIR(pair); + extras |= (chtype) COLOR_PAIR(pair); } } } @@ -1436,7 +1578,7 @@ attr_test(void) erase(); box(stdscr, 0, 0); - mvaddstr(0, 20, "Character attribute test display"); + MvAddStr(0, 20, "Character attribute test display"); for (j = 0; j < SIZEOF(attrs_to_test); ++j) { bool arrow = (j == k); @@ -1447,10 +1589,10 @@ attr_test(void) attrs_to_test[j].name); } - mvprintw(row, 8, + MvPrintw(row, 8, "This terminal does %shave the magic-cookie glitch", get_xmc() > -1 ? "" : "not "); - mvprintw(row + 1, 8, "Enter '?' for help."); + MvPrintw(row + 1, 8, "Enter '?' for help."); show_color_attr(fg, bg, tx); printw(" ACS (%d)", ac != 0); @@ -1476,9 +1618,9 @@ wide_adjust_attr_string(int adjust) for (j = 0, k = first; j < MAX_ATTRSTRING && k <= last; ++j, ++k) { wide_attr_test_string[j] = k; if (((k + 1 - first) % 5) == 0) { - ++j; - if (j < MAX_ATTRSTRING) - wide_attr_test_string[j] = ' '; + if (++j >= MAX_ATTRSTRING) + break; + wide_attr_test_string[j] = ' '; } } while (j < MAX_ATTRSTRING) @@ -1518,6 +1660,7 @@ get_wide_background(void) short pair; wchar_t wch[10]; + memset(&ch, 0, sizeof(ch)); if (getbkgrnd(&ch) != ERR) { if (getcchar(&ch, wch, &attr, &pair, 0) != ERR) { result = attr; @@ -1533,9 +1676,9 @@ wide_show_attr(int row, int skip, bool arrow, chtype attr, short pair, const cha chtype test = attr & ~WA_ALTCHARSET; if (arrow) - mvprintw(row, 5, "-->"); - mvprintw(row, 8, "%s mode:", name); - mvprintw(row, 24, "|"); + MvPrintw(row, 5, "-->"); + MvPrintw(row, 8, "%s mode:", name); + MvPrintw(row, 24, "|"); if (skip) printw("%*s", skip, " "); @@ -1556,13 +1699,13 @@ wide_show_attr(int row, int skip, bool arrow, chtype attr, short pair, const cha add_wch(&ch); } } else { - attr_t old_attr; - short old_pair; + attr_t old_attr = 0; + short old_pair = 0; - attr_get(&old_attr, &old_pair, 0); - attr_set(attr, pair, 0); + (void) attr_get(&old_attr, &old_pair, 0); + (void) attr_set(attr, pair, 0); addwstr(wide_attr_test_string); - attr_set(old_attr, old_pair, 0); + (void) attr_set(old_attr, old_pair, 0); } if (skip) printw("%*s", skip, " "); @@ -1652,7 +1795,7 @@ wide_attr_getc(int *skip, short *fg, short *bg, short *tx, int *ac, unsigned *kc case '>': wide_adjust_attr_string(1); break; - case_QUIT: + case case_QUIT: result = FALSE; break; default: @@ -1689,7 +1832,7 @@ wide_attr_test(void) short extras = 0; if (use_colors) { - pair = (fg != COLOR_BLACK || bg != COLOR_BLACK); + pair = (short) (fg != COLOR_BLACK || bg != COLOR_BLACK); if (pair != 0) { pair = 1; if (init_pair(pair, fg, bg) == ERR) { @@ -1708,21 +1851,21 @@ wide_attr_test(void) erase(); box_set(stdscr, 0, 0); - mvaddstr(0, 20, "Character attribute test display"); + MvAddStr(0, 20, "Character attribute test display"); for (j = 0; j < SIZEOF(attrs_to_test); ++j) { row = wide_show_attr(row, n, j == k, - ac | - attrs_to_test[j].attr | - attrs_to_test[k].attr, + ((attr_t) ac | + attrs_to_test[j].attr | + attrs_to_test[k].attr), extras, attrs_to_test[j].name); } - mvprintw(row, 8, + MvPrintw(row, 8, "This terminal does %shave the magic-cookie glitch", get_xmc() > -1 ? "" : "not "); - mvprintw(row + 1, 8, "Enter '?' for help."); + MvPrintw(row + 1, 8, "Enter '?' for help."); show_color_attr(fg, bg, tx); printw(" ACS (%d)", ac != 0); @@ -1773,39 +1916,55 @@ show_color_name(int y, int x, int color, bool wide) width = 4; } else if (color >= 8) { sprintf(temp, "[%02d]", color); + } else if (color < 0) { + strcpy(temp, "default"); } else { - strcpy(temp, the_color_names[color]); + sprintf(temp, "%.*s", 16, the_color_names[color]); } printw("%-*.*s", width, width, temp); } } static void -color_legend(WINDOW *helpwin) +color_legend(WINDOW *helpwin, bool wide) { int row = 1; int col = 1; - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, "ESC to exit."); ++row; - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, "Use up/down arrow to scroll through the display if it is"); - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, "longer than one screen. Control/N and Control/P can be used"); - mvwprintw(helpwin, row++, col, - "in place up up/down arrow. Use pageup/pagedown to scroll a"); - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, + "in place of up/down arrow. Use pageup/pagedown to scroll a"); + MvWPrintw(helpwin, row++, col, "full screen; control/B and control/F can be used here."); ++row; - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, "Toggles:"); - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, + " a/A toggle altcharset off/on"); + MvWPrintw(helpwin, row++, col, " b/B toggle bold off/on"); - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, " n/N toggle text/number on/off"); - mvwprintw(helpwin, row++, col, + MvWPrintw(helpwin, row++, col, + " r/R toggle reverse on/off"); + MvWPrintw(helpwin, row++, col, " w/W toggle width between 8/16 colors"); +#if USE_WIDEC_SUPPORT + if (wide) { + MvWPrintw(helpwin, row++, col, + "Wide characters:"); + MvWPrintw(helpwin, row, col, + " x/X toggle text between ASCII and wide-character"); + } +#else + (void) wide; +#endif } #define set_color_test(name, value) if (name != value) { name = value; base_row = 0; } @@ -1825,13 +1984,21 @@ color_test(void) char numbered[80]; const char *hello; bool done = FALSE; + bool opt_acsc = FALSE; bool opt_bold = FALSE; - bool opt_wide = FALSE; + bool opt_revs = FALSE; bool opt_nums = FALSE; + bool opt_wide = FALSE; WINDOW *helpwin; - if (pairs_max > COLOR_PAIRS) - pairs_max = COLOR_PAIRS; + if (COLORS * COLORS == COLOR_PAIRS) { + int limit = (COLORS - min_colors) * (COLORS - min_colors); + if (pairs_max > limit) + pairs_max = limit; + } else { + if (pairs_max > COLOR_PAIRS) + pairs_max = COLOR_PAIRS; + } while (!done) { int shown = 0; @@ -1846,48 +2013,56 @@ color_test(void) hello = "Hello"; per_row = 8; } + per_row -= min_colors; row_limit = (pairs_max + per_row - 1) / per_row; move(0, 0); - (void) printw("There are %d color pairs and %d colors\n", - pairs_max, COLORS); + (void) printw("There are %d color pairs and %d colors%s\n", + pairs_max, COLORS, + min_colors ? " besides 'default'" : ""); clrtobot(); - (void) mvprintw(top + 1, 0, - "%dx%d matrix of foreground/background colors, bold *%s*\n", - row_limit, - per_row, - opt_bold ? "on" : "off"); + MvPrintw(top + 1, 0, + "%dx%d matrix of foreground/background colors, bold *%s*\n", + row_limit, + per_row, + 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, opt_wide); + show_color_name(top + 2, (i + 1) * width, i + min_colors, opt_wide); /* show a grid of colors, with color names/ numbers on the left */ - for (i = (base_row * per_row); i < pairs_max; i++) { + for (i = (short) (base_row * per_row); i < pairs_max; i++) { int row = grid_top + (i / per_row) - base_row; int col = (i % per_row + 1) * width; short pair = i; +#define InxToFG(i) (short) ((i % (COLORS - min_colors)) + min_colors) +#define InxToBG(i) (short) ((i / (COLORS - min_colors)) + min_colors) if (row >= 0 && move(row, col) != ERR) { - short fg = i % COLORS; - short bg = i / COLORS; + short fg = InxToFG(i); + short bg = InxToBG(i); init_pair(pair, fg, bg); attron((attr_t) COLOR_PAIR(pair)); + if (opt_acsc) + attron((attr_t) A_ALTCHARSET); if (opt_bold) attron((attr_t) A_BOLD); + if (opt_revs) + attron((attr_t) A_REVERSE); if (opt_nums) { sprintf(numbered, "{%02X}", i); hello = numbered; } printw("%-*.*s", width, width, hello); - attrset(A_NORMAL); + (void) attrset(A_NORMAL); - if ((i % per_row) == 0 && (i % COLORS) == 0) { - show_color_name(row, 0, i / COLORS, opt_wide); + if ((i % per_row) == 0 && InxToFG(i) == min_colors) { + show_color_name(row, 0, InxToBG(i), opt_wide); } ++shown; } else if (shown) { @@ -1896,6 +2071,12 @@ color_test(void) } switch (wGetchar(stdscr)) { + case 'a': + opt_acsc = FALSE; + break; + case 'A': + opt_acsc = TRUE; + break; case 'b': opt_bold = FALSE; break; @@ -1908,7 +2089,13 @@ color_test(void) case 'N': opt_nums = TRUE; break; - case_QUIT: + case 'r': + opt_revs = FALSE; + break; + case 'R': + opt_revs = TRUE; + break; + case case_QUIT: done = TRUE; continue; case 'w': @@ -1959,7 +2146,7 @@ color_test(void) case '?': if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { box(helpwin, 0, 0); - color_legend(helpwin); + color_legend(helpwin, FALSE); wGetchar(helpwin); delwin(helpwin); } @@ -1979,23 +2166,35 @@ color_test(void) static void wide_color_test(void) { - int c; int i; int top = 0, width; int base_row = 0; int grid_top = top + 3; int page_size = (LINES - grid_top); - int pairs_max = COLOR_PAIRS; + int pairs_max = (unsigned short) (-1); int row_limit; int per_row; char numbered[80]; const char *hello; bool done = FALSE; + bool opt_acsc = FALSE; bool opt_bold = FALSE; + bool opt_revs = FALSE; bool opt_wide = FALSE; bool opt_nums = FALSE; + bool opt_xchr = FALSE; + wchar_t buffer[80]; WINDOW *helpwin; + if (COLORS * COLORS == COLOR_PAIRS) { + int limit = (COLORS - min_colors) * (COLORS - min_colors); + if (pairs_max > limit) + pairs_max = limit; + } else { + if (pairs_max > COLOR_PAIRS) + pairs_max = COLOR_PAIRS; + } + while (!done) { int shown = 0; @@ -2009,45 +2208,63 @@ wide_color_test(void) hello = "Hello"; per_row = 8; } + per_row -= min_colors; + + if (opt_xchr) { + make_fullwidth_text(buffer, hello); + width *= 2; + per_row /= 2; + } else { + make_narrow_text(buffer, hello); + } row_limit = (pairs_max + per_row - 1) / per_row; move(0, 0); - (void) printw("There are %d color pairs and %d colors\n", - pairs_max, COLORS); + (void) printw("There are %d color pairs and %d colors%s\n", + pairs_max, COLORS, + min_colors ? " besides 'default'" : ""); clrtobot(); - (void) mvprintw(top + 1, 0, - "%dx%d matrix of foreground/background colors, bold *%s*\n", - row_limit, - per_row, - opt_bold ? "on" : "off"); + MvPrintw(top + 1, 0, + "%dx%d matrix of foreground/background colors, bold *%s*\n", + row_limit, + per_row, + 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, opt_wide); + show_color_name(top + 2, (i + 1) * width, i + min_colors, opt_wide); /* 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; - int pair = i; + short pair = (short) i; if (row >= 0 && move(row, col) != ERR) { - init_pair(pair, i % COLORS, i / COLORS); - color_set(pair, NULL); + init_pair(pair, InxToFG(i), InxToBG(i)); + (void) color_set(pair, NULL); + if (opt_acsc) + attr_on((attr_t) A_ALTCHARSET, NULL); if (opt_bold) attr_on((attr_t) A_BOLD, NULL); + if (opt_revs) + attr_on((attr_t) A_REVERSE, NULL); if (opt_nums) { sprintf(numbered, "{%02X}", i); - hello = numbered; + if (opt_xchr) { + make_fullwidth_text(buffer, numbered); + } else { + make_narrow_text(buffer, numbered); + } } - printw("%-*.*s", width, width, hello); - attr_set(A_NORMAL, 0, NULL); + addnwstr(buffer, width); + (void) attr_set(A_NORMAL, 0, NULL); - if ((i % per_row) == 0 && (i % COLORS) == 0) { - show_color_name(row, 0, i / COLORS, opt_wide); + if ((i % per_row) == 0 && InxToFG(i) == min_colors) { + show_color_name(row, 0, InxToBG(i), opt_wide); } ++shown; } else if (shown) { @@ -2055,7 +2272,13 @@ wide_color_test(void) } } - switch (c = wGetchar(stdscr)) { + switch (wGetchar(stdscr)) { + case 'a': + opt_acsc = FALSE; + break; + case 'A': + opt_acsc = TRUE; + break; case 'b': opt_bold = FALSE; break; @@ -2068,7 +2291,13 @@ wide_color_test(void) case 'N': opt_nums = TRUE; break; - case_QUIT: + case 'r': + opt_revs = FALSE; + break; + case 'R': + opt_revs = TRUE; + break; + case case_QUIT: done = TRUE; continue; case 'w': @@ -2077,6 +2306,12 @@ wide_color_test(void) case 'W': set_color_test(opt_wide, TRUE); break; + case 'x': + opt_xchr = FALSE; + break; + case 'X': + opt_xchr = TRUE; + break; case CTRL('p'): case KEY_UP: if (base_row <= 0) { @@ -2119,7 +2354,7 @@ wide_color_test(void) case '?': if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { box(helpwin, 0, 0); - color_legend(helpwin); + color_legend(helpwin, TRUE); wGetchar(helpwin); delwin(helpwin); } @@ -2144,13 +2379,13 @@ change_color(short current, int field, int value, int usebase) switch (field) { case 0: - red = usebase ? red + value : value; + red = (short) (usebase ? (red + value) : value); break; case 1: - green = usebase ? green + value : value; + green = (short) (usebase ? (green + value) : value); break; case 2: - blue = usebase ? blue + value : value; + blue = (short) (usebase ? (blue + value) : value); break; } @@ -2176,8 +2411,8 @@ static void color_edit(void) /* display the color test pattern, without trying to edit colors */ { - short i; - short current = 0; + int i; + int current = 0; int this_c = 0, value = 0, field = 0; int last_c; int top_color = 0; @@ -2187,60 +2422,60 @@ color_edit(void) refresh(); for (i = 0; i < max_colors; i++) - init_pair(i, COLOR_WHITE, i); + init_pair((short) i, (short) COLOR_WHITE, (short) i); - mvprintw(LINES - 2, 0, "Number: %d", value); + MvPrintw(LINES - 2, 0, "Number: %d", value); do { short red, green, blue; attron(A_BOLD); - mvaddstr(0, 20, "Color RGB Value Editing"); + MvAddStr(0, 20, "Color RGB Value Editing"); attroff(A_BOLD); - for (i = top_color; + for (i = (short) top_color; (i - top_color < page_size) && (i < max_colors); i++) { char numeric[80]; sprintf(numeric, "[%d]", i); - mvprintw(2 + i - top_color, 0, "%c %-8s:", + MvPrintw(2 + i - top_color, 0, "%c %-8s:", (i == current ? '>' : ' '), (i < (int) SIZEOF(the_color_names) ? the_color_names[i] : numeric)); - attrset(COLOR_PAIR(i)); + (void) attrset((attr_t) COLOR_PAIR(i)); addstr(" "); - attrset(A_NORMAL); + (void) attrset(A_NORMAL); - color_content(i, &red, &green, &blue); + color_content((short) i, &red, &green, &blue); addstr(" R = "); if (current == i && field == 0) attron(A_STANDOUT); printw("%04d", red); if (current == i && field == 0) - attrset(A_NORMAL); + (void) attrset(A_NORMAL); addstr(", G = "); if (current == i && field == 1) attron(A_STANDOUT); printw("%04d", green); if (current == i && field == 1) - attrset(A_NORMAL); + (void) attrset(A_NORMAL); addstr(", B = "); if (current == i && field == 2) attron(A_STANDOUT); printw("%04d", blue); if (current == i && field == 2) - attrset(A_NORMAL); - attrset(A_NORMAL); + (void) attrset(A_NORMAL); + (void) attrset(A_NORMAL); printw(" ( %3d %3d %3d )", scaled_rgb(red), scaled_rgb(green), scaled_rgb(blue)); } - mvaddstr(LINES - 3, 0, + MvAddStr(LINES - 3, 0, "Use up/down to select a color, left/right to change fields."); - mvaddstr(LINES - 2, 0, + MvAddStr(LINES - 2, 0, "Modify field by typing nnn=, nnn-, or nnn+. ? for help."); move(2 + current - top_color, 0); @@ -2299,15 +2534,15 @@ color_edit(void) break; case '+': - change_color(current, field, value, 1); + change_color((short) current, field, value, 1); break; case '-': - change_color(current, field, -value, 1); + change_color((short) current, field, -value, 1); break; case '=': - change_color(current, field, value, 0); + change_color((short) current, field, value, 0); break; case '?': @@ -2333,10 +2568,12 @@ color_edit(void) case 'm': endwin(); main_menu(FALSE); + for (i = 0; i < max_colors; i++) + init_pair((short) i, (short) COLOR_WHITE, (short) i); refresh(); break; - case_QUIT: + case case_QUIT: break; default: @@ -2353,7 +2590,7 @@ color_edit(void) if (current - top_color >= page_size) top_color = current - (page_size - 1); - mvprintw(LINES - 1, 0, "Number: %d", value); + MvPrintw(LINES - 1, 0, "Number: %d", value); clrtoeol(); } while (!isQuit(this_c)); @@ -2368,6 +2605,90 @@ color_edit(void) endwin(); } +/**************************************************************************** + * + * Alternate character-set stuff + * + ****************************************************************************/ +/* *INDENT-OFF* */ +static struct { + chtype attr; + const char *name; +} attrs_to_cycle[] = { + { A_NORMAL, "normal" }, + { A_BOLD, "bold" }, + { A_BLINK, "blink" }, + { A_REVERSE, "reverse" }, + { A_UNDERLINE, "underline" }, +}; +/* *INDENT-ON* */ + +static bool +cycle_attr(int ch, unsigned *at_code, chtype *attr) +{ + bool result = TRUE; + + switch (ch) { + case 'v': + if ((*at_code += 1) >= SIZEOF(attrs_to_cycle)) + *at_code = 0; + break; + case 'V': + if (*at_code == 0) + *at_code = SIZEOF(attrs_to_cycle) - 1; + else + *at_code -= 1; + break; + default: + result = FALSE; + break; + } + if (result) + *attr = attrs_to_cycle[*at_code].attr; + return result; +} + +static bool +cycle_colors(int ch, int *fg, int *bg, short *pair) +{ + bool result = FALSE; + + if (use_colors) { + result = TRUE; + switch (ch) { + case 'F': + if ((*fg -= 1) < 0) + *fg = COLORS - 1; + break; + case 'f': + if ((*fg += 1) >= COLORS) + *fg = 0; + break; + case 'B': + if ((*bg -= 1) < 0) + *bg = COLORS - 1; + break; + case 'b': + if ((*bg += 1) >= COLORS) + *bg = 0; + break; + default: + result = FALSE; + break; + } + if (result) { + *pair = (short) (*fg != COLOR_BLACK || *bg != COLOR_BLACK); + if (*pair != 0) { + *pair = 1; + if (init_pair(*pair, (short) *fg, (short) *bg) == ERR) { + result = FALSE; + } + } + } + } + return result; +} + /**************************************************************************** * * Soft-key label test @@ -2394,10 +2715,11 @@ slk_help(void) ,"[12345678] -- set label; labels are numbered 1 through 8" ,"e -- erase stdscr (should not erase labels)" ,"s -- test scrolling of shortened screen" + ,"v/V -- cycle through video attributes" #if HAVE_SLK_COLOR - ,"F/B -- cycle through foreground/background colors" + ,"F/f/B/b -- cycle through foreground/background colors" #endif - ,"ESC -- return to main menu" + ,"ESC -- return to main menu" ,"" ,"Note: if activating the soft keys causes your terminal to scroll up" ,"one line, your terminal auto-scrolls when anything is written to the" @@ -2415,12 +2737,14 @@ slk_help(void) #if HAVE_SLK_COLOR static void -call_slk_color(short fg, short bg) +call_slk_color(int fg, int bg) { - init_pair(1, bg, fg); + init_pair(1, (short) bg, (short) fg); slk_color(1); - mvprintw(SLK_WORK, 0, "Colors %d/%d\n", fg, bg); + MvPrintw(SLK_WORK, 0, "Colors %d/%d\n", fg, bg); clrtoeol(); + slk_touch(); + slk_noutrefresh(); refresh(); } #endif @@ -2432,9 +2756,12 @@ slk_test(void) int c, fmt = 1; char buf[9]; char *s; + chtype attr = A_NORMAL; + unsigned at_code = 0; #if HAVE_SLK_COLOR - short fg = COLOR_BLACK; - short bg = COLOR_WHITE; + int fg = COLOR_BLACK; + int bg = COLOR_WHITE; + short pair = 0; #endif c = CTRL('l'); @@ -2450,7 +2777,7 @@ slk_test(void) case CTRL('l'): erase(); attron(A_BOLD); - mvaddstr(0, 20, "Soft Key Exerciser"); + MvAddStr(0, 20, "Soft Key Exerciser"); attroff(A_BOLD); slk_help(); @@ -2465,7 +2792,7 @@ slk_test(void) break; case 's': - mvprintw(SLK_WORK, 0, "Press Q to stop the scrolling-test: "); + MvPrintw(SLK_WORK, 0, "Press Q to stop the scrolling-test: "); while ((c = Getchar()) != 'Q' && (c != ERR)) addch((chtype) c); break; @@ -2494,7 +2821,7 @@ slk_test(void) case '6': case '7': case '8': - (void) mvaddstr(SLK_WORK, 0, "Please enter the label value: "); + MvAddStr(SLK_WORK, 0, "Please enter the label value: "); strcpy(buf, ""); if ((s = slk_label(c - '0')) != 0) { strncpy(buf, s, 8); @@ -2506,23 +2833,9 @@ slk_test(void) clrtobot(); break; - case_QUIT: + case case_QUIT: goto done; -#if HAVE_SLK_COLOR - case 'F': - if (use_colors) { - fg = (fg + 1) % COLORS; - call_slk_color(fg, bg); - } - break; - case 'B': - if (use_colors) { - bg = (bg + 1) % COLORS; - call_slk_color(fg, bg); - } - break; -#endif #if defined(NCURSES_VERSION) && defined(KEY_RESIZE) && HAVE_WRESIZE case KEY_RESIZE: wnoutrefresh(stdscr); @@ -2530,7 +2843,24 @@ slk_test(void) #endif default: + if (cycle_attr(c, &at_code, &attr)) { + slk_attrset(attr); + slk_touch(); + slk_noutrefresh(); + break; + } +#if HAVE_SLK_COLOR + if (cycle_colors(c, &fg, &bg, &pair)) { + if (use_colors) { + call_slk_color(fg, bg); + } else { + beep(); + } + break; + } +#endif beep(); + break; } } while (!isQuit(c = Getchar())); @@ -2549,8 +2879,11 @@ wide_slk_test(void) int c, fmt = 1; wchar_t buf[SLKLEN + 1]; char *s; - short fg = COLOR_BLACK; - short bg = COLOR_WHITE; + chtype attr = A_NORMAL; + unsigned at_code = 0; + int fg = COLOR_BLACK; + int bg = COLOR_WHITE; + short pair = 0; c = CTRL('l'); if (use_colors) { @@ -2562,7 +2895,7 @@ wide_slk_test(void) case CTRL('l'): erase(); attr_on(WA_BOLD, NULL); - mvaddstr(0, 20, "Soft Key Exerciser"); + MvAddStr(0, 20, "Soft Key Exerciser"); attr_off(WA_BOLD, NULL); slk_help(); @@ -2577,7 +2910,7 @@ wide_slk_test(void) break; case 's': - mvprintw(SLK_WORK, 0, "Press Q to stop the scrolling-test: "); + MvPrintw(SLK_WORK, 0, "Press Q to stop the scrolling-test: "); while ((c = Getchar()) != 'Q' && (c != ERR)) addch((chtype) c); break; @@ -2606,27 +2939,29 @@ wide_slk_test(void) case '6': case '7': case '8': - (void) mvaddstr(SLK_WORK, 0, "Please enter the label value: "); + MvAddStr(SLK_WORK, 0, "Please enter the label value: "); *buf = 0; if ((s = slk_label(c - '0')) != 0) { 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) { const char *base = s; - memset(&state, 0, sizeof(state)); - test = mbsrtowcs(0, &base, 0, &state); + reset_mbytes(state); + test = count_mbytes(base, 0, &state); if (test == (size_t) -1) { temp[--used] = 0; } else if (test > want) { temp[--used] = 0; } else { - memset(&state, 0, sizeof(state)); - mbsrtowcs(buf, &base, want, &state); + reset_mbytes(state); + trans_mbytes(buf, base, want, &state); break; } } @@ -2639,18 +2974,18 @@ wide_slk_test(void) clrtobot(); break; - case_QUIT: + case case_QUIT: goto done; case 'F': if (use_colors) { - fg = (fg + 1) % COLORS; + fg = (short) ((fg + 1) % COLORS); call_slk_color(fg, bg); } break; case 'B': if (use_colors) { - bg = (bg + 1) % COLORS; + bg = (short) ((bg + 1) % COLORS); call_slk_color(fg, bg); } break; @@ -2660,7 +2995,24 @@ wide_slk_test(void) break; #endif default: + if (cycle_attr(c, &at_code, &attr)) { + slk_attr_set(attr, (short) (fg || bg), NULL); + slk_touch(); + slk_noutrefresh(); + break; + } +#if HAVE_SLK_COLOR + if (cycle_colors(c, &fg, &bg, &pair)) { + if (use_colors) { + call_slk_color(fg, bg); + } else { + beep(); + } + break; + } +#endif beep(); + break; } } while (!isQuit(c = Getchar())); @@ -2672,176 +3024,225 @@ wide_slk_test(void) #endif #endif /* SLK_INIT */ -/**************************************************************************** - * - * Alternate character-set stuff - * - ****************************************************************************/ +static void +show_256_chars(int repeat, attr_t attr, short pair) +{ + unsigned first = 0; + unsigned last = 255; + unsigned code; + int count; + + erase(); + attron(A_BOLD); + MvPrintw(0, 20, "Display of Character Codes %#0x to %#0x", + first, last); + attroff(A_BOLD); + refresh(); -/* ISO 6429: codes 0x80 to 0x9f may be control characters that cause the + for (code = first; code <= last; ++code) { + int row = (int) (2 + (code / 16)); + int col = (int) (5 * (code % 16)); + mvaddch(row, col, colored_chtype(code, attr, pair)); + for (count = 1; count < repeat; ++count) { + addch(colored_chtype(code, attr, pair)); + } + } + +} + +/* + * Show a slice of 32 characters, allowing those to be repeated up to the + * screen's width. + * + * ISO 6429: codes 0x80 to 0x9f may be control characters that cause the * terminal to perform functions. The remaining codes can be graphic. */ static void -show_upper_chars(unsigned first) +show_upper_chars(int base, int pagesize, int repeat, attr_t attr, short pair) { - bool C1 = (first == 128); unsigned code; - unsigned last = first + 31; + unsigned first = (unsigned) base; + unsigned last = first + (unsigned) pagesize - 2; + bool C1 = (first == 128); int reply; erase(); attron(A_BOLD); - mvprintw(0, 20, "Display of %s Character Codes %d to %d", + MvPrintw(0, 20, "Display of %s Character Codes %d to %d", C1 ? "C1" : "GR", first, last); attroff(A_BOLD); refresh(); for (code = first; code <= last; code++) { - int row = 2 + ((code - first) % 16); - int col = ((code - first) / 16) * COLS / 2; + int count = repeat; + 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); - mvprintw(row, col, "%*s: ", COLS / 4, tmp); - if (C1) - nodelay(stdscr, TRUE); - echochar(code); - if (C1) { - /* (yes, this _is_ crude) */ - while ((reply = Getchar()) != ERR) { - addch(UChar(reply)); - napms(10); + MvPrintw(row, col, "%*s: ", COLS / 4, tmp); + + do { + if (C1) + nodelay(stdscr, TRUE); + echochar(colored_chtype(code, attr, pair)); + if (C1) { + /* (yes, this _is_ crude) */ + while ((reply = Getchar()) != ERR) { + addch(UChar(reply)); + napms(10); + } + nodelay(stdscr, FALSE); } - nodelay(stdscr, FALSE); - } + } while (--count > 0); } } +#define PC_COLS 4 + static void -show_pc_chars(void) +show_pc_chars(int repeat, attr_t attr, short pair) { unsigned code; erase(); attron(A_BOLD); - mvprintw(0, 20, "Display of PC Character Codes"); + MvPrintw(0, 20, "Display of PC Character Codes"); attroff(A_BOLD); refresh(); for (code = 0; code < 16; ++code) { - mvprintw(2, (int) code * 3 + 8, "%X", code); + MvPrintw(2, (int) code * PC_COLS + 8, "%X", code); } for (code = 0; code < 256; code++) { - int row = 3 + (code / 16) + (code >= 128); - int col = 8 + (code % 16) * 3; + int count = repeat; + int row = 3 + (int) (code / 16) + (code >= 128); + int col = 8 + (int) (code % 16) * PC_COLS; if ((code % 16) == 0) - mvprintw(row, 0, "0x%02x:", code); + MvPrintw(row, 0, "0x%02x:", code); move(row, col); - switch (code) { - case '\n': - case '\r': - case '\b': - case '\f': - case '\033': - case 0x9b: - /* - * Skip the ones that do not work. - */ - break; - default: - addch(code | A_ALTCHARSET); - break; - } + do { + switch (code) { + case '\n': + case '\r': + case '\b': + case '\f': + case '\033': + case 0x9b: + /* + * Skip the ones that do not work. + */ + break; + default: + addch(colored_chtype(code, A_ALTCHARSET | attr, pair)); + break; + } + } while (--count > 0); } } static void -show_box_chars(void) +show_box_chars(int repeat, attr_t attr, short pair) { + (void) repeat; + + attr |= (attr_t) COLOR_PAIR(pair); + erase(); attron(A_BOLD); - mvaddstr(0, 20, "Display of the ACS Line-Drawing Set"); + MvAddStr(0, 20, "Display of the ACS Line-Drawing Set"); attroff(A_BOLD); refresh(); - box(stdscr, 0, 0); /* *INDENT-OFF* */ - mvhline(LINES / 2, 0, ACS_HLINE, COLS); - mvvline(0, COLS / 2, ACS_VLINE, LINES); - mvaddch(0, COLS / 2, ACS_TTEE); - mvaddch(LINES / 2, COLS / 2, ACS_PLUS); - mvaddch(LINES - 1, COLS / 2, ACS_BTEE); - mvaddch(LINES / 2, 0, ACS_LTEE); - mvaddch(LINES / 2, COLS - 1, ACS_RTEE); + wborder(stdscr, + colored_chtype(ACS_VLINE, attr, pair), + colored_chtype(ACS_VLINE, attr, pair), + colored_chtype(ACS_HLINE, attr, pair), + colored_chtype(ACS_HLINE, attr, pair), + colored_chtype(ACS_ULCORNER, attr, pair), + colored_chtype(ACS_URCORNER, attr, pair), + colored_chtype(ACS_LLCORNER, attr, pair), + colored_chtype(ACS_LRCORNER, attr, pair)); + MvHLine(LINES / 2, 0, colored_chtype(ACS_HLINE, attr, pair), COLS); + MvVLine(0, COLS / 2, colored_chtype(ACS_VLINE, attr, pair), LINES); + MvAddCh(0, COLS / 2, colored_chtype(ACS_TTEE, attr, pair)); + MvAddCh(LINES / 2, COLS / 2, colored_chtype(ACS_PLUS, attr, pair)); + MvAddCh(LINES - 1, COLS / 2, colored_chtype(ACS_BTEE, attr, 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 -show_1_acs(int n, const char *name, chtype code) +show_1_acs(int n, int repeat, const char *name, chtype code) { const int height = 16; int row = 2 + (n % height); int col = (n / height) * COLS / 2; - mvprintw(row, col, "%*s : ", COLS / 4, name); - addch(code); + + MvPrintw(row, col, "%*s : ", COLS / 4, name); + do { + addch(code); + } while (--repeat > 0); return n + 1; } static void -show_acs_chars(void) +show_acs_chars(int repeat, attr_t attr, short pair) /* display the ACS character set */ { int n; -#define BOTH(name) #name, name +#define BOTH(name) #name, colored_chtype(name, attr, (chtype) pair) erase(); attron(A_BOLD); - mvaddstr(0, 20, "Display of the ACS Character Set"); + MvAddStr(0, 20, "Display of the ACS Character Set"); attroff(A_BOLD); refresh(); - n = show_1_acs(0, BOTH(ACS_ULCORNER)); - n = show_1_acs(n, BOTH(ACS_URCORNER)); - n = show_1_acs(n, BOTH(ACS_LLCORNER)); - n = show_1_acs(n, BOTH(ACS_LRCORNER)); + n = show_1_acs(0, repeat, BOTH(ACS_ULCORNER)); + n = show_1_acs(n, repeat, BOTH(ACS_URCORNER)); + n = show_1_acs(n, repeat, BOTH(ACS_LLCORNER)); + n = show_1_acs(n, repeat, BOTH(ACS_LRCORNER)); - n = show_1_acs(n, BOTH(ACS_LTEE)); - n = show_1_acs(n, BOTH(ACS_RTEE)); - n = show_1_acs(n, BOTH(ACS_TTEE)); - n = show_1_acs(n, BOTH(ACS_BTEE)); + n = show_1_acs(n, repeat, BOTH(ACS_LTEE)); + n = show_1_acs(n, repeat, BOTH(ACS_RTEE)); + n = show_1_acs(n, repeat, BOTH(ACS_TTEE)); + n = show_1_acs(n, repeat, BOTH(ACS_BTEE)); - n = show_1_acs(n, BOTH(ACS_HLINE)); - n = show_1_acs(n, BOTH(ACS_VLINE)); + n = show_1_acs(n, repeat, BOTH(ACS_HLINE)); + n = show_1_acs(n, repeat, BOTH(ACS_VLINE)); /* * HPUX's ACS definitions are broken here. Just give up. */ #if !(defined(__hpux) && !defined(NCURSES_VERSION)) - n = show_1_acs(n, BOTH(ACS_LARROW)); - n = show_1_acs(n, BOTH(ACS_RARROW)); - n = show_1_acs(n, BOTH(ACS_UARROW)); - n = show_1_acs(n, BOTH(ACS_DARROW)); - - n = show_1_acs(n, BOTH(ACS_BLOCK)); - n = show_1_acs(n, BOTH(ACS_BOARD)); - n = show_1_acs(n, BOTH(ACS_LANTERN)); - n = show_1_acs(n, BOTH(ACS_BULLET)); - n = show_1_acs(n, BOTH(ACS_CKBOARD)); - n = show_1_acs(n, BOTH(ACS_DEGREE)); - n = show_1_acs(n, BOTH(ACS_DIAMOND)); - n = show_1_acs(n, BOTH(ACS_PLMINUS)); - n = show_1_acs(n, BOTH(ACS_PLUS)); - - n = show_1_acs(n, BOTH(ACS_GEQUAL)); - n = show_1_acs(n, BOTH(ACS_NEQUAL)); - n = show_1_acs(n, BOTH(ACS_LEQUAL)); - - n = show_1_acs(n, BOTH(ACS_STERLING)); - n = show_1_acs(n, BOTH(ACS_PI)); - n = show_1_acs(n, BOTH(ACS_S1)); - n = show_1_acs(n, BOTH(ACS_S3)); - n = show_1_acs(n, BOTH(ACS_S7)); - n = show_1_acs(n, BOTH(ACS_S9)); + n = show_1_acs(n, repeat, BOTH(ACS_LARROW)); + n = show_1_acs(n, repeat, BOTH(ACS_RARROW)); + n = show_1_acs(n, repeat, BOTH(ACS_UARROW)); + n = show_1_acs(n, repeat, BOTH(ACS_DARROW)); + + n = show_1_acs(n, repeat, BOTH(ACS_BLOCK)); + n = show_1_acs(n, repeat, BOTH(ACS_BOARD)); + n = show_1_acs(n, repeat, BOTH(ACS_LANTERN)); + n = show_1_acs(n, repeat, BOTH(ACS_BULLET)); + n = show_1_acs(n, repeat, BOTH(ACS_CKBOARD)); + n = show_1_acs(n, repeat, BOTH(ACS_DEGREE)); + n = show_1_acs(n, repeat, BOTH(ACS_DIAMOND)); + n = show_1_acs(n, repeat, BOTH(ACS_PLMINUS)); + n = show_1_acs(n, repeat, BOTH(ACS_PLUS)); + + n = show_1_acs(n, repeat, BOTH(ACS_GEQUAL)); + n = show_1_acs(n, repeat, BOTH(ACS_NEQUAL)); + n = show_1_acs(n, repeat, BOTH(ACS_LEQUAL)); + + n = show_1_acs(n, repeat, BOTH(ACS_STERLING)); + n = show_1_acs(n, repeat, BOTH(ACS_PI)); + n = show_1_acs(n, repeat, BOTH(ACS_S1)); + n = show_1_acs(n, repeat, BOTH(ACS_S3)); + n = show_1_acs(n, repeat, BOTH(ACS_S7)); + (void) show_1_acs(n, repeat, BOTH(ACS_S9)); #endif } @@ -2849,10 +3250,19 @@ static void acs_display(void) { int c = 'a'; + int pagesize = 32; char *term = getenv("TERM"); const char *pch_kludge = ((term != 0 && strstr(term, "linux")) ? "p=PC, " : ""); + chtype attr = A_NORMAL; + int digit = 0; + int repeat = 1; + int fg = COLOR_BLACK; + int bg = COLOR_BLACK; + unsigned at_code = 0; + short pair = 0; + void (*last_show_acs) (int, attr_t, short) = 0; do { switch (c) { @@ -2860,29 +3270,87 @@ acs_display(void) Repaint(); break; case 'a': - show_acs_chars(); + ToggleAcs(last_show_acs, show_acs_chars); + break; + case 'p': + if (*pch_kludge) + ToggleAcs(last_show_acs, show_pc_chars); + else + beep(); + break; + case 'w': + if (pagesize == 32) { + pagesize = 256; + } else { + pagesize = 32; + } break; case 'x': - show_box_chars(); + ToggleAcs(last_show_acs, show_box_chars); break; case '0': case '1': case '2': case '3': - show_upper_chars((unsigned) ((c - '0') * 32 + 128)); + digit = (c - '0'); + last_show_acs = 0; break; - case 'p': - show_pc_chars(); + case '-': + if (digit > 0) { + --digit; + last_show_acs = 0; + } else { + beep(); + } + break; + case '+': + if (digit < 3) { + ++digit; + last_show_acs = 0; + } else { + beep(); + } + break; + case '>': + if (repeat < (COLS / 4)) + ++repeat; + break; + case '<': + if (repeat > 1) + --repeat; break; default: - beep(); + if (cycle_attr(c, &at_code, &attr) + || cycle_colors(c, &fg, &bg, &pair)) { + break; + } else { + beep(); + } break; } - mvprintw(LINES - 3, 0, + if (pagesize != 32) { + show_256_chars(repeat, attr, pair); + } else if (last_show_acs != 0) { + last_show_acs(repeat, attr, pair); + } else { + show_upper_chars(digit * pagesize + 128, pagesize, repeat, attr, pair); + } + + MvPrintw(LINES - 3, 0, "Note: ANSI terminals may not display C1 characters."); - mvprintw(LINES - 2, 0, - "Select: a=ACS, x=box, %s0=C1, 1,2,3=GR characters, ESC=quit", + 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) { + MvPrintw(LINES - 1, 0, + "v/V, f/F, b/B cycle through video attributes (%s) and color %d/%d.", + attrs_to_cycle[at_code].name, + fg, bg); + } else { + MvPrintw(LINES - 1, 0, + "v/V cycles through video attributes (%s).", + attrs_to_cycle[at_code].name); + } refresh(); } while (!isQuit(c = Getchar())); @@ -2895,24 +3363,68 @@ acs_display(void) static cchar_t * merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, short pair) { - int count = getcchar(src, NULL, NULL, NULL, 0); - wchar_t *wch = 0; - attr_t ignore_attr; - short ignore_pair; + int count; *dst = *src; - if (count > 0) { - if ((wch = typeMalloc(wchar_t, count)) != 0) { - if (getcchar(src, wch, &ignore_attr, &ignore_pair, 0) != ERR) { - attr |= (ignore_attr & A_ALTCHARSET); - setcchar(dst, wch, attr, pair, 0); - } - free(wch); + do { + TEST_CCHAR(src, count, { + attr |= (test_attrs & A_ALTCHARSET); + setcchar(dst, test_wch, attr, pair, NULL); } - } + , { + ; + }); + } while (0); return dst; } +/* + * Header/legend take up no more than 8 lines, leaving 16 lines on a 24-line + * display. If there are no repeats, we could normally display 16 lines of 64 + * characters (1024 total). However, taking repeats and double-width cells + * into account, use 256 characters for the page. + */ +static void +show_paged_widechars(int base, + int pagesize, + int repeat, + int space, + attr_t attr, + short pair) +{ + int first = base * pagesize; + int last = first + pagesize - 1; + int per_line = 16; + cchar_t temp; + wchar_t code; + wchar_t codes[10]; + + erase(); + attron(A_BOLD); + MvPrintw(0, 20, "Display of Character Codes %#x to %#x", first, last); + attroff(A_BOLD); + + for (code = first; (int) code <= last; code++) { + int row = (2 + ((int) code - first) / per_line); + int col = 5 * ((int) code % per_line); + int count; + + memset(&codes, 0, sizeof(codes)); + codes[0] = code; + setcchar(&temp, codes, attr, pair, 0); + move(row, col); + if (wcwidth(code) == 0 && code != 0) { + addch((chtype) space | + (A_REVERSE ^ attr) | + (attr_t) COLOR_PAIR(pair)); + } + add_wch(&temp); + for (count = 1; count < repeat; ++count) { + add_wch(&temp); + } + } +} + static void show_upper_widechars(int first, int repeat, int space, attr_t attr, short pair) { @@ -2922,10 +3434,10 @@ show_upper_widechars(int first, int repeat, int space, attr_t attr, short pair) erase(); attron(A_BOLD); - mvprintw(0, 20, "Display of Character Codes %d to %d", first, last); + MvPrintw(0, 20, "Display of Character Codes %d to %d", first, last); attroff(A_BOLD); - for (code = first; code <= last; code++) { + for (code = first; (int) code <= last; code++) { int row = 2 + ((code - first) % 16); int col = ((code - first) / 16) * COLS / 2; wchar_t codes[10]; @@ -2933,11 +3445,13 @@ show_upper_widechars(int first, int repeat, int space, attr_t attr, short pair) int count = repeat; int y, x; + sprintf(tmp, "%3ld (0x%lx)", (long) code, (long) code); + MvPrintw(row, col, "%*s: ", COLS / 4, tmp); + memset(&codes, 0, sizeof(codes)); codes[0] = code; - sprintf(tmp, "%3ld (0x%lx)", (long) code, (long) code); - mvprintw(row, col, "%*s: ", COLS / 4, tmp); setcchar(&temp, codes, attr, pair, 0); + do { /* * Give non-spacing characters something to combine with. If we @@ -2945,19 +3459,23 @@ show_upper_widechars(int first, int repeat, int space, attr_t attr, short pair) * Mark them with reverse-video to make them simpler to find on * the display. */ - if (wcwidth(code) == 0) - addch(space | A_REVERSE); + if (wcwidth(code) == 0) { + addch((chtype) space | + (A_REVERSE ^ attr) | + (attr_t) COLOR_PAIR(pair)); + } /* - * This could use add_wch(), but is done for comparison with the - * normal 'f' test (and to make a test-case for echo_wchar()). - * The screen will flicker because the erase() at the top of the - * function is met by the builtin refresh() in echo_wchar(). + * This uses echo_wchar(), for comparison with the normal 'f' + * test (and to make a test-case for echo_wchar()). The screen + * may flicker because the erase() at the top of the function + * is met by the builtin refresh() in echo_wchar(). */ echo_wchar(&temp); /* * The repeat-count may make text wrap - avoid that. */ getyx(stdscr, y, x); + (void) y; if (x >= col + (COLS / 2) - 2) break; } while (--count > 0); @@ -2965,20 +3483,23 @@ show_upper_widechars(int first, int repeat, int space, attr_t attr, short pair) } static int -show_1_wacs(int n, const char *name, const cchar_t *code) +show_1_wacs(int n, int repeat, const char *name, const cchar_t *code) { const int height = 16; int row = 2 + (n % height); int col = (n / height) * COLS / 2; - mvprintw(row, col, "%*s : ", COLS / 4, name); - add_wchnstr(code, 1); + + MvPrintw(row, col, "%*s : ", COLS / 4, name); + while (--repeat >= 0) { + add_wch(code); + } return n + 1; } #define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair) static void -show_wacs_chars(attr_t attr, short pair) +show_wacs_chars(int repeat, attr_t attr, short pair) /* display the wide-ACS character set */ { cchar_t temp; @@ -2990,78 +3511,207 @@ show_wacs_chars(attr_t attr, short pair) erase(); attron(A_BOLD); - mvaddstr(0, 20, "Display of the Wide-ACS Character Set"); + MvAddStr(0, 20, "Display of the Wide-ACS Character Set"); attroff(A_BOLD); refresh(); - n = show_1_wacs(0, BOTH2(WACS_ULCORNER)); - n = show_1_wacs(n, BOTH2(WACS_URCORNER)); - n = show_1_wacs(n, BOTH2(WACS_LLCORNER)); - n = show_1_wacs(n, BOTH2(WACS_LRCORNER)); - - n = show_1_wacs(n, BOTH2(WACS_LTEE)); - n = show_1_wacs(n, BOTH2(WACS_RTEE)); - n = show_1_wacs(n, BOTH2(WACS_TTEE)); - n = show_1_wacs(n, BOTH2(WACS_BTEE)); - - n = show_1_wacs(n, BOTH2(WACS_HLINE)); - n = show_1_wacs(n, BOTH2(WACS_VLINE)); - - n = show_1_wacs(n, BOTH2(WACS_LARROW)); - n = show_1_wacs(n, BOTH2(WACS_RARROW)); - n = show_1_wacs(n, BOTH2(WACS_UARROW)); - n = show_1_wacs(n, BOTH2(WACS_DARROW)); - - n = show_1_wacs(n, BOTH2(WACS_BLOCK)); - n = show_1_wacs(n, BOTH2(WACS_BOARD)); - n = show_1_wacs(n, BOTH2(WACS_LANTERN)); - n = show_1_wacs(n, BOTH2(WACS_BULLET)); - n = show_1_wacs(n, BOTH2(WACS_CKBOARD)); - n = show_1_wacs(n, BOTH2(WACS_DEGREE)); - n = show_1_wacs(n, BOTH2(WACS_DIAMOND)); - n = show_1_wacs(n, BOTH2(WACS_PLMINUS)); - n = show_1_wacs(n, BOTH2(WACS_PLUS)); + n = show_1_wacs(0, repeat, BOTH2(WACS_ULCORNER)); + n = show_1_wacs(n, repeat, BOTH2(WACS_URCORNER)); + n = show_1_wacs(n, repeat, BOTH2(WACS_LLCORNER)); + n = show_1_wacs(n, repeat, BOTH2(WACS_LRCORNER)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_LTEE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_RTEE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_TTEE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_BTEE)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_HLINE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_VLINE)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_LARROW)); + n = show_1_wacs(n, repeat, BOTH2(WACS_RARROW)); + n = show_1_wacs(n, repeat, BOTH2(WACS_UARROW)); + n = show_1_wacs(n, repeat, BOTH2(WACS_DARROW)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_BLOCK)); + n = show_1_wacs(n, repeat, BOTH2(WACS_BOARD)); + n = show_1_wacs(n, repeat, BOTH2(WACS_LANTERN)); + n = show_1_wacs(n, repeat, BOTH2(WACS_BULLET)); + n = show_1_wacs(n, repeat, BOTH2(WACS_CKBOARD)); + 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)); #ifdef CURSES_WACS_ARRAY - n = show_1_wacs(n, BOTH2(WACS_GEQUAL)); - n = show_1_wacs(n, BOTH2(WACS_NEQUAL)); - n = show_1_wacs(n, BOTH2(WACS_LEQUAL)); - - n = show_1_wacs(n, BOTH2(WACS_STERLING)); - n = show_1_wacs(n, BOTH2(WACS_PI)); - n = show_1_wacs(n, BOTH2(WACS_S1)); - n = show_1_wacs(n, BOTH2(WACS_S3)); - n = show_1_wacs(n, BOTH2(WACS_S7)); - n = show_1_wacs(n, BOTH2(WACS_S9)); + n = show_1_wacs(n, repeat, BOTH2(WACS_GEQUAL)); + n = show_1_wacs(n, repeat, BOTH2(WACS_NEQUAL)); + n = show_1_wacs(n, repeat, BOTH2(WACS_LEQUAL)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_STERLING)); + n = show_1_wacs(n, repeat, BOTH2(WACS_PI)); + n = show_1_wacs(n, repeat, BOTH2(WACS_S1)); + n = show_1_wacs(n, repeat, BOTH2(WACS_S3)); + n = show_1_wacs(n, repeat, BOTH2(WACS_S7)); + (void) show_1_wacs(n, repeat, BOTH2(WACS_S9)); #endif } -#undef MERGE_ATTR +#ifdef WACS_D_PLUS +static void +show_wacs_chars_double(int repeat, attr_t attr, short pair) +/* display the wide-ACS character set */ +{ + cchar_t temp; -#define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair) + int n; + +/*#define BOTH2(name) #name, &(name) */ +#define BOTH2(name) #name, MERGE_ATTR(name) + + erase(); + attron(A_BOLD); + MvAddStr(0, 20, "Display of the Wide-ACS Character Set"); + attroff(A_BOLD); + refresh(); + + n = show_1_wacs(0, repeat, BOTH2(WACS_D_ULCORNER)); + n = show_1_wacs(n, repeat, BOTH2(WACS_D_URCORNER)); + n = show_1_wacs(n, repeat, BOTH2(WACS_D_LLCORNER)); + n = show_1_wacs(n, repeat, BOTH2(WACS_D_LRCORNER)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_D_LTEE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_D_RTEE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_D_TTEE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_D_BTEE)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_D_HLINE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_D_VLINE)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_LARROW)); + n = show_1_wacs(n, repeat, BOTH2(WACS_RARROW)); + n = show_1_wacs(n, repeat, BOTH2(WACS_UARROW)); + n = show_1_wacs(n, repeat, BOTH2(WACS_DARROW)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_BLOCK)); + n = show_1_wacs(n, repeat, BOTH2(WACS_BOARD)); + n = show_1_wacs(n, repeat, BOTH2(WACS_LANTERN)); + n = show_1_wacs(n, repeat, BOTH2(WACS_BULLET)); + n = show_1_wacs(n, repeat, BOTH2(WACS_CKBOARD)); + 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)); + +#ifdef CURSES_WACS_ARRAY + n = show_1_wacs(n, repeat, BOTH2(WACS_GEQUAL)); + n = show_1_wacs(n, repeat, BOTH2(WACS_NEQUAL)); + n = show_1_wacs(n, repeat, BOTH2(WACS_LEQUAL)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_STERLING)); + n = show_1_wacs(n, repeat, BOTH2(WACS_PI)); + n = show_1_wacs(n, repeat, BOTH2(WACS_S1)); + n = show_1_wacs(n, repeat, BOTH2(WACS_S3)); + n = show_1_wacs(n, repeat, BOTH2(WACS_S7)); + (void) show_1_wacs(n, repeat, BOTH2(WACS_S9)); +#endif +} +#endif +#ifdef WACS_T_PLUS static void -show_wbox_chars(attr_t attr, short pair) +show_wacs_chars_thick(int repeat, attr_t attr, short pair) +/* display the wide-ACS character set */ { cchar_t temp; + int n; + +/*#define BOTH2(name) #name, &(name) */ +#define BOTH2(name) #name, MERGE_ATTR(name) + + erase(); + attron(A_BOLD); + MvAddStr(0, 20, "Display of the Wide-ACS Character Set"); + attroff(A_BOLD); + refresh(); + + n = show_1_wacs(0, repeat, BOTH2(WACS_T_ULCORNER)); + n = show_1_wacs(n, repeat, BOTH2(WACS_T_URCORNER)); + n = show_1_wacs(n, repeat, BOTH2(WACS_T_LLCORNER)); + n = show_1_wacs(n, repeat, BOTH2(WACS_T_LRCORNER)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_T_LTEE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_T_RTEE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_T_TTEE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_T_BTEE)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_T_HLINE)); + n = show_1_wacs(n, repeat, BOTH2(WACS_T_VLINE)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_LARROW)); + n = show_1_wacs(n, repeat, BOTH2(WACS_RARROW)); + n = show_1_wacs(n, repeat, BOTH2(WACS_UARROW)); + n = show_1_wacs(n, repeat, BOTH2(WACS_DARROW)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_BLOCK)); + n = show_1_wacs(n, repeat, BOTH2(WACS_BOARD)); + n = show_1_wacs(n, repeat, BOTH2(WACS_LANTERN)); + n = show_1_wacs(n, repeat, BOTH2(WACS_BULLET)); + n = show_1_wacs(n, repeat, BOTH2(WACS_CKBOARD)); + 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)); + +#ifdef CURSES_WACS_ARRAY + n = show_1_wacs(n, repeat, BOTH2(WACS_GEQUAL)); + n = show_1_wacs(n, repeat, BOTH2(WACS_NEQUAL)); + n = show_1_wacs(n, repeat, BOTH2(WACS_LEQUAL)); + + n = show_1_wacs(n, repeat, BOTH2(WACS_STERLING)); + n = show_1_wacs(n, repeat, BOTH2(WACS_PI)); + n = show_1_wacs(n, repeat, BOTH2(WACS_S1)); + n = show_1_wacs(n, repeat, BOTH2(WACS_S3)); + n = show_1_wacs(n, repeat, BOTH2(WACS_S7)); + (void) show_1_wacs(n, repeat, BOTH2(WACS_S9)); +#endif +} +#endif + +#undef MERGE_ATTR + +#define MERGE_ATTR(n,wch) merge_wide_attr(&temp[n], wch, attr, pair) + +static void +show_wbox_chars(int repeat, attr_t attr, short pair) +{ + cchar_t temp[8]; + + (void) repeat; erase(); attron(A_BOLD); - mvaddstr(0, 20, "Display of the Wide-ACS Line-Drawing Set"); + MvAddStr(0, 20, "Display of the Wide-ACS Line-Drawing Set"); attroff(A_BOLD); refresh(); - attr_set(attr, pair, 0); - box_set(stdscr, 0, 0); - attr_set(A_NORMAL, 0, 0); + wborder_set(stdscr, + MERGE_ATTR(0, WACS_VLINE), + MERGE_ATTR(1, WACS_VLINE), + MERGE_ATTR(2, WACS_HLINE), + MERGE_ATTR(3, WACS_HLINE), + MERGE_ATTR(4, WACS_ULCORNER), + MERGE_ATTR(5, WACS_URCORNER), + MERGE_ATTR(6, WACS_LLCORNER), + MERGE_ATTR(7, WACS_LRCORNER)); /* *INDENT-OFF* */ - mvhline_set(LINES / 2, 0, MERGE_ATTR(WACS_HLINE), COLS); - mvvline_set(0, COLS / 2, MERGE_ATTR(WACS_VLINE), LINES); - mvadd_wch(0, COLS / 2, MERGE_ATTR(WACS_TTEE)); - mvadd_wch(LINES / 2, COLS / 2, MERGE_ATTR(WACS_PLUS)); - mvadd_wch(LINES - 1, COLS / 2, MERGE_ATTR(WACS_BTEE)); - mvadd_wch(LINES / 2, 0, MERGE_ATTR(WACS_LTEE)); - mvadd_wch(LINES / 2, COLS - 1, MERGE_ATTR(WACS_RTEE)); + (void) mvhline_set(LINES / 2, 0, MERGE_ATTR(0, WACS_HLINE), COLS); + (void) mvvline_set(0, COLS / 2, MERGE_ATTR(0, WACS_VLINE), LINES); + (void) mvadd_wch(0, COLS / 2, MERGE_ATTR(0, WACS_TTEE)); + (void) mvadd_wch(LINES / 2, COLS / 2, MERGE_ATTR(0, WACS_PLUS)); + (void) mvadd_wch(LINES - 1, COLS / 2, MERGE_ATTR(0, WACS_BTEE)); + (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* */ } @@ -3076,23 +3726,24 @@ show_2_wacs(int n, const char *name, const char *code, attr_t attr, short pair) int col = (n / height) * COLS / 2; char temp[80]; - mvprintw(row, col, "%*s : ", COLS / 4, name); - attr_set(attr, pair, 0); - addstr(strcpy(temp, code)); - attr_set(A_NORMAL, 0, 0); + MvPrintw(row, col, "%*s : ", COLS / 4, name); + (void) attr_set(attr, pair, 0); + addstr(strncpy(temp, code, 20)); + (void) attr_set(A_NORMAL, 0, 0); return n + 1; } #define SHOW_UTF8(n, name, code) show_2_wacs(n, name, code, attr, pair) static void -show_utf8_chars(attr_t attr, short pair) +show_utf8_chars(int repeat, attr_t attr, short pair) { int n; + (void) repeat; erase(); attron(A_BOLD); - mvaddstr(0, 20, "Display of the Wide-ACS Character Set"); + MvAddStr(0, 20, "Display of the Wide-ACS Character Set"); attroff(A_BOLD); refresh(); /* *INDENT-OFF* */ @@ -3132,87 +3783,10 @@ show_utf8_chars(attr_t attr, short pair) n = SHOW_UTF8(n, "WACS_S1", "\342\216\272"); n = SHOW_UTF8(n, "WACS_S3", "\342\216\273"); n = SHOW_UTF8(n, "WACS_S7", "\342\216\274"); - n = SHOW_UTF8(n, "WACS_S9", "\342\216\275"); + (void) SHOW_UTF8(n, "WACS_S9", "\342\216\275"); /* *INDENT-ON* */ } -/* *INDENT-OFF* */ -static struct { - chtype attr; - const char *name; -} attrs_to_cycle[] = { - { A_NORMAL, "normal" }, - { A_BOLD, "bold" }, - { A_REVERSE, "reverse" }, - { A_UNDERLINE, "underline" }, -}; -/* *INDENT-ON* */ - -static bool -cycle_attr(int ch, unsigned *at_code, chtype *attr) -{ - bool result = TRUE; - - switch (ch) { - case 'v': - if ((*at_code += 1) >= SIZEOF(attrs_to_cycle)) - *at_code = 0; - break; - case 'V': - if (*at_code == 1) - *at_code = SIZEOF(attrs_to_cycle) - 1; - else - *at_code -= 1; - break; - default: - result = FALSE; - break; - } - if (result) - *attr = attrs_to_cycle[*at_code].attr; - return result; -} - -static bool -cycle_colors(int ch, int *fg, int *bg, short *pair) -{ - bool result = FALSE; - - if (use_colors) { - result = TRUE; - switch (ch) { - case 'F': - if ((*fg -= 1) < 0) - *fg = COLORS - 1; - break; - case 'f': - if ((*fg += 1) >= COLORS) - *fg = 0; - break; - case 'B': - if ((*bg -= 1) < 0) - *bg = COLORS - 1; - break; - case 'b': - if ((*bg += 1) < 0) - *bg = 0; - break; - default: - result = FALSE; - break; - } - if (result) { - *pair = (*fg != COLOR_BLACK || *bg != COLOR_BLACK); - if (*pair != 0) { - *pair = 1; - if (init_pair(*pair, *fg, *bg) == ERR) { - result = FALSE; - } - } - } - } - return result; -} /* display the wide-ACS character set */ static void @@ -3220,14 +3794,15 @@ wide_acs_display(void) { int c = 'a'; int digit = 0; - int repeat = 0; + int repeat = 1; int space = ' '; + int pagesize = 32; chtype attr = A_NORMAL; int fg = COLOR_BLACK; int bg = COLOR_BLACK; unsigned at_code = 0; short pair = 0; - void (*last_show_wacs) (attr_t, short) = 0; + void (*last_show_wacs) (int, attr_t, short) = 0; do { switch (c) { @@ -3235,27 +3810,48 @@ wide_acs_display(void) Repaint(); break; case 'a': - last_show_wacs = show_wacs_chars; + ToggleAcs(last_show_wacs, show_wacs_chars); + break; +#ifdef WACS_D_PLUS + case 'd': + ToggleAcs(last_show_wacs, show_wacs_chars_double); + break; +#endif +#ifdef WACS_T_PLUS + case 't': + ToggleAcs(last_show_wacs, show_wacs_chars_thick); + break; +#endif + case 'w': + if (pagesize == 32) { + pagesize = 256; + } else { + pagesize = 32; + } break; case 'x': - last_show_wacs = show_wbox_chars; + ToggleAcs(last_show_wacs, show_wbox_chars); break; case 'u': - last_show_wacs = show_utf8_chars; + ToggleAcs(last_show_wacs, show_utf8_chars); break; default: if (c < 256 && isdigit(c)) { digit = (c - '0'); + last_show_wacs = 0; } else if (c == '+') { ++digit; + last_show_wacs = 0; } else if (c == '-' && digit > 0) { --digit; + last_show_wacs = 0; } else if (c == '>' && repeat < (COLS / 4)) { ++repeat; - } else if (c == '<' && repeat > 0) { + } else if (c == '<' && repeat > 1) { --repeat; } else if (c == '_') { space = (space == ' ') ? '_' : ' '; + last_show_wacs = 0; } else if (cycle_attr(c, &at_code, &attr) || cycle_colors(c, &fg, &bg, &pair)) { if (last_show_wacs != 0) @@ -3264,22 +3860,27 @@ wide_acs_display(void) beep(); break; } - last_show_wacs = 0; - show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair); break; } - if (last_show_wacs != 0) - last_show_wacs(attr, pair); + if (pagesize != 32) { + show_paged_widechars(digit, pagesize, repeat, space, attr, pair); + } else if (last_show_wacs != 0) { + last_show_wacs(repeat, attr, pair); + } else { + show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair); + } - mvprintw(LINES - 3, 0, - "Select: a WACS, x box, u UTF-8, 0-9,+/- non-ASCII, repeat, ESC=quit"); + MvPrintw(LINES - 4, 0, + "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) { - mvprintw(LINES - 2, 0, + MvPrintw(LINES - 2, 2, "v/V, f/F, b/B cycle through video attributes (%s) and color %d/%d.", attrs_to_cycle[at_code].name, fg, bg); } else { - mvprintw(LINES - 2, 0, + MvPrintw(LINES - 2, 2, "v/V cycles through video attributes (%s).", attrs_to_cycle[at_code].name); } @@ -3311,58 +3912,58 @@ test_sgr_attributes(void) } bkgdset(normal); erase(); - mvprintw(1, 20, "Graphic rendition test pattern:"); + MvPrintw(1, 20, "Graphic rendition test pattern:"); - mvprintw(4, 1, "vanilla"); + MvPrintw(4, 1, "vanilla"); #define set_sgr(mask) bkgdset((normal^(mask))); set_sgr(A_BOLD); - mvprintw(4, 40, "bold"); + MvPrintw(4, 40, "bold"); set_sgr(A_UNDERLINE); - mvprintw(6, 6, "underline"); + MvPrintw(6, 6, "underline"); set_sgr(A_BOLD | A_UNDERLINE); - mvprintw(6, 45, "bold underline"); + MvPrintw(6, 45, "bold underline"); set_sgr(A_BLINK); - mvprintw(8, 1, "blink"); + MvPrintw(8, 1, "blink"); set_sgr(A_BLINK | A_BOLD); - mvprintw(8, 40, "bold blink"); + MvPrintw(8, 40, "bold blink"); set_sgr(A_UNDERLINE | A_BLINK); - mvprintw(10, 6, "underline blink"); + MvPrintw(10, 6, "underline blink"); set_sgr(A_BOLD | A_UNDERLINE | A_BLINK); - mvprintw(10, 45, "bold underline blink"); + MvPrintw(10, 45, "bold underline blink"); set_sgr(A_REVERSE); - mvprintw(12, 1, "negative"); + MvPrintw(12, 1, "negative"); set_sgr(A_BOLD | A_REVERSE); - mvprintw(12, 40, "bold negative"); + MvPrintw(12, 40, "bold negative"); set_sgr(A_UNDERLINE | A_REVERSE); - mvprintw(14, 6, "underline negative"); + MvPrintw(14, 6, "underline negative"); set_sgr(A_BOLD | A_UNDERLINE | A_REVERSE); - mvprintw(14, 45, "bold underline negative"); + MvPrintw(14, 45, "bold underline negative"); set_sgr(A_BLINK | A_REVERSE); - mvprintw(16, 1, "blink negative"); + MvPrintw(16, 1, "blink negative"); set_sgr(A_BOLD | A_BLINK | A_REVERSE); - mvprintw(16, 40, "bold blink negative"); + MvPrintw(16, 40, "bold blink negative"); set_sgr(A_UNDERLINE | A_BLINK | A_REVERSE); - mvprintw(18, 6, "underline blink negative"); + MvPrintw(18, 6, "underline blink negative"); set_sgr(A_BOLD | A_UNDERLINE | A_BLINK | A_REVERSE); - mvprintw(18, 45, "bold underline blink negative"); + MvPrintw(18, 45, "bold underline blink negative"); bkgdset(normal); - mvprintw(LINES - 2, 1, "%s background. ", pass == 0 ? "Dark" : + MvPrintw(LINES - 2, 1, "%s background. ", pass == 0 ? "Dark" : "Light"); clrtoeol(); Pause(); @@ -3407,6 +4008,12 @@ FRAME #define is_scrollok(win) FALSE #endif +static WINDOW * +frame_win(FRAME * curp) +{ + return (curp != 0) ? curp->wind : stdscr; +} + /* We need to know if these flags are actually set, so don't look in FRAME. * These names are known to work with SVr4 curses as well as ncurses. The * _use_keypad name does not work with Solaris 8. @@ -3414,7 +4021,7 @@ FRAME static bool HaveKeypad(FRAME * curp) { - WINDOW *win = (curp ? curp->wind : stdscr); + WINDOW *win = frame_win(curp); (void) win; return is_keypad(win); } @@ -3422,7 +4029,7 @@ HaveKeypad(FRAME * curp) static bool HaveScroll(FRAME * curp) { - WINDOW *win = (curp ? curp->wind : stdscr); + WINDOW *win = frame_win(curp); (void) win; return is_scrollok(win); } @@ -3504,7 +4111,7 @@ transient(FRAME * curp, NCURSES_CONST char *msg) { newwin_legend(curp); if (msg) { - mvaddstr(LINES - 1, 0, msg); + MvAddStr(LINES - 1, 0, msg); refresh(); napms(1000); } @@ -3520,7 +4127,7 @@ static void newwin_report(FRAME * curp) /* report on the cursor's current position, then restore it */ { - WINDOW *win = (curp != 0) ? curp->wind : stdscr; + WINDOW *win = frame_win(curp); int y, x; if (win != stdscr) @@ -3562,7 +4169,7 @@ selectcell(int uli, int ulj, int lri, int lrj) case KEY_RIGHT: j++; break; - case_QUIT: + case case_QUIT: return ((pair *) 0); #ifdef NCURSES_MOUSE_VERSION case KEY_MOUSE: @@ -3594,10 +4201,10 @@ static void outerbox(pair ul, pair lr, bool onoff) /* draw or erase a box *outside* the given pair of corners */ { - mvaddch(ul.y - 1, lr.x - 1, onoff ? ACS_ULCORNER : ' '); - mvaddch(ul.y - 1, lr.x + 1, onoff ? ACS_URCORNER : ' '); - mvaddch(lr.y + 1, lr.x + 1, onoff ? ACS_LRCORNER : ' '); - mvaddch(lr.y + 1, ul.x - 1, onoff ? ACS_LLCORNER : ' '); + MvAddCh(ul.y - 1, lr.x - 1, onoff ? ACS_ULCORNER : ' '); + MvAddCh(ul.y - 1, lr.x + 1, onoff ? ACS_URCORNER : ' '); + MvAddCh(lr.y + 1, lr.x + 1, onoff ? ACS_LRCORNER : ' '); + MvAddCh(lr.y + 1, ul.x - 1, onoff ? ACS_LLCORNER : ' '); move(ul.y - 1, ul.x); hline(onoff ? ACS_HLINE : ' ', lr.x - ul.x + 1); move(ul.y, ul.x - 1); @@ -3622,7 +4229,7 @@ getwindow(void) if ((tmp = selectcell(2, 1, LINES - BOTLINES - 2, COLS - 2)) == (pair *) 0) return ((WINDOW *) 0); memcpy(&ul, tmp, sizeof(pair)); - mvaddch(ul.y - 1, ul.x - 1, ACS_ULCORNER); + MvAddCh(ul.y - 1, ul.x - 1, ACS_ULCORNER); move(0, 0); clrtoeol(); addstr("Use arrows to move cursor, anything else to mark corner 2"); @@ -3637,7 +4244,8 @@ getwindow(void) outerbox(ul, lr, TRUE); refresh(); - wrefresh(rwindow); + if (rwindow != 0) + wrefresh(rwindow); move(0, 0); clrtoeol(); @@ -3647,7 +4255,7 @@ getwindow(void) static void newwin_move(FRAME * curp, int dy, int dx) { - WINDOW *win = (curp != 0) ? curp->wind : stdscr; + WINDOW *win = frame_win(curp); int cur_y, cur_x; int max_y, max_x; @@ -3667,19 +4275,21 @@ newwin_move(FRAME * curp, int dy, int dx) static FRAME * delete_framed(FRAME * fp, bool showit) { - FRAME *np; + FRAME *np = 0; - fp->last->next = fp->next; - fp->next->last = fp->last; + if (fp != 0) { + fp->last->next = fp->next; + fp->next->last = fp->last; - if (showit) { - werase(fp->wind); - wrefresh(fp->wind); - } - delwin(fp->wind); + if (showit) { + werase(fp->wind); + wrefresh(fp->wind); + } + delwin(fp->wind); - np = (fp == fp->next) ? 0 : fp->next; - free(fp); + np = (fp == fp->next) ? 0 : fp->next; + free(fp); + } return np; } @@ -3689,7 +4299,7 @@ acs_and_scroll(void) { int c; FRAME *current = (FRAME *) 0, *neww; - WINDOW *usescr = stdscr; + WINDOW *usescr; #if HAVE_PUTWIN && HAVE_GETWIN FILE *fp; #endif @@ -3705,9 +4315,15 @@ acs_and_scroll(void) transient((FRAME *) 0, (char *) 0); switch (c) { case CTRL('C'): - neww = (FRAME *) calloc(1, sizeof(FRAME)); - if ((neww->wind = getwindow()) == (WINDOW *) 0) + if ((neww = typeCalloc(FRAME, 1)) == 0) { + failed("acs_and_scroll"); + goto breakout; + } + if ((neww->wind = getwindow()) == (WINDOW *) 0) { + failed("acs_and_scroll"); + free(neww); goto breakout; + } if (current == 0) { /* First element, */ neww->next = neww; /* so point it at itself */ @@ -3740,12 +4356,12 @@ acs_and_scroll(void) case CTRL('F'): /* scroll current window forward */ if (current) - wscrl(current->wind, 1); + wscrl(frame_win(current), 1); break; case CTRL('B'): /* scroll current window backwards */ if (current) - wscrl(current->wind, -1); + wscrl(frame_win(current), -1); break; case CTRL('K'): /* toggle keypad mode for current */ @@ -3764,13 +4380,13 @@ acs_and_scroll(void) #if HAVE_PUTWIN && HAVE_GETWIN case CTRL('W'): /* save and delete window */ - if (current == current->next) { + if ((current != 0) && (current == current->next)) { transient(current, "Will not save/delete ONLY window"); break; } else if ((fp = fopen(DUMPFILE, "w")) == (FILE *) 0) { transient(current, "Can't open screen dump file"); } else { - (void) putwin(current->wind, fp); + (void) putwin(frame_win(current), fp); (void) fclose(fp); current = delete_framed(current, TRUE); @@ -3781,17 +4397,22 @@ acs_and_scroll(void) if ((fp = fopen(DUMPFILE, "r")) == (FILE *) 0) { transient(current, "Can't open screen dump file"); } else { - neww = (FRAME *) calloc(1, sizeof(FRAME)); + if ((neww = typeCalloc(FRAME, 1)) != 0) { - neww->next = current->next; - neww->last = current; - neww->last->next = neww; - neww->next->last = neww; + neww->next = current ? current->next : 0; + neww->last = current; + if (neww->last != 0) + neww->last->next = neww; + if (neww->next != 0) + neww->next->last = neww; - neww->wind = getwin(fp); - (void) fclose(fp); + neww->wind = getwin(fp); - wrefresh(neww->wind); + wrefresh(neww->wind); + } else { + failed("acs_and_scroll"); + } + (void) fclose(fp); } break; #endif @@ -3878,13 +4499,13 @@ acs_and_scroll(void) case KEY_DC: { int y, x; - getyx(current->wind, y, x); + getyx(frame_win(current), y, x); if (--x < 0) { if (--y < 0) break; - x = getmaxx(current->wind) - 1; + x = getmaxx(frame_win(current)) - 1; } - mvwdelch(current->wind, y, x); + (void) mvwdelch(frame_win(current), y, x); } break; @@ -3900,7 +4521,7 @@ acs_and_scroll(void) break; } newwin_report(current); - usescr = (current ? current->wind : stdscr); + usescr = frame_win(current); wrefresh(usescr); } while (!isQuit(c = wGetchar(usescr)) @@ -3987,11 +4608,11 @@ mkpanel(short color, int rows, int cols, int tly, int tlx) if ((pan = new_panel(win)) == 0) { delwin(win); } else if (use_colors) { - short fg = (color == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK; + short fg = (short) ((color == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK); short bg = color; init_pair(color, fg, bg); - wbkgdset(win, (chtype) (COLOR_PAIR(color) | ' ')); + wbkgdset(win, (attr_t) (COLOR_PAIR(color) | ' ')); } else { wbkgdset(win, A_BOLD | ' '); } @@ -4038,7 +4659,8 @@ static void fill_panel(PANEL * pan) { WINDOW *win = panel_window(pan); - int num = ((const char *) panel_userptr(pan))[1]; + const char *userptr = (const char *) panel_userptr(pan); + int num = (userptr && *userptr) ? userptr[1] : '?'; int y, x; wmove(win, 1, 1); @@ -4054,16 +4676,6 @@ fill_panel(PANEL * pan) } #if USE_WIDEC_SUPPORT -static void -make_fullwidth_digit(cchar_t *target, int digit) -{ - wchar_t source[2]; - - source[0] = digit + 0xff10; - source[1] = 0; - setcchar(target, source, A_NORMAL, 0, 0); -} - static void init_wide_panel(void) { @@ -4084,7 +4696,8 @@ static void fill_wide_panel(PANEL * pan) { WINDOW *win = panel_window(pan); - int num = ((const char *) panel_userptr(pan))[1]; + const char *userptr = (const char *) panel_userptr(pan); + int num = (userptr && *userptr) ? userptr[1] : '?'; int y, x; wmove(win, 1, 1); @@ -4292,13 +4905,14 @@ panner_legend(int line) "Use <,> (or h,l) to grow/shrink the panner horizontally.", "Number repeats. Toggle legend:? filler:a timer:t scrollmark:s." }; - int n = (SIZEOF(legend) - (LINES - line)); - if (line < LINES && (n >= 0)) { - move(line, 0); - if (show_panner_legend) - printw("%s", legend[n]); - clrtoeol(); - return show_panner_legend; + int n = ((int) SIZEOF(legend) - (LINES - line)); + if (n >= 0) { + if (move(line, 0) != ERR) { + if (show_panner_legend) + printw("%s", legend[n]); + clrtoeol(); + return show_panner_legend; + } } return FALSE; } @@ -4335,7 +4949,7 @@ fill_pad(WINDOW *panpad, bool pan_lines) waddch(panpad, pan_lines ? ACS_LTEE : '+'); else waddch(panpad, (chtype) ((pan_lines ? 'a' : 'A') + - (gridcount++ % 26))); + (int) (gridcount++ % 26))); } else if (y % GRIDSIZE == 0) waddch(panpad, pan_lines ? ACS_HLINE : '-'); else if (x % GRIDSIZE == 0) @@ -4536,7 +5150,7 @@ panner(WINDOW *pad, break; } - mvaddch(top_y - 1, top_x - 1, ACS_ULCORNER); + MvAddCh(top_y - 1, top_x - 1, ACS_ULCORNER); do_v_line(top_y, top_x - 1, ACS_VLINE, porty); do_h_line(top_y - 1, top_x, ACS_HLINE, portx); @@ -4544,8 +5158,8 @@ panner(WINDOW *pad, int length = (portx - top_x - 1); float ratio = ((float) length) / ((float) pxmax); - lowend = (int) (top_x + (basex * ratio)); - highend = (int) (top_x + ((basex + length) * ratio)); + lowend = (int) ((float) top_x + ((float) basex * ratio)); + highend = (int) ((float) top_x + ((float) (basex + length) * ratio)); do_h_line(porty - 1, top_x, ACS_HLINE, lowend); if (highend < portx) { @@ -4561,8 +5175,8 @@ panner(WINDOW *pad, int length = (porty - top_y - 1); float ratio = ((float) length) / ((float) pymax); - lowend = (int) (top_y + (basey * ratio)); - highend = (int) (top_y + ((basey + length) * ratio)); + lowend = (int) ((float) top_y + ((float) basey * ratio)); + highend = (int) ((float) top_y + ((float) (basey + length) * ratio)); do_v_line(top_y, portx - 1, ACS_VLINE, lowend); if (highend < porty) { @@ -4574,9 +5188,9 @@ panner(WINDOW *pad, } else do_v_line(top_y, portx - 1, ACS_VLINE, porty); - mvaddch(top_y - 1, portx - 1, ACS_URCORNER); - mvaddch(porty - 1, top_x - 1, ACS_LLCORNER); - mvaddch(porty - 1, portx - 1, ACS_LRCORNER); + MvAddCh(top_y - 1, portx - 1, ACS_URCORNER); + MvAddCh(porty - 1, top_x - 1, ACS_LLCORNER); + MvAddCh(porty - 1, portx - 1, ACS_LRCORNER); if (!pending_pan) { #if HAVE_GETTIMEOFDAY @@ -4592,11 +5206,11 @@ panner(WINDOW *pad, 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 = (after.tv_sec + after.tv_usec / 1.0e6) - - (before.tv_sec + before.tv_usec / 1.0e6); + elapsed = (TIMEVAL2S(after) - TIMEVAL2S(before)); move(LINES - 1, COLS - 12); printw("Secs: %2.03f", elapsed); refresh(); @@ -4659,7 +5273,7 @@ padgetch(WINDOW *win) c = KEY_DC; break; case ERR: /* FALLTHRU */ - case_QUIT: + case case_QUIT: count = 0; c = KEY_EXIT; break; @@ -4724,7 +5338,7 @@ Continue(WINDOW *win) { noecho(); wmove(win, 10, 1); - mvwaddstr(win, 10, 1, " Press any key to continue"); + MvWAddStr(win, 10, 1, " Press any key to continue"); wrefresh(win); wGetchar(win); } @@ -4748,12 +5362,12 @@ flushinp_test(WINDOW *win) #ifdef A_COLOR if (use_colors) { init_pair(2, COLOR_CYAN, COLOR_BLUE); - wbkgd(subWin, COLOR_PAIR(2) | ' '); + wbkgd(subWin, (chtype) (COLOR_PAIR(2) | ' ')); } #endif - wattrset(subWin, A_BOLD); + (void) wattrset(subWin, A_BOLD); box(subWin, ACS_VLINE, ACS_HLINE); - mvwaddstr(subWin, 2, 1, "This is a subwindow"); + MvWAddStr(subWin, 2, 1, "This is a subwindow"); wrefresh(win); /* @@ -4764,15 +5378,15 @@ flushinp_test(WINDOW *win) * character to return without needing a newline. - T.Dickey 1997/10/11. */ cbreak(); - mvwaddstr(win, 0, 1, "This is a test of the flushinp() call."); + MvWAddStr(win, 0, 1, "This is a test of the flushinp() call."); - mvwaddstr(win, 2, 1, "Type random keys for 5 seconds."); - mvwaddstr(win, 3, 1, + MvWAddStr(win, 2, 1, "Type random keys for 5 seconds."); + MvWAddStr(win, 3, 1, "These should be discarded (not echoed) after the subwindow goes away."); wrefresh(win); for (i = 0; i < 5; i++) { - mvwprintw(subWin, 1, 1, "Time = %d", i); + MvWPrintw(subWin, 1, 1, "Time = %d", i); wrefresh(subWin); napms(1000); flushinp(); @@ -4784,19 +5398,19 @@ flushinp_test(WINDOW *win) wrefresh(win); napms(1000); - mvwaddstr(win, 2, 1, + MvWAddStr(win, 2, 1, "If you were still typing when the window timer expired,"); - mvwaddstr(win, 3, 1, + MvWAddStr(win, 3, 1, "or else you typed nothing at all while it was running,"); - mvwaddstr(win, 4, 1, + MvWAddStr(win, 4, 1, "test was invalid. You'll see garbage or nothing at all. "); - mvwaddstr(win, 6, 1, "Press a key"); + MvWAddStr(win, 6, 1, "Press a key"); wmove(win, 9, 10); wrefresh(win); echo(); wGetchar(win); flushinp(); - mvwaddstr(win, 12, 0, + MvWAddStr(win, 12, 0, "If you see any key other than what you typed, flushinp() is broken."); Continue(win); @@ -4880,16 +5494,18 @@ menu_test(void) #ifdef NCURSES_MOUSE_VERSION mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0); #endif - mvaddstr(0, 0, "This is the menu test:"); - mvaddstr(2, 0, " Use up and down arrow to move the select bar."); - mvaddstr(3, 0, " 'n' and 'p' act like arrows."); - mvaddstr(4, 0, + MvAddStr(0, 0, "This is the menu test:"); + MvAddStr(2, 0, " Use up and down arrow to move the select bar."); + MvAddStr(3, 0, " 'n' and 'p' act like arrows."); + MvAddStr(4, 0, " 'b' and 'f' scroll up/down (page), 'u' and 'd' (line)."); - mvaddstr(5, 0, " Press return to exit."); + MvAddStr(5, 0, " Press return to exit."); refresh(); - for (ap = animals; *ap; ap++) - *ip++ = new_item(*ap, ""); + for (ap = animals; *ap; ap++) { + if ((*ip = new_item(*ap, "")) != 0) + ++ip; + } *ip = (ITEM *) 0; m = new_menu(items); @@ -4914,8 +5530,8 @@ menu_test(void) continue; } - (void) mvprintw(LINES - 2, 0, - "You chose: %s\n", item_name(current_item(m))); + MvPrintw(LINES - 2, 0, + "You chose: %s\n", item_name(current_item(m))); (void) addstr("Press any key to continue..."); wGetchar(stdscr); @@ -4968,7 +5584,9 @@ tracetrace(unsigned tlevel) size_t need = 12; for (n = 0; t_tbl[n].name != 0; n++) need += strlen(t_tbl[n].name) + 2; - buf = (char *) malloc(need); + buf = typeMalloc(char, need); + if (!buf) + failed("tracetrace"); } sprintf(buf, "0x%02x = {", tlevel); if (tlevel == 0) { @@ -5036,16 +5654,19 @@ trace_set(void) int n; WINDOW *menuwin; - mvaddstr(0, 0, "Interactively set trace level:"); - mvaddstr(2, 0, " Press space bar to toggle a selection."); - mvaddstr(3, 0, " Use up and down arrow to move the select bar."); - mvaddstr(4, 0, " Press return to set the trace level."); - mvprintw(6, 0, "(Current trace level is %s)", tracetrace(_nc_tracing)); + MvAddStr(0, 0, "Interactively set trace level:"); + MvAddStr(2, 0, " Press space bar to toggle a selection."); + MvAddStr(3, 0, " Use up and down arrow to move the select bar."); + MvAddStr(4, 0, " Press return to set the trace level."); + MvPrintw(6, 0, "(Current trace level is %s)", tracetrace(_nc_tracing)); refresh(); - for (n = 0; t_tbl[n].name != 0; n++) - *ip++ = new_item(t_tbl[n].name, ""); + for (n = 0; t_tbl[n].name != 0; n++) { + if ((*ip = new_item(t_tbl[n].name, "")) != 0) { + ++ip; + } + } *ip = (ITEM *) 0; m = new_menu(items); @@ -5081,8 +5702,8 @@ trace_set(void) trace(newtrace); Trace(("trace level interactively set to %s", tracetrace(_nc_tracing))); - (void) mvprintw(LINES - 2, 0, - "Trace level is %s\n", tracetrace(_nc_tracing)); + MvPrintw(LINES - 2, 0, + "Trace level is %s\n", tracetrace(_nc_tracing)); (void) addstr("Press any key to continue..."); wGetchar(stdscr); @@ -5109,7 +5730,7 @@ make_label(int frow, int fcol, NCURSES_CONST char *label) if (f) { set_field_buffer(f, 0, label); - set_field_opts(f, (int) (field_opts(f) & ~O_ACTIVE)); + set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE)); } return (f); } @@ -5139,10 +5760,9 @@ display_form(FORM * f) set_form_sub(f, derwin(w, rows, cols, 1, 2)); box(w, 0, 0); keypad(w, TRUE); + if (post_form(f) != E_OK) + wrefresh(w); } - - if (post_form(f) != E_OK) - wrefresh(w); } static void @@ -5166,55 +5786,60 @@ edit_secure(FIELD * me, int c) if (field_info(me, &rows, &cols, &frow, &fcol, &nrow, &nbuf) == E_OK && nbuf > 0) { char *source = field_buffer(me, 1); - char temp[80]; + size_t have = (source ? strlen(source) : 0) + 1; + size_t need = 80 + have; + char *temp = malloc(need); long len; - strcpy(temp, source ? source : ""); - len = (long) (char *) field_userptr(me); - if (c <= KEY_MAX) { - if (isgraph(c) && (len + 1) < (int) sizeof(temp)) { - temp[len++] = c; - temp[len] = 0; - set_field_buffer(me, 1, temp); - c = '*'; - } else { - c = 0; - } - } else { - switch (c) { - case REQ_BEG_FIELD: - case REQ_CLR_EOF: - case REQ_CLR_EOL: - case REQ_DEL_LINE: - case REQ_DEL_WORD: - case REQ_DOWN_CHAR: - case REQ_END_FIELD: - case REQ_INS_CHAR: - case REQ_INS_LINE: - case REQ_LEFT_CHAR: - case REQ_NEW_LINE: - case REQ_NEXT_WORD: - case REQ_PREV_WORD: - case REQ_RIGHT_CHAR: - case REQ_UP_CHAR: - c = 0; /* we don't want to do inline editing */ - break; - case REQ_CLR_FIELD: - if (len) { - temp[0] = 0; + if (temp != 0) { + strncpy(temp, source ? source : "", have + 1); + len = (long) (char *) field_userptr(me); + if (c <= KEY_MAX) { + if (isgraph(c) && (len + 1) < (int) sizeof(temp)) { + temp[len++] = (char) c; + temp[len] = 0; set_field_buffer(me, 1, temp); + c = '*'; + } else { + c = 0; } - break; - case REQ_DEL_CHAR: - case REQ_DEL_PREV: - if (len) { - temp[--len] = 0; - set_field_buffer(me, 1, temp); + } else { + switch (c) { + case REQ_BEG_FIELD: + case REQ_CLR_EOF: + case REQ_CLR_EOL: + case REQ_DEL_LINE: + case REQ_DEL_WORD: + case REQ_DOWN_CHAR: + case REQ_END_FIELD: + case REQ_INS_CHAR: + case REQ_INS_LINE: + case REQ_LEFT_CHAR: + case REQ_NEW_LINE: + case REQ_NEXT_WORD: + case REQ_PREV_WORD: + case REQ_RIGHT_CHAR: + case REQ_UP_CHAR: + c = 0; /* we don't want to do inline editing */ + break; + case REQ_CLR_FIELD: + if (len) { + temp[0] = 0; + set_field_buffer(me, 1, temp); + } + break; + case REQ_DEL_CHAR: + case REQ_DEL_PREV: + if (len) { + temp[--len] = 0; + set_field_buffer(me, 1, temp); + } + break; } - break; } + set_field_userptr(me, (void *) len); + free(temp); } - set_field_userptr(me, (void *) len); } return c; } @@ -5288,7 +5913,7 @@ form_virtualize(FORM * f, WINDOW *w) } } } - mvprintw(0, COLS - 6, "(%s)", mode == REQ_INS_MODE ? "INS" : "OVL"); + MvPrintw(0, COLS - 6, "(%s)", mode == REQ_INS_MODE ? "INS" : "OVL"); /* * Force the field that the user is typing into to be in reverse video, @@ -5376,7 +6001,7 @@ FIELDCHECK_CB(mi_field_check) /* force the form to display a leading capital */ if (islower(UChar(s[0]))) { - s[0] = toupper(UChar(s[0])); + s[0] = (char) toupper(UChar(s[0])); set_field_buffer(fld, 0, s); } return TRUE; @@ -5440,11 +6065,12 @@ demo_forms(void) addstr("^K -- clear to end of field ^X -- clear field\n"); addstr("Arrow keys move within a field as you would expect. ^] toggles overlay mode."); - mvaddstr(4, 57, "Forms Entry Test"); + MvAddStr(4, 57, "Forms Entry Test"); refresh(); /* describe the form */ + memset(f, 0, sizeof(f)); f[n++] = make_label(0, 15, "Sample Form"); f[n++] = make_label(2, 0, "Last Name"); @@ -5466,34 +6092,35 @@ demo_forms(void) secure = f[n++] = make_field(5, 30, 1, 9, TRUE); set_field_type(f[n - 1], fty_passwd); - f[n++] = (FIELD *) 0; + f[n] = (FIELD *) 0; - form = new_form(f); + if ((form = new_form(f)) != 0) { - display_form(form); + display_form(form); - w = form_win(form); - raw(); - nonl(); /* lets us read ^M's */ - while (!finished) { - switch (form_driver(form, c = form_virtualize(form, w))) { - case E_OK: - mvaddstr(5, 57, field_buffer(secure, 1)); - clrtoeol(); - refresh(); - break; - case E_UNKNOWN_COMMAND: - finished = my_form_driver(form, c); - break; - default: - beep(); - break; + w = form_win(form); + raw(); + nonl(); /* lets us read ^M's */ + while (!finished) { + switch (form_driver(form, c = form_virtualize(form, w))) { + case E_OK: + MvAddStr(5, 57, field_buffer(secure, 1)); + clrtoeol(); + refresh(); + break; + case E_UNKNOWN_COMMAND: + finished = my_form_driver(form, c); + break; + default: + beep(); + break; + } } - } - erase_form(form); + erase_form(form); - free_form(form); + free_form(form); + } for (c = 0; f[c] != 0; c++) free_field(f[c]); free_fieldtype(fty_middle); @@ -5560,22 +6187,22 @@ overlap_helpitem(int state, int item, char *message) static void overlap_test_1_attr(WINDOW *win, int flavor, int col) { - short cpair = 1 + (flavor * 2) + col; + short cpair = (short) (1 + (flavor * 2) + col); switch (flavor) { case 0: - wattrset(win, A_NORMAL); + (void) wattrset(win, A_NORMAL); break; case 1: - wattrset(win, A_BOLD); + (void) wattrset(win, A_BOLD); break; case 2: init_pair(cpair, COLOR_BLUE, COLOR_WHITE); - wattrset(win, COLOR_PAIR(cpair) | A_NORMAL); + (void) wattrset(win, (int) (COLOR_PAIR(cpair) | A_NORMAL)); break; case 3: init_pair(cpair, COLOR_WHITE, COLOR_BLUE); - wattrset(win, COLOR_PAIR(cpair) | A_BOLD); + (void) wattrset(win, (int) (COLOR_PAIR(cpair) | A_BOLD)); break; } } @@ -5583,7 +6210,7 @@ overlap_test_1_attr(WINDOW *win, int flavor, int col) static void overlap_test_2_attr(WINDOW *win, int flavor, int col) { - short cpair = 9 + (flavor * 2) + col; + short cpair = (short) (9 + (flavor * 2) + col); switch (flavor) { case 0: @@ -5594,7 +6221,7 @@ overlap_test_2_attr(WINDOW *win, int flavor, int col) break; case 2: init_pair(cpair, COLOR_RED, COLOR_GREEN); - wbkgdset(win, ' ' | A_BLINK | COLOR_PAIR(cpair)); + wbkgdset(win, colored_chtype(' ', A_BLINK, cpair)); break; case 3: wbkgdset(win, ' ' | A_NORMAL); @@ -5614,6 +6241,7 @@ overlap_help(int state, int flavors[OVERLAP_FLAVORS]) if (state < 0) state += OVERLAP_FLAVORS; state = state % OVERLAP_FLAVORS; + assert(state >= 0 && state < OVERLAP_FLAVORS); for (item = 0; item < (2 * OVERLAP_FLAVORS); ++item) { row = item / 2; @@ -5679,7 +6307,7 @@ overlap_help(int state, int flavors[OVERLAP_FLAVORS]) break; } overlap_helpitem(state, item, msg); - wattrset(stdscr, A_NORMAL); + (void) wattrset(stdscr, A_NORMAL); wbkgdset(stdscr, ' ' | A_NORMAL); } move(LINES - 1, 0); @@ -5704,7 +6332,7 @@ overlap_test_1(int flavor, int col, WINDOW *a, char fill) { overlap_test_1_attr(a, flavor, col); fillwin(a, fill); - wattrset(a, A_NORMAL); + (void) wattrset(a, A_NORMAL); } static void @@ -5907,13 +6535,14 @@ do_single_test(const char c) case 'e': slk_test(); break; -#endif #if USE_WIDEC_SUPPORT case 'E': wide_slk_test(); break; #endif +#endif + case 'f': acs_display(); break; @@ -5996,6 +6625,7 @@ usage(void) ," -a f,b set default-colors (assumed white-on-black)" ," -d use default-colors if terminal supports them" #endif + ," -E call use_env(FALSE) to ignore $LINES and $COLUMNS" #if USE_SOFTKEYS ," -e fmt specify format for soft-keys test (e)" #endif @@ -6008,6 +6638,9 @@ 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) + ," -T call use_tioctl(TRUE) to allow SIGWINCH to override environment" +#endif #ifdef TRACE ," -t mask specify default trace-level (may toggle with ^T)" #endif @@ -6044,7 +6677,7 @@ rip_footer(WINDOW *win, int cols) wbkgd(win, A_REVERSE); werase(win); wmove(win, 0, 0); - wprintw(win, "footer: window %p, %d columns", win, cols); + wprintw(win, "footer: window %p, %d columns", (void *) win, cols); wnoutrefresh(win); return OK; } @@ -6055,7 +6688,7 @@ rip_header(WINDOW *win, int cols) wbkgd(win, A_REVERSE); werase(win); wmove(win, 0, 0); - wprintw(win, "header: window %p, %d columns", win, cols); + wprintw(win, "header: window %p, %d columns", (void *) win, cols); wnoutrefresh(win); return OK; } @@ -6119,13 +6752,13 @@ main_menu(bool top) (void) fflush(stdout); /* necessary under SVr4 curses */ /* - * This used to be an 'fgets()' call. However (on Linux, at least) - * mixing stream I/O and 'read()' (used in the library) causes the + * This used to be an 'fgets()' call (until 1996/10). However with + * some runtime libraries, mixing stream I/O and 'read()' causes the * input stream to be flushed when switching between the two. */ command = 0; for (;;) { - char ch; + char ch = '\0'; if (read(fileno(stdin), &ch, 1) <= 0) { if (command == 0) command = 'q'; @@ -6194,17 +6827,27 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != -1) { + while ((c = getopt(argc, argv, "a:dEe:fhmp:s:Tt:")) != -1) { switch (c) { #ifdef NCURSES_VERSION case 'a': assumed_colors = TRUE; - sscanf(optarg, "%d,%d", &default_fg, &default_bg); + switch (sscanf(optarg, "%d,%d", &default_fg, &default_bg)) { + case 0: + default_fg = COLOR_WHITE; + /* FALLTHRU */ + case 1: + default_bg = COLOR_BLACK; + break; + } break; case 'd': default_colors = TRUE; break; #endif + case 'E': + use_env(FALSE); + break; case 'e': my_e_param = atoi(optarg); #ifdef NCURSES_VERSION @@ -6231,12 +6874,17 @@ main(int argc, char *argv[]) break; #if USE_LIBPANEL case 's': - nap_msec = atol(optarg); + nap_msec = (int) atol(optarg); + break; +#endif +#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) + case 'T': + use_tioctl(TRUE); break; #endif #ifdef TRACE case 't': - save_trace = strtol(optarg, 0, 0); + save_trace = (unsigned) strtol(optarg, 0, 0); break; #endif default: @@ -6285,8 +6933,8 @@ main(int argc, char *argv[]) use_default_colors(); min_colors = -1; } -#if NCURSES_VERSION_PATCH >= 20000708 - else if (assumed_colors) +#if HAVE_ASSUME_DEFAULT_COLORS + if (assumed_colors) assume_default_colors(default_fg, default_bg); #endif #endif @@ -6297,7 +6945,9 @@ main(int argc, char *argv[]) if (can_change_color()) { short cp; - all_colors = (RGB_DATA *) malloc(max_colors * sizeof(RGB_DATA)); + all_colors = typeMalloc(RGB_DATA, (unsigned) max_colors); + if (!all_colors) + failed("all_colors"); for (cp = 0; cp < max_colors; ++cp) { color_content(cp, &all_colors[cp].red, @@ -6322,9 +6972,9 @@ main(int argc, char *argv[]) && okRGB(red) && okRGB(green) && okRGB(blue)) { - all_colors[c].red = (red * 1000) / scale; - all_colors[c].green = (green * 1000) / scale; - all_colors[c].blue = (blue * 1000) / scale; + all_colors[c].red = (short) ((red * 1000) / scale); + all_colors[c].green = (short) ((green * 1000) / scale); + all_colors[c].blue = (short) ((blue * 1000) / scale); } } fclose(fp);