/****************************************************************************
- * Copyright (c) 2014,2017 Free Software Foundation, Inc. *
+ * Copyright (c) 2014-2018,2019 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 *
/*
* 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.15 2019/08/24 21:50:35 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
#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)"
};
int
main(int argc, char *argv[])
{
- int x, y, z, p;
+ int ch;
int fg, bg;
double r;
double c;
#endif
int m_option = 2;
int s_option = 1;
+ size_t need;
+ char *my_env;
- while ((x = getopt(argc, argv, "T:dem:s:")) != -1) {
- switch (x) {
+ while ((ch = getopt(argc, argv, "T:dem:s:")) != -1) {
+ switch (ch) {
case 'T':
- putenv(strcat(strcpy(malloc(6 + strlen(optarg)), "TERM="), optarg));
+ need = 6 + strlen(optarg);
+ my_env = malloc(need);
+ _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg);
+ putenv(my_env);
break;
#if HAVE_USE_DEFAULT_COLORS
case 'd':
d_option = TRUE;
break;
#endif
+#if HAVE_USE_ENV
case 'e':
use_env(TRUE);
break;
+#endif
case 'm':
m_option = atoi(optarg);
break;
#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);
}
fg = COLOR_WHITE;
bg = COLOR_BLACK;
while (!interrupted) {
- x = (int) (c * ranf()) + m_option;
- y = (int) (r * ranf()) + m_option;
- p = (ranf() > 0.9) ? '*' : ' ';
+ int x = (int) (c * ranf()) + m_option;
+ int y = (int) (r * ranf()) + m_option;
+ int p = (ranf() > 0.9) ? '*' : ' ';
move(y, x);
if (has_colors()) {
- z = (int) (ranf() * COLORS);
+ int z = (int) (ranf() * COLORS);
if (ranf() > 0.01) {
set_colors(fg = z, bg);
attron(COLOR_PAIR(mypair(fg, bg)));