ncurses 6.2 - patch 20200627

[ncurses.git] / test / tclock.c

diff --git a/test/tclock.c b/test/tclock.c
index d1cc0fa1e5c7395a5ed8afb0de1ce29cf1b78cb7..6460c3147c75b18cac1b4c8d3dc55389bb10aa7d 100644 (file)
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,19 +1,11 @@
-/* $Id: tclock.c,v 1.22 2002/06/29 23:34:13 tom Exp $ */
+/* $Id: tclock.c,v 1.41 2020/01/18 16:46:35 tom Exp $ */
 
-#include "test.priv.h"
+#define NEED_TIME_H
+#include <test.priv.h>
 
-#include <math.h>
+#if HAVE_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
+#include <math.h>
 
 /*
   tclock - analog/digital clock for curses.
@@ -51,14 +43,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. */
+/* Draw a diagonal(arbitrary) line using Bresenham's algorithm. */
 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 +59,7 @@ dline(int pair, int from_x, int from_y, int x2, int y2, char ch)
     int d;
 
     if (has_colors())
-       attrset(COLOR_PAIR(pair));
+       (void) attrset(AttrArg(COLOR_PAIR(pair), 0));
 
     dx = x2 - from_x;
     dy = y2 - from_y;
@@ -114,8 +106,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;
@@ -125,15 +137,35 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     int sdx, sdy;
     int ch;
     int lastbeep = -1;
+    bool odd = FALSE;
     time_t tim;
     struct tm *t;
     char szChar[10];
-    int my_bg = COLOR_BLACK;
+    char *text;
+    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();
@@ -145,12 +177,13 @@ 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);
        init_pair(2, COLOR_MAGENTA, my_bg);
        init_pair(3, COLOR_GREEN, my_bg);
+       init_pair(4, COLOR_WHITE, COLOR_BLUE);
     }
 #ifdef KEY_RESIZE
     keypad(stdscr, TRUE);
@@ -170,12 +203,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 (;;) {
@@ -198,7 +231,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);
@@ -206,23 +239,28 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
        dline(3, cx, cy, cx + mdx, cy - mdy, '#');
 
-       attrset(A_REVERSE);
+       (void) attrset(A_REVERSE);
        dline(2, cx, cy, cx + hdx, cy - hdy, '.');
        attroff(A_REVERSE);
 
        if (has_colors())
-           attrset(COLOR_PAIR(1));
+           (void) attrset(AttrArg(COLOR_PAIR(1), 0));
 
        dline(1, cx, cy, cx + sdx, cy - sdy, 'O');
 
        if (has_colors())
-           attrset(COLOR_PAIR(0));
+           (void) attrset(AttrArg(COLOR_PAIR(0), 0));
 
-       mvaddstr(LINES - 2, 0, ctime(&tim));
+       text = ctime(&tim);
+       MvPrintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
        refresh();
        if ((t->tm_sec % 5) == 0
            && t->tm_sec != lastbeep) {
            lastbeep = t->tm_sec;
+           if (has_colors()) {
+               odd = !odd;
+               bkgd((chtype) (odd ? COLOR_PAIR(4) : COLOR_PAIR(0)));
+           }
            beep();
        }
 
@@ -244,7 +282,14 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
     }
 
-    curs_set(1);
-    endwin();
+    stop_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