-/* $Id: tclock.c,v 1.22 2002/06/29 23:34:13 tom Exp $ */
+/* $Id: tclock.c,v 1.34 2014/08/02 16:37:03 tom Exp $ */
-#include "test.priv.h"
+#include <test.priv.h>
+
+#if HAVE_MATH_H
#include <math.h>
/* 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;
int d;
if (has_colors())
- attrset(COLOR_PAIR(pair));
+ (void) attrset(AttrArg(COLOR_PAIR(pair), 0));
dx = x2 - from_x;
dy = y2 - from_y;
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;
- double fraction = 0.0;
#endif
+ double fraction = 0.0;
setlocale(LC_ALL, "");
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);
sdy = A2Y(sangle, sradius);
sprintf(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 (;;) {
#if HAVE_GETTIMEOFDAY
gettimeofday(¤t, 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);
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();
}
endwin();
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