X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdots_xcurses.c;h=f86cd8d16b3318c9fbf096c02e517720e4b60a26;hp=3fddd63016b2e395dccd057889eb0b88b16a4aa4;hb=86b16a498d6d545c03dceff7636d269eb7eb1e8f;hpb=58369d647d003dd9d9e1ecfc5ab07982db28f3da

diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c
index 3fddd630..f86cd8d1 100644
--- a/test/dots_xcurses.c
+++ b/test/dots_xcurses.c
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_xcurses.c,v 1.11 2017/10/22 00:44:39 tom Exp $
+ * $Id: dots_xcurses.c,v 1.14 2017/12/09 21:04:41 tom Exp $
  *
  * A simple demo of the wide-curses interface used for comparison with termcap.
  */
@@ -119,7 +119,9 @@ usage(void)
 #if HAVE_USE_DEFAULT_COLORS
 	," -d       invoke use_default_colors()"
 #endif
+#if HAVE_USE_ENV
 	," -e       allow environment $LINES / $COLUMNS"
+#endif
 	," -m SIZE  set margin (default: 2)"
 	," -s MSECS delay 1% of the time (default: 1 msecs)"
 #if HAVE_ALLOC_PAIR
@@ -159,9 +161,11 @@ main(int argc, char *argv[])
 	    d_option = TRUE;
 	    break;
 #endif
+#if HAVE_USE_ENV
 	case 'e':
 	    use_env(TRUE);
 	    break;
+#endif
 	case 'm':
 	    m_option = atoi(optarg);
 	    break;
@@ -196,6 +200,10 @@ main(int argc, char *argv[])
 	{
 	    for (fg = 0; fg < COLORS; fg++) {
 		for (bg = 0; bg < COLORS; bg++) {
+		    if (interrupted) {
+			cleanup();
+			ExitProgram(EXIT_FAILURE);
+		    }
 		    pair = mypair(fg, bg);
 		    if (pair > 0) {
 			InitPair(pair, fg, bg);
@@ -237,7 +245,7 @@ main(int argc, char *argv[])
 		napms(s_option);
 	    }
 	}
-	wch[0] = p;
+	wch[0] = (wchar_t) p;
 	addnwstr(wch, 1);
 	refresh();
 	++total_chars;