/****************************************************************************
- * Copyright (c) 2007-2017,2019 Free Software Foundation, Inc. *
+ * Copyright 2019-2022,2023 Thomas E. Dickey *
+ * Copyright 2007-2013,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 - 2007
*
- * $Id: dots_mvcur.c,v 1.21 2019/08/24 22:19:28 tom Exp $
+ * $Id: dots_mvcur.c,v 1.31 2023/01/07 17:21:48 tom Exp $
*
* A simple demo of the terminfo interface, and mvcur.
*/
outs(clear_screen);
outs(cursor_normal);
- 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
}
static void
-usage(void)
+usage(int ok)
{
static const char *msg[] =
{
"Usage: dots_termcap [options]"
,""
+ ,USAGE_COMMON
,"Options:"
," -T TERM override $TERM"
#if HAVE_USE_ENV
#endif
," -f use tigetnum rather than <term.h> mapping"
," -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)"
};
size_t n;
for (n = 0; n < SIZEOF(msg); n++)
fprintf(stderr, "%s\n", msg[n]);
- ExitProgram(EXIT_FAILURE);
+ ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
int
-main(int argc GCC_UNUSED,
- char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
{
int x0 = 1, y0 = 1;
int ch;
int my_colors;
int f_option = 0;
int m_option = 2;
+ int r_option = 0;
int s_option = 1;
size_t need;
char *my_env;
- while ((ch = getopt(argc, argv, "T:efm:s:")) != -1) {
+ while ((ch = getopt(argc, argv, OPTS_COMMON "T:efm:r:s:")) != -1) {
switch (ch) {
case 'T':
need = 6 + strlen(optarg);
- my_env = malloc(need);
- _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg);
- putenv(my_env);
+ if ((my_env = malloc(need)) != NULL) {
+ _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg);
+ putenv(my_env);
+ }
break;
#if HAVE_USE_ENV
case 'e':
case 'm':
m_option = atoi(optarg);
break;
+ case 'r':
+ r_option = atoi(optarg);
+ break;
case 's':
s_option = atoi(optarg);
break;
+ case OPTS_VERSION:
+ show_version(argv);
+ ExitProgram(EXIT_SUCCESS);
default:
- usage();
- break;
+ usage(ch == OPTS_USAGE);
+ /* NOTREACHED */
}
}
+ SetupAlarm(r_option);
InitAndCatch((sp = newterm((char *) 0, stdout, stdin)), onsig);
refresh(); /* needed with Solaris curses to cancel endwin */
tputs(tparm2(set_a_foreground, z), 1, outc);
} else {
tputs(tparm2(set_a_background, z), 1, outc);
- napms(s_option);
+ if (s_option)
+ napms(s_option);
}
} else if (VALID_STRING(exit_attribute_mode)
&& VALID_STRING(enter_reverse_mode)) {
outs((ranf() > 0.6)
? enter_reverse_mode
: exit_attribute_mode);
- napms(s_option);
+ if (s_option)
+ napms(s_option);
}
}
outc(p);
}
#else
int
-main(int argc GCC_UNUSED,
- char *argv[]GCC_UNUSED)
+main(void)
{
fprintf(stderr, "This program requires terminfo\n");
exit(EXIT_FAILURE);