X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdots_curses.c;h=989ce9af54b6489f768591aa93ab1c5e09212fd7;hp=b0adfe186e9e3b92cfc92dfb27f5ba43149e85b4;hb=5da4544722decdeb2bfd0c7c4581af0ea62148f9;hpb=58369d647d003dd9d9e1ecfc5ab07982db28f3da

diff --git a/test/dots_curses.c b/test/dots_curses.c
index b0adfe18..989ce9af 100644
--- a/test/dots_curses.c
+++ b/test/dots_curses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2014,2017 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2014-2017,2018 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            *
@@ -29,13 +29,13 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_curses.c,v 1.9 2017/10/22 00:44:39 tom Exp $
+ * $Id: dots_curses.c,v 1.13 2018/06/24 00:06:37 tom Exp $
  *
  * A simple demo of the curses interface used for comparison with termcap.
  */
 #include <test.priv.h>
 
-#if !defined(__MINGW32__)
+#if !defined(_WIN32)
 #include <sys/time.h>
 #endif
 
@@ -96,7 +96,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)"
     };
@@ -131,9 +133,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;
@@ -157,7 +161,12 @@ main(int argc, char *argv[])
 #endif
 	for (fg = 0; fg < COLORS; fg++) {
 	    for (bg = 0; bg < COLORS; bg++) {
-		int pair = mypair(fg, bg);
+		int pair;
+		if (interrupted) {
+		    cleanup();
+		    ExitProgram(EXIT_FAILURE);
+		}
+		pair = mypair(fg, bg);
 		if (pair > 0)
 		    init_pair((short) pair, (short) fg, (short) bg);
 	    }