/****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
****************************************************************************/
/*
* Grand digital clock for curses compatible terminals
- * Usage: gdc [-s] [n] -- run for n seconds (default infinity)
+ * Usage: gdc [-s] [-t hh:mm:ss] [n] -- run for n seconds (default infinity)
* Flags: -s: scroll
*
* modified 10-18-89 for curses (jrl)
* 10-18-89 added signal handling
*
- * $Id: gdc.c,v 1.32 2009/08/29 19:02:25 tom Exp $
+ * $Id: gdc.c,v 1.44 2015/07/04 21:28:28 tom Exp $
*/
#include <test.priv.h>
static bool redirected = FALSE;
static bool hascolor = FALSE;
-static RETSIGTYPE
+static void
sighndl(int signo)
{
signal(signo, sighndl);
}
}
+static void
+check_term(void)
+{
+ if (sigtermed) {
+ (void) standend();
+ endwin();
+ fprintf(stderr, "gdc terminated by signal %d\n", sigtermed);
+ ExitProgram(EXIT_FAILURE);
+ }
+}
+
static void
drawbox(bool scrolling)
{
int n;
if (hascolor)
- (void) attrset(COLOR_PAIR(PAIR_FRAMES));
+ (void) attrset(AttrArg(COLOR_PAIR(PAIR_FRAMES), 0));
- mvaddch(YBASE - 1, XBASE - 1, ACS_ULCORNER);
+ MvAddCh(YBASE - 1, XBASE - 1, ACS_ULCORNER);
hline(ACS_HLINE, XLENGTH);
- mvaddch(YBASE - 1, XBASE + XLENGTH, ACS_URCORNER);
+ MvAddCh(YBASE - 1, XBASE + XLENGTH, ACS_URCORNER);
- mvaddch(YBASE + YDEPTH, XBASE - 1, ACS_LLCORNER);
+ MvAddCh(YBASE + YDEPTH, XBASE - 1, ACS_LLCORNER);
if ((mvinchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH)) != ERR) {
for (n = 0; n < XLENGTH; n++) {
if (!scrolling)
bottom[n] &= ~A_COLOR;
bottom[n] = ACS_HLINE | (bottom[n] & (A_ATTRIBUTES | A_COLOR));
}
- mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
+ (void) mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
}
- mvaddch(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER);
+ MvAddCh(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER);
move(YBASE, XBASE - 1);
vline(ACS_VLINE, YDEPTH);
vline(ACS_VLINE, YDEPTH);
if (hascolor)
- (void) attrset(COLOR_PAIR(PAIR_OTHERS));
+ (void) attrset(AttrArg(COLOR_PAIR(PAIR_OTHERS), 0));
}
static void
,"Options:"
," -n redirect input to /dev/null"
," -s scroll each number into place, rather than flipping"
+ ," -t hh:mm:ss specify starting time (default is ``now'')"
,""
,"If you specify a count, gdc runs for that number of seconds"
};
ExitProgram(EXIT_FAILURE);
}
+static time_t
+parse_time(const char *value)
+{
+ int hh, mm, ss;
+ int check;
+ time_t result;
+ char c;
+ struct tm *tm;
+
+ if (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c) != 3) {
+ if (sscanf(value, "%02d%02d%02d%c", &hh, &mm, &ss, &c) != 3) {
+ usage();
+ }
+ }
+
+ if ((hh < 0) || (hh >= 24) ||
+ (mm < 0) || (mm >= 60) ||
+ (ss < 0) || (ss >= 60)) {
+ usage();
+ }
+
+ /* adjust so that the localtime in the main loop will give usable time */
+ result = (hh * 3600) + ((mm * 60) + ss);
+ for (check = 0; check < 24; ++check) {
+ tm = localtime(&result);
+ if (tm->tm_hour == hh)
+ break;
+ result += 3600;
+ }
+
+ if (tm->tm_hour != hh) {
+ fprintf(stderr, "Cannot find local time for %s!\n", value);
+ usage();
+ }
+ return result;
+}
+
int
main(int argc, char *argv[])
{
int count = 0;
FILE *ofp = stdout;
FILE *ifp = stdin;
- bool scrol = FALSE;
+ bool smooth = FALSE;
+ bool stages = FALSE;
+ time_t starts = 0;
setlocale(LC_ALL, "");
CATCHALL(sighndl);
- while ((k = getopt(argc, argv, "sn")) != -1) {
+ while ((k = getopt(argc, argv, "nst:")) != -1) {
switch (k) {
- case 's':
- scrol = TRUE;
- break;
case 'n':
ifp = fopen("/dev/null", "r");
redirected = TRUE;
break;
+ case 's':
+ smooth = TRUE;
+ break;
+ case 't':
+ starts = parse_time(optarg);
+ break;
default:
usage();
}
hascolor = has_colors();
if (hascolor) {
- int bg = COLOR_BLACK;
+ short bg = COLOR_BLACK;
start_color();
#if HAVE_USE_DEFAULT_COLORS
if (use_default_colors() == OK)
init_pair(PAIR_DIGITS, COLOR_BLACK, COLOR_RED);
init_pair(PAIR_OTHERS, COLOR_RED, bg);
init_pair(PAIR_FRAMES, COLOR_WHITE, bg);
- (void) attrset(COLOR_PAIR(PAIR_OTHERS));
+ (void) attrset(AttrArg(COLOR_PAIR(PAIR_OTHERS), 0));
}
restart:
drawbox(FALSE);
do {
- char buf[30];
+ char buf[40];
- time(&now);
+ if (starts != 0) {
+ now = ++starts;
+ } else {
+ time(&now);
+ }
tm = localtime(&now);
mask = 0;
set(10, 17);
for (k = 0; k < 6; k++) {
- if (scrol) {
+ if (smooth) {
for (i = 0; i < 5; i++)
newer[i] = (newer[i] & ~mask) | (newer[i + 1] & mask);
newer[5] = (newer[5] & ~mask) | (next[k] & mask);
- } else
+ } else {
newer[k] = (newer[k] & ~mask) | (next[k] & mask);
+ }
next[k] = 0;
for (s = 1; s >= 0; s--) {
standt(s);
}
}
if (!s) {
- if (scrol)
+ if (smooth)
drawbox(TRUE);
refresh();
/*
* a lot of time when asking what time it is, at the top of
* this loop -T.Dickey
*/
- if (scrol)
+ if (smooth)
napms(85);
+ if (stages) {
+ stages = FALSE;
+ switch (wgetch(stdscr)) {
+ case 'q':
+ count = 1;
+ break;
+ case 'S':
+ stages = TRUE;
+ /* FALLTHRU */
+ case 's':
+ nodelay(stdscr, FALSE);
+ break;
+ case ' ':
+ nodelay(stdscr, TRUE);
+ break;
+#ifdef KEY_RESIZE
+ case KEY_RESIZE:
+#endif
+ case '?':
+ goto restart;
+ case ERR:
+ check_term();
+ /* FALLTHRU */
+ default:
+ continue;
+ }
+ }
}
}
}
/* this depends on the detailed format of ctime(3) */
- (void) strcpy(buf, ctime(&now));
- (void) strcpy(buf + 10, buf + 19);
- mvaddstr(16, 30, buf);
+ (void) strncpy(buf, ctime(&now), (size_t) 30);
+ {
+ char *d2 = buf + 10;
+ char *s2 = buf + 19;
+ while ((*d2++ = *s2++) != '\0') ;
+ }
+ MvAddStr(16, 30, buf);
move(6, 0);
drawbox(FALSE);
refresh();
/*
- * If we're not scrolling, wait 1000 msec (1 sec). Use napms() rather
- * than sleep() because the latter does odd things on some systems,
- * e.g., suspending output as well.
+ * If we're not smooth-scrolling, wait 1000 msec (1 sec). Use napms()
+ * rather than sleep() because the latter does odd things on some
+ * systems, e.g., suspending output as well.
*/
- if (scrol)
+ if (smooth)
napms(500);
else
napms(1000);
* will return an error if interrupted. This works only if we can
* read from the input, of course.
*/
+ stages = FALSE;
switch (wgetch(stdscr)) {
case 'q':
count = 1;
break;
+ case 'S':
+ stages = TRUE;
+ /* FALLTHRU */
case 's':
nodelay(stdscr, FALSE);
break;
case '?':
goto restart;
case ERR:
- if (sigtermed) {
- (void) standend();
- endwin();
- fprintf(stderr, "gdc terminated by signal %d\n", sigtermed);
- ExitProgram(EXIT_FAILURE);
- }
+ check_term();
/* FALLTHRU */
default:
continue;
projects / ncurses.git / blobdiff