X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fncurses.c;h=7a025fea39efba6847dc61d158871cebf844fbfb;hp=7933e719232f5524955c7e1f4447ee3a4dcbc011;hb=95a30fbbfc81d5eb0a76e139c86e0a6505cad871;hpb=88d50b5d7057d4f59c586c93ff290d0a39528f70;ds=sidebyside

diff --git a/test/ncurses.c b/test/ncurses.c
index 7933e719..7a025fea 100644
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -40,7 +40,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.309 2008/03/08 20:57:09 tom Exp $
+$Id: ncurses.c,v 1.336 2009/01/25 00:39:14 tom Exp $
 
 ***************************************************************************/
 
@@ -118,6 +118,28 @@ extern unsigned _nc_tracing;
 
 #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) memset(&state, 0, sizeof(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) mblen(NULL, 0), 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) memset(&state, 0, sizeof(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) mblen(NULL, 0), mbtowc(NULL, NULL, 0)
+#define state_unused
+#endif
+
 #define ToggleAcs(temp,real) temp = ((temp == real) ? 0 : real)
 
 #define P(string)	printw("%s\n", string)
@@ -172,7 +194,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.
@@ -212,7 +234,7 @@ wGetstring(WINDOW *win, char *buffer, int limit)
     getyx(win, y0, x0);
     wattrset(win, A_REVERSE);
 
-    x = strlen(buffer);
+    x = (int) strlen(buffer);
     while (!done) {
 	if (x > (int) strlen(buffer))
 	    x = (int) strlen(buffer);
@@ -254,10 +276,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();
 	    }
@@ -270,6 +292,42 @@ 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;
+}
+
+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);
+}
+
 static int
 wGet_wchar(WINDOW *win, wint_t *result)
 {
@@ -307,7 +365,7 @@ wGet_wstring(WINDOW *win, wchar_t *buffer, int limit)
     getyx(win, y0, x0);
     wattrset(win, A_REVERSE);
 
-    x = wcslen(buffer);
+    x = (int) wcslen(buffer);
     while (!done) {
 	if (x > (int) wcslen(buffer))
 	    x = (int) wcslen(buffer);
@@ -386,10 +444,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();
 	    }
@@ -511,8 +569,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 */
@@ -523,7 +584,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[] =
     {
@@ -547,7 +618,7 @@ 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));
@@ -599,12 +670,14 @@ remember_boxes(unsigned level, WINDOW *txt_win, WINDOW *box_win)
 {
     unsigned need = (level + 1) * 2;
 
+    assert(level < 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);
     }
     winstack[level].text = txt_win;
     winstack[level].frame = box_win;
@@ -671,13 +744,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);
 
@@ -775,12 +845,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))
@@ -794,6 +870,9 @@ wgetch_test(unsigned level, WINDOW *win, int delay)
     }
 
     wtimeout(win, -1);
+
+    if (!level)
+	init_getch(win, flags);
 }
 
 static int
@@ -890,18 +969,21 @@ 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;
+	    }
 	}
     }
     return result;
@@ -915,15 +997,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;
     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);
 
@@ -960,7 +1039,9 @@ wget_wch_test(unsigned level, WINDOW *win, int delay)
 		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);
@@ -1012,7 +1093,7 @@ 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;
@@ -1031,14 +1112,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);
@@ -1046,6 +1127,9 @@ wget_wch_test(unsigned level, WINDOW *win, int delay)
     }
 
     wtimeout(win, -1);
+
+    if (!level)
+	init_getch(win, flags);
 }
 
 static void
@@ -1168,22 +1252,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();
@@ -1191,17 +1275,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;
@@ -1218,11 +1302,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)
@@ -1378,7 +1462,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:
@@ -1412,10 +1496,10 @@ 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) {
@@ -1478,9 +1562,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)
@@ -1654,7 +1738,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:
@@ -1691,7 +1775,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) {
@@ -1775,6 +1859,8 @@ 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]);
 	}
@@ -1783,7 +1869,7 @@ show_color_name(int y, int x, int color, bool wide)
 }
 
 static void
-color_legend(WINDOW *helpwin)
+color_legend(WINDOW *helpwin, bool wide)
 {
     int row = 1;
     int col = 1;
@@ -1796,18 +1882,32 @@ color_legend(WINDOW *helpwin)
     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");
+	      "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,
 	      "Toggles:");
+    mvwprintw(helpwin, row++, col,
+	      "  a/A     toggle altcharset off/on");
     mvwprintw(helpwin, row++, col,
 	      "  b/B     toggle bold off/on");
     mvwprintw(helpwin, row++, col,
 	      "  n/N     toggle text/number on/off");
+    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; }
@@ -1827,13 +1927,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;
@@ -1848,12 +1956,14 @@ 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,
@@ -1864,22 +1974,28 @@ color_test(void)
 
 	/* show color names/numbers across the top */
 	for (i = 0; i < per_row; i++)
-	    show_color_name(top + 2, (i + 1) * width, i, 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);
@@ -1888,8 +2004,8 @@ color_test(void)
 		printw("%-*.*s", width, width, hello);
 		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) {
@@ -1898,6 +2014,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;
@@ -1910,7 +2032,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':
@@ -1961,7 +2089,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);
 	    }
@@ -1987,17 +2115,30 @@ wide_color_test(void)
     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[10];
     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;
 
@@ -2011,12 +2152,22 @@ 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,
@@ -2027,29 +2178,37 @@ wide_color_test(void)
 
 	/* show color names/numbers across the top */
 	for (i = 0; i < per_row; i++)
-	    show_color_name(top + 2, (i + 1) * width, i, 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);
+		init_pair(pair, InxToFG(i), InxToBG(i));
 		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);
+		addnwstr(buffer, width);
 		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) {
@@ -2058,6 +2217,12 @@ wide_color_test(void)
 	}
 
 	switch (c = wGetchar(stdscr)) {
+	case 'a':
+	    opt_acsc = FALSE;
+	    break;
+	case 'A':
+	    opt_acsc = TRUE;
+	    break;
 	case 'b':
 	    opt_bold = FALSE;
 	    break;
@@ -2070,7 +2235,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':
@@ -2079,6 +2250,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) {
@@ -2121,7 +2298,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);
 	    }
@@ -2146,13 +2323,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;
     }
 
@@ -2178,8 +2355,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;
@@ -2189,7 +2366,7 @@ 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);
 
@@ -2200,7 +2377,7 @@ color_edit(void)
 	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];
@@ -2214,7 +2391,7 @@ color_edit(void)
 	    addstr("        ");
 	    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);
@@ -2301,15 +2478,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 '?':
@@ -2338,7 +2515,7 @@ color_edit(void)
 	    refresh();
 	    break;
 
-	  case_QUIT:
+	case case_QUIT:
 	    break;
 
 	default:
@@ -2399,7 +2576,7 @@ slk_help(void)
 #if HAVE_SLK_COLOR
 	,"F/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"
@@ -2508,19 +2685,19 @@ 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;
+		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;
@@ -2615,20 +2792,22 @@ wide_slk_test(void)
 		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;
 		    }
 		}
@@ -2641,18 +2820,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;
@@ -2686,6 +2865,7 @@ static struct {
 } attrs_to_cycle[] = {
     { A_NORMAL,		"normal" },
     { A_BOLD,		"bold" },
+    { A_BLINK,		"blink" },
     { A_REVERSE,	"reverse" },
     { A_UNDERLINE,	"underline" },
 };
@@ -2745,10 +2925,10 @@ cycle_colors(int ch, int *fg, int *bg, short *pair)
 	    break;
 	}
 	if (result) {
-	    *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) {
+		if (init_pair(*pair, (short) *fg, (short) *bg) == ERR) {
 		    result = FALSE;
 		}
 	    }
@@ -2777,8 +2957,8 @@ show_upper_chars(unsigned first, int repeat, attr_t attr, short pair)
 
     for (code = first; code <= last; code++) {
 	int count = repeat;
-	int row = 2 + ((code - first) % 16);
-	int col = ((code - first) / 16) * COLS / 2;
+	int row = 2 + ((int) (code - first) % 16);
+	int col = ((int) (code - first) / 16) * COLS / 2;
 	char tmp[80];
 	sprintf(tmp, "%3u (0x%x)", code, code);
 	mvprintw(row, col, "%*s: ", COLS / 4, tmp);
@@ -2786,7 +2966,7 @@ show_upper_chars(unsigned first, int repeat, attr_t attr, short pair)
 	do {
 	    if (C1)
 		nodelay(stdscr, TRUE);
-	    echochar(code | attr | COLOR_PAIR(pair));
+	    echochar(colored_chtype(code, attr, pair));
 	    if (C1) {
 		/* (yes, this _is_ crude) */
 		while ((reply = Getchar()) != ERR) {
@@ -2817,8 +2997,8 @@ show_pc_chars(int repeat, attr_t attr, short pair)
     }
     for (code = 0; code < 256; code++) {
 	int count = repeat;
-	int row = 3 + (code / 16) + (code >= 128);
-	int col = 8 + (code % 16) * PC_COLS;
+	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);
 	move(row, col);
@@ -2835,7 +3015,7 @@ show_pc_chars(int repeat, attr_t attr, short pair)
 		 */
 		break;
 	    default:
-		addch(code | A_ALTCHARSET | attr | COLOR_PAIR(pair));
+		addch(colored_chtype(code, A_ALTCHARSET | attr, pair));
 		break;
 	    }
 	} while (--count > 0);
@@ -2853,15 +3033,23 @@ show_box_chars(int repeat, attr_t attr, short pair)
     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 | attr, COLS);
-    mvvline(0,         COLS / 2, ACS_VLINE | attr, LINES);
-    mvaddch(0,         COLS / 2, ACS_TTEE | attr);
-    mvaddch(LINES / 2, COLS / 2, ACS_PLUS | attr);
-    mvaddch(LINES - 1, COLS / 2, ACS_BTEE | attr);
-    mvaddch(LINES / 2, 0,        ACS_LTEE | attr);
-    mvaddch(LINES / 2, COLS - 1, ACS_RTEE | attr);
+    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* */
 
 }
@@ -2886,7 +3074,7 @@ show_acs_chars(int repeat, attr_t attr, short pair)
 {
     int n;
 
-#define BOTH(name) #name, (name | attr | COLOR_PAIR(pair))
+#define BOTH(name) #name, colored_chtype(name, attr, pair)
 
     erase();
     attron(A_BOLD);
@@ -3016,7 +3204,7 @@ acs_display(void)
 	if (last_show_acs != 0)
 	    last_show_acs(repeat, attr, pair);
 	else
-	    show_upper_chars(digit * 32 + 128, repeat, attr, pair);
+	    show_upper_chars((unsigned) (digit * 32 + 128), repeat, attr, pair);
 
 	mvprintw(LINES - 3, 0,
 		 "Note: ANSI terminals may not display C1 characters.");
@@ -3052,7 +3240,7 @@ merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, short pair)
 
     *dst = *src;
     if (count > 0) {
-	if ((wch = typeMalloc(wchar_t, count + 1)) != 0) {
+	if ((wch = typeMalloc(wchar_t, (unsigned) count + 1)) != 0) {
 	    if (getcchar(src, wch, &ignore_attr, &ignore_pair, 0) != ERR) {
 		attr |= (ignore_attr & A_ALTCHARSET);
 		setcchar(dst, wch, attr, pair, 0);
@@ -3075,7 +3263,7 @@ show_upper_widechars(int first, int repeat, int space, attr_t attr, short pair)
     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];
@@ -3122,7 +3310,7 @@ show_1_wacs(int n, int repeat, const char *name, const cchar_t *code)
     int col = (n / height) * COLS / 2;
 
     mvprintw(row, col, "%*s : ", COLS / 4, name);
-    while (repeat-- >= 0) {
+    while (--repeat >= 0) {
 	add_wch(code);
     }
     return n + 1;
@@ -3191,12 +3379,12 @@ show_wacs_chars(int repeat, attr_t attr, short pair)
 
 #undef MERGE_ATTR
 
-#define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair)
+#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;
+    cchar_t temp[8];
 
     (void) repeat;
     erase();
@@ -3205,17 +3393,23 @@ show_wbox_chars(int repeat, attr_t attr, short pair)
     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));
+    mvhline_set(LINES / 2, 0,        MERGE_ATTR(0, WACS_HLINE), COLS);
+    mvvline_set(0,         COLS / 2, MERGE_ATTR(0, WACS_VLINE), LINES);
+    mvadd_wch(0,           COLS / 2, MERGE_ATTR(0, WACS_TTEE));
+    mvadd_wch(LINES / 2,   COLS / 2, MERGE_ATTR(0, WACS_PLUS));
+    mvadd_wch(LINES - 1,   COLS / 2, MERGE_ATTR(0, WACS_BTEE));
+    mvadd_wch(LINES / 2,   0,        MERGE_ATTR(0, WACS_LTEE));
+    mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(0, WACS_RTEE));
     /* *INDENT-ON* */
 
 }
@@ -3489,6 +3683,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.
@@ -3496,7 +3696,7 @@ FRAME
 static bool
 HaveKeypad(FRAME * curp)
 {
-    WINDOW *win = (curp ? curp->wind : stdscr);
+    WINDOW *win = frame_win(curp);
     (void) win;
     return is_keypad(win);
 }
@@ -3504,7 +3704,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);
 }
@@ -3602,7 +3802,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)
@@ -3644,7 +3844,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:
@@ -3729,7 +3929,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;
 
@@ -3749,19 +3949,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;
 }
 
@@ -3787,9 +3989,13 @@ 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) {
+		goto breakout;
+	    }
+	    if ((neww->wind = getwindow()) == (WINDOW *) 0) {
+		free(neww);
 		goto breakout;
+	    }
 
 	    if (current == 0) {	/* First element,  */
 		neww->next = neww;	/*   so point it at itself */
@@ -3822,12 +4028,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 */
@@ -3846,13 +4052,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);
@@ -3863,17 +4069,18 @@ 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;
+		    neww->last->next = neww;
+		    neww->next->last = neww;
 
-		neww->wind = getwin(fp);
-		(void) fclose(fp);
+		    neww->wind = getwin(fp);
 
-		wrefresh(neww->wind);
+		    wrefresh(neww->wind);
+		}
+		(void) fclose(fp);
 	    }
 	    break;
 #endif
@@ -3960,13 +4167,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);
+		mvwdelch(frame_win(current), y, x);
 	    }
 	    break;
 
@@ -3982,7 +4189,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))
@@ -4069,7 +4276,7 @@ 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);
@@ -4120,7 +4327,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);
@@ -4136,16 +4344,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)
 {
@@ -4166,7 +4364,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);
@@ -4374,7 +4573,7 @@ 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));
+    int n = ((int) SIZEOF(legend) - (LINES - line));
     if (line < LINES && (n >= 0)) {
 	move(line, 0);
 	if (show_panner_legend)
@@ -4417,7 +4616,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)
@@ -4626,8 +4825,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) {
@@ -4643,8 +4842,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) {
@@ -4741,7 +4940,7 @@ padgetch(WINDOW *win)
 		c = KEY_DC;
 		break;
 	    case ERR:		/* FALLTHRU */
-	      case_QUIT:
+	    case case_QUIT:
 		count = 0;
 		c = KEY_EXIT;
 		break;
@@ -4970,8 +5169,10 @@ menu_test(void)
     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);
@@ -5050,7 +5251,7 @@ 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);
     }
     sprintf(buf, "0x%02x = {", tlevel);
     if (tlevel == 0) {
@@ -5126,8 +5327,11 @@ trace_set(void)
 
     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);
@@ -5255,7 +5459,7 @@ edit_secure(FIELD * me, int c)
 	len = (long) (char *) field_userptr(me);
 	if (c <= KEY_MAX) {
 	    if (isgraph(c) && (len + 1) < (int) sizeof(temp)) {
-		temp[len++] = c;
+		temp[len++] = (char) c;
 		temp[len] = 0;
 		set_field_buffer(me, 1, temp);
 		c = '*';
@@ -5458,7 +5662,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;
@@ -5527,6 +5731,7 @@ demo_forms(void)
     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");
@@ -5550,32 +5755,33 @@ demo_forms(void)
     set_field_type(f[n - 1], fty_passwd);
     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);
@@ -5642,7 +5848,7 @@ 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:
@@ -5665,7 +5871,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:
@@ -5676,7 +5882,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);
@@ -5696,6 +5902,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;
@@ -6207,7 +6414,7 @@ main_menu(bool top)
 	 */
 	command = 0;
 	for (;;) {
-	    char ch;
+	    char ch = '\0';
 	    if (read(fileno(stdin), &ch, 1) <= 0) {
 		if (command == 0)
 		    command = 'q';
@@ -6318,7 +6525,7 @@ main(int argc, char *argv[])
 #endif
 #ifdef TRACE
 	case 't':
-	    save_trace = strtol(optarg, 0, 0);
+	    save_trace = (unsigned) strtol(optarg, 0, 0);
 	    break;
 #endif
 	default:
@@ -6379,7 +6586,7 @@ 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);
 	    for (cp = 0; cp < max_colors; ++cp) {
 		color_content(cp,
 			      &all_colors[cp].red,
@@ -6404,9 +6611,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);