ncurses 6.2 - patch 20200321

[ncurses.git] / test / tclock.c

diff --git a/test/tclock.c b/test/tclock.c
index 24f33827b449a98692bac627214b9130fd6830aa..6460c3147c75b18cac1b4c8d3dc55389bb10aa7d 100644 (file)
--- 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>
 
 #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
 /*
   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);
 }
 
     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)
 {
 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())
     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;
 
     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
 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;
 {
     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;
     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, "");
 
 
     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 (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);
            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);
        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);
     }


@@ -216,12 +244,12 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
        attroff(A_REVERSE);
 
        if (has_colors())
        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())
 
        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);
 
        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
     ExitProgram(EXIT_SUCCESS);
 }
 #else