ncurses 6.1 - patch 20181027

[ncurses.git] / test / tclock.c

diff --git a/test/tclock.c b/test/tclock.c
index b6e7d3f371a5218b9c3c14181fc16ea922d543ea..42cb8cf7269b5bd3495978aa947490e9f5f526b3 100644 (file)
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,7 +1,9 @@
-/* $Id: tclock.c,v 1.26 2009/08/29 18:47:26 tom Exp $ */
+/* $Id: tclock.c,v 1.38 2017/09/09 00:37:06 tom Exp $ */
 
 #include <test.priv.h>
 
+#if HAVE_MATH_H
+
 #include <math.h>
 
 #if TIME_WITH_SYS_TIME
@@ -51,14 +53,14 @@
 
 /* Plot a point */
 static void
-plot(int x, int y, char col)
+plot(int x, int y, int col)
 {
-    mvaddch(y, x, (chtype) col);
+    MvAddCh(y, x, (chtype) col);
 }
 
 /* Draw a diagonal(arbitrary) line using Bresenham's alogrithm. */
 static void
-dline(int pair, int from_x, int from_y, int x2, int y2, char ch)
+dline(int pair, int from_x, int from_y, int x2, int y2, int ch)
 {
     int dx, dy;
     int ax, ay;
@@ -67,7 +69,7 @@ dline(int pair, int from_x, int from_y, int x2, int y2, char ch)
     int d;
 
     if (has_colors())
-       (void) attrset(COLOR_PAIR(pair));
+       (void) attrset(AttrArg(COLOR_PAIR(pair), 0));
 
     dx = x2 - from_x;
     dy = y2 - from_y;
@@ -114,8 +116,28 @@ dline(int pair, int from_x, int from_y, int x2, int y2, char 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;
@@ -130,12 +152,30 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     struct tm *t;
     char szChar[10];
     char *text;
-    int my_bg = COLOR_BLACK;
+    short my_bg = COLOR_BLACK;
 #if HAVE_GETTIMEOFDAY
     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, "");
 
     initscr();
@@ -147,7 +187,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);
@@ -173,12 +213,12 @@ 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);
+       MvAddStr(cy - sdy, cx + sdx, szChar);
     }
 
-    mvaddstr(0, 0, "ASCII Clock by Howard Jones (ha.jones@ic.ac.uk),1994");
+    MvAddStr(0, 0, "ASCII Clock by Howard Jones (ha.jones@ic.ac.uk),1994");
 
     sradius = (4 * sradius) / 5;
     for (;;) {
@@ -201,7 +241,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
 #if HAVE_GETTIMEOFDAY
        gettimeofday(&current, 0);
-       fraction = (current.tv_usec / 1.0e6);
+       fraction = ((double) current.tv_usec / 1.0e6);
 #endif
        sangle = ((t->tm_sec + fraction) * (2.0 * PI) / 60.0);
        sdx = A2X(sangle, sradius);
@@ -214,15 +254,15 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
        attroff(A_REVERSE);
 
        if (has_colors())
-           (void) attrset(COLOR_PAIR(1));
+           (void) attrset(AttrArg(COLOR_PAIR(1), 0));
 
        dline(1, cx, cy, cx + sdx, cy - sdy, 'O');
 
        if (has_colors())
-           (void) attrset(COLOR_PAIR(0));
+           (void) attrset(AttrArg(COLOR_PAIR(0), 0));
 
        text = ctime(&tim);
-       mvprintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
+       MvPrintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
        refresh();
        if ((t->tm_sec % 5) == 0
            && t->tm_sec != lastbeep) {
@@ -252,7 +292,14 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
     }
 
-    curs_set(1);
-    endwin();
+    exit_curses();
     ExitProgram(EXIT_SUCCESS);
 }
+#else
+int
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+{
+    printf("This program requires the development header math.h\n");
+    ExitProgram(EXIT_FAILURE);
+}
+#endif