ncurses 6.1 - patch 20180825

[ncurses.git] / test / dots_xcurses.c

diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c
index 3fddd63016b2e395dccd057889eb0b88b16a4aa4..3270322dea6992d3c6676160a16c2df930ec427a 100644 (file)
--- a/test/dots_xcurses.c
+++ b/test/dots_xcurses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2017 Free Software Foundation, Inc.                        *
+ * Copyright (c) 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_xcurses.c,v 1.11 2017/10/22 00:44:39 tom Exp $
+ * $Id: dots_xcurses.c,v 1.16 2018/06/23 21:35:06 tom Exp $
  *
  * A simple demo of the wide-curses interface used for comparison with termcap.
  */
 #include <test.priv.h>
 
-#if !defined(__MINGW32__)
+#if !defined(_WIN32)
 #include <sys/time.h>
 #endif
 
@@ -103,7 +103,7 @@ set_colors(int fg, int bg)
 {
     int pair = mypair(fg, bg);
     if (pair > 0) {
-       color_set((short) pair, NewPair(pair));
+       (void) color_set((short) pair, NewPair(pair));
     }
 }
 
@@ -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;