- double mradius, hradius, mangle, hangle;
+ double cr, mradius, hradius, mangle, hangle;
init_pair(1, COLOR_RED, my_bg);
init_pair(2, COLOR_MAGENTA, my_bg);
init_pair(3, COLOR_GREEN, my_bg);
init_pair(1, COLOR_RED, my_bg);
init_pair(2, COLOR_MAGENTA, my_bg);
init_pair(3, COLOR_GREEN, my_bg);
- ch = (cx > cy) ? cy : cx; /* usually cy */
- mradius = (3 * cy) / 4; /* 9 */
- hradius = cy / 2; /* 6 */
- sradius = (2 * cy) / 3; /* 8 */
+ if (cx / ASPECT < cy)
+ cr = cx / ASPECT;
+ else
+ cr = cy;
+ sradius = (5 * cr) / 6; /* 10 */
+ mradius = (3 * cr) / 4; /* 9 */
+ hradius = cr / 2; /* 6 */
sdx = A2X(sangle, sradius);
sdy = A2Y(sangle, sradius);
sprintf(szChar, "%d", i + 1);
sdx = A2X(sangle, sradius);
sdy = A2Y(sangle, sradius);
sprintf(szChar, "%d", i + 1);
- 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");
mdx = A2X(mangle, mradius);
mdy = A2Y(mangle, mradius);
mdx = A2X(mangle, mradius);
mdy = A2Y(mangle, mradius);
hdx = A2X(hangle, hradius);
hdy = A2Y(hangle, hradius);
hdx = A2X(hangle, hradius);
hdy = A2Y(hangle, hradius);
- sangle = ((t->tm_sec) * (2.0 * PI) / 60.0);
+#if HAVE_GETTIMEOFDAY
+ gettimeofday(¤t, 0);
+ fraction = ((double) current.tv_usec / 1.0e6);
+#endif
+ sangle = ((t->tm_sec + fraction) * (2.0 * PI) / 60.0);
sdx = A2X(sangle, sradius);
sdy = A2Y(sangle, sradius);
dline(3, cx, cy, cx + mdx, cy - mdy, '#');
sdx = A2X(sangle, sradius);
sdy = A2Y(sangle, sradius);
dline(3, cx, cy, cx + mdx, cy - mdy, '#');
dline(2, cx, cy, cx + hdx, cy - hdy, '.');
attroff(A_REVERSE);
if (has_colors())
dline(2, cx, cy, cx + hdx, cy - hdy, '.');
attroff(A_REVERSE);
if (has_colors())
- plot(cx + sdx, cy - sdy, 'O');
+ dline(1, cx, cy, cx + sdx, cy - sdy, 'O');
- mvaddstr(LINES - 2, 0, ctime(&tim));
+ text = ctime(&tim);
+ MvPrintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
dline(0, cx, cy, cx + hdx, cy - hdy, ' ');
dline(0, cx, cy, cx + mdx, cy - mdy, ' ');
dline(0, cx, cy, cx + hdx, cy - hdy, ' ');
dline(0, cx, cy, cx + mdx, cy - mdy, ' ');
+ 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);