/****************************************************************************
- * Copyright (c) 2017 Free Software Foundation, Inc. *
+ * Copyright 2018-2020,2022 Thomas E. Dickey *
+ * Copyright 2017 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_xcurses.c,v 1.12 2017/10/30 22:06:10 tom Exp $
+ * $Id: dots_xcurses.c,v 1.25 2022/04/16 18:27:24 tom Exp $
*
* A simple demo of the wide-curses interface used for comparison with termcap.
*/
#include <test.priv.h>
-#if !defined(__MINGW32__)
+#if !defined(_NC_WINDOWS)
#include <sys/time.h>
#endif
{
endwin();
- printf("\n\n%ld total cells, rate %.2f/sec\n",
- total_chars,
- ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
+ fflush(stdout);
+ fprintf(stderr, "\n\n%ld total cells, rate %.2f/sec\n",
+ total_chars,
+ ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
}
static void
{
int pair = mypair(fg, bg);
if (pair > 0) {
- color_set((short) pair, NewPair(pair));
+ (void) color_set((short) pair, NewPair(pair));
}
}
#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)"
+ ," -r SECS self-interrupt/exit after specified number of seconds"
," -s MSECS delay 1% of the time (default: 1 msecs)"
#if HAVE_ALLOC_PAIR
," -x use alloc_pair() rather than init_pair()"
int
main(int argc, char *argv[])
{
- int x, y, z, p;
int fg, bg, ch;
wchar_t wch[2];
- int pair;
double r;
double c;
#if HAVE_USE_DEFAULT_COLORS
bool d_option = FALSE;
#endif
int m_option = 2;
+ int r_option = 0;
int s_option = 1;
+ size_t need;
+ char *my_env;
- while ((ch = getopt(argc, argv, "T:dem:s:x")) != -1) {
+ while ((ch = getopt(argc, argv, "T:dem:r:s:x")) != -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;
+ case 'r':
+ r_option = atoi(optarg);
+ break;
case 's':
s_option = atoi(optarg);
break;
}
}
+ setlocale(LC_ALL, "");
srand((unsigned) time(0));
+ SetupAlarm(r_option);
InitAndCatch(initscr(), onsig);
if (has_colors()) {
start_color();
{
for (fg = 0; fg < COLORS; fg++) {
for (bg = 0; bg < COLORS; bg++) {
+ int pair;
if (interrupted) {
cleanup();
ExitProgram(EXIT_FAILURE);
fg = COLOR_WHITE;
bg = COLOR_BLACK;
- pair = 0;
wch[1] = 0;
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);
} else {
set_colors(fg, bg = z);
- napms(s_option);
+ if (s_option)
+ napms(s_option);
}
} else {
if (ranf() <= 0.01) {
} else {
attr_off(WA_REVERSE, NULL);
}
- napms(s_option);
+ if (s_option)
+ napms(s_option);
}
}
- wch[0] = p;
+ wch[0] = (wchar_t) p;
addnwstr(wch, 1);
refresh();
++total_chars;