aboutsummaryrefslogtreecommitdiff
path: root/test/tclock.c
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2020-02-07 08:36:41 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2020-02-07 08:36:41 +0000
commitf0179cb6083cc92e5947ae56e6a0a5c5328aead0 (patch)
treebcee0ba9c2149b71f0bfc036df1e61e3105bf980 /test/tclock.c
parentcea297eb34d2361e79529034397465068ae34ecd (diff)
downloadsrc-f0179cb6083cc92e5947ae56e6a0a5c5328aead0.tar.gz
src-f0179cb6083cc92e5947ae56e6a0a5c5328aead0.zip
Vendor import ncurses 6.1-20200118vendor/ncurses/6.1-20200118
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=357645 svn path=/vendor/ncurses/6.1-20200118/; revision=357646; tag=vendor/ncurses/6.1-20200118
Diffstat (limited to 'test/tclock.c')
-rw-r--r--test/tclock.c69
1 files changed, 48 insertions, 21 deletions
diff --git a/test/tclock.c b/test/tclock.c
index 24f33827b449..6460c3147c75 100644
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,22 +1,12 @@
-/* $Id: tclock.c,v 1.33 2013/09/28 21:52:34 tom Exp $ */
+/* $Id: tclock.c,v 1.41 2020/01/18 16:46:35 tom Exp $ */
+#define NEED_TIME_H
#include <test.priv.h>
#if HAVE_MATH_H
#include <math.h>
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
/*
tclock - analog/digital clock for curses.
If it gives you joy, then
@@ -58,7 +48,7 @@ plot(int x, int y, int col)
MvAddCh(y, x, (chtype) col);
}
-/* Draw a diagonal(arbitrary) line using Bresenham's alogrithm. */
+/* Draw a diagonal(arbitrary) line using Bresenham's algorithm. */
static void
dline(int pair, int from_x, int from_y, int x2, int y2, int ch)
{
@@ -69,7 +59,7 @@ dline(int pair, int from_x, int from_y, int x2, int y2, int ch)
int d;
if (has_colors())
- (void) attrset((attr_t) COLOR_PAIR(pair));
+ (void) attrset(AttrArg(COLOR_PAIR(pair), 0));
dx = x2 - from_x;
dy = y2 - from_y;
@@ -116,8 +106,28 @@ dline(int pair, int from_x, int from_y, int x2, int y2, int ch)
}
}
+static void
+usage(void)
+{
+ static const char *msg[] =
+ {
+ "Usage: tclock [options]"
+ ,""
+ ,"Options:"
+#if HAVE_USE_DEFAULT_COLORS
+ ," -d invoke use_default_colors"
+#endif
+ };
+ size_t n;
+
+ for (n = 0; n < SIZEOF(msg); n++)
+ fprintf(stderr, "%s\n", msg[n]);
+
+ ExitProgram(EXIT_FAILURE);
+}
+
int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
{
int i, cx, cy;
double cr, mradius, hradius, mangle, hangle;
@@ -137,6 +147,24 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
struct timeval current;
#endif
double fraction = 0.0;
+#if HAVE_USE_DEFAULT_COLORS
+ bool d_option = FALSE;
+#endif
+
+ while ((ch = getopt(argc, argv, "d")) != -1) {
+ switch (ch) {
+#if HAVE_USE_DEFAULT_COLORS
+ case 'd':
+ d_option = TRUE;
+ break;
+#endif
+ default:
+ usage();
+ /* NOTREACHED */
+ }
+ }
+ if (optind < argc)
+ usage();
setlocale(LC_ALL, "");
@@ -149,7 +177,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
if (has_colors()) {
start_color();
#if HAVE_USE_DEFAULT_COLORS
- if (use_default_colors() == OK)
+ if (d_option && (use_default_colors() == OK))
my_bg = -1;
#endif
init_pair(1, COLOR_RED, my_bg);
@@ -175,7 +203,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
sangle = (i + 1) * (2.0 * PI) / 12.0;
sdx = A2X(sangle, sradius);
sdy = A2Y(sangle, sradius);
- sprintf(szChar, "%d", i + 1);
+ _nc_SPRINTF(szChar, _nc_SLIMIT(sizeof(szChar)) "%d", i + 1);
MvAddStr(cy - sdy, cx + sdx, szChar);
}
@@ -216,12 +244,12 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
attroff(A_REVERSE);
if (has_colors())
- (void) attrset((attr_t) COLOR_PAIR(1));
+ (void) attrset(AttrArg(COLOR_PAIR(1), 0));
dline(1, cx, cy, cx + sdx, cy - sdy, 'O');
if (has_colors())
- (void) attrset((attr_t) COLOR_PAIR(0));
+ (void) attrset(AttrArg(COLOR_PAIR(0), 0));
text = ctime(&tim);
MvPrintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
@@ -254,8 +282,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
}
- curs_set(1);
- endwin();
+ stop_curses();
ExitProgram(EXIT_SUCCESS);
}
#else