X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fgdc.c;h=81de6c8d018e97473fe1049b4efce8e4c7275b13;hp=ea88d6c54754e200ff92aaa8df12bcae025a3060;hb=def73dda3feef55f48cc205a763c06ba1ea70e78;hpb=b1f61d9f3aa244512045a6b02e759825d7049d34 diff --git a/test/gdc.c b/test/gdc.c index ea88d6c5..81de6c8d 100644 --- a/test/gdc.c +++ b/test/gdc.c @@ -1,25 +1,54 @@ +/**************************************************************************** + * 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 * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ /* * 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.14 2000/04/23 00:03:11 tom Exp $ + * $Id: gdc.c,v 1.44 2015/07/04 21:28:28 tom Exp $ */ #include #include -#include -#include #define YBASE 10 #define XBASE 10 #define XLENGTH 54 #define YDEPTH 5 +#define PAIR_DIGITS 1 +#define PAIR_OTHERS 2 +#define PAIR_FRAMES 3 + static short disp[11] = { 075557, 011111, 071747, 071717, 055711, @@ -31,36 +60,51 @@ static int sigtermed = 0; static bool redirected = FALSE; static bool hascolor = FALSE; -static RETSIGTYPE +static void sighndl(int signo) { signal(signo, sighndl); sigtermed = signo; if (redirected) { endwin(); - exit(EXIT_FAILURE); + ExitProgram(EXIT_FAILURE); } } static void -drawbox(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) { chtype bottom[XLENGTH + 1]; int n; if (hascolor) - attrset(COLOR_PAIR(3)); + (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 + YDEPTH, XBASE - 1, ACS_LLCORNER); - mvinchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH); - for (n = 0; n < XLENGTH; n++) - bottom[n] = ACS_HLINE | (bottom[n] & (A_ATTRIBUTES | A_COLOR)); - mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH); - mvaddch(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER); + MvAddCh(YBASE - 1, XBASE + XLENGTH, ACS_URCORNER); + + 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)); + } + (void) mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH); + } + MvAddCh(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER); move(YBASE, XBASE - 1); vline(ACS_VLINE, YDEPTH); @@ -69,7 +113,7 @@ drawbox(void) vline(ACS_VLINE, YDEPTH); if (hascolor) - attrset(COLOR_PAIR(2)); + (void) attrset(AttrArg(COLOR_PAIR(PAIR_OTHERS), 0)); } static void @@ -77,13 +121,13 @@ standt(int on) { if (on) { if (hascolor) { - attron(COLOR_PAIR(1)); + attron(COLOR_PAIR(PAIR_DIGITS)); } else { attron(A_STANDOUT); } } else { if (hascolor) { - attron(COLOR_PAIR(2)); + attron(COLOR_PAIR(PAIR_OTHERS)); } else { attroff(A_STANDOUT); } @@ -97,7 +141,7 @@ set(int t, int n) m = 7 << n; for (i = 0; i < 5; i++) { - next[i] |= ((disp[t] >> (4 - i) * 3) & 07) << n; + next[i] |= ((disp[t] >> ((4 - i) * 3)) & 07) << n; mask |= (next[i] ^ older[i]) & m; } if (mask & m) @@ -114,13 +158,51 @@ usage(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" }; unsigned j; for (j = 0; j < SIZEOF(msg); j++) fprintf(stderr, "%s\n", msg[j]); - exit(EXIT_FAILURE); + 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 @@ -133,27 +215,33 @@ 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; - signal(SIGINT, sighndl); - signal(SIGTERM, sighndl); - signal(SIGKILL, sighndl); + setlocale(LC_ALL, ""); - while ((k = getopt(argc, argv, "sn")) != EOF) { + CATCHALL(sighndl); + + 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(); } } if (optind < argc) { count = atoi(argv[optind++]); + assert(count >= 0); } if (optind < argc) usage(); @@ -163,7 +251,7 @@ main(int argc, char *argv[]) if (name == 0 || newterm(name, ofp, ifp) == 0) { fprintf(stderr, "cannot open terminal\n"); - exit(EXIT_FAILURE); + ExitProgram(EXIT_FAILURE); } } else { @@ -177,16 +265,16 @@ main(int argc, char *argv[]) hascolor = has_colors(); if (hascolor) { - int bg = COLOR_BLACK; + short bg = COLOR_BLACK; start_color(); -#ifdef HAVE_USE_DEFAULT_COLORS +#if HAVE_USE_DEFAULT_COLORS if (use_default_colors() == OK) bg = -1; #endif - init_pair(1, COLOR_BLACK, COLOR_RED); - init_pair(2, COLOR_RED, bg); - init_pair(3, COLOR_WHITE, bg); - attrset(COLOR_PAIR(2)); + init_pair(PAIR_DIGITS, COLOR_BLACK, COLOR_RED); + init_pair(PAIR_OTHERS, COLOR_RED, bg); + init_pair(PAIR_FRAMES, COLOR_WHITE, bg); + (void) attrset(AttrArg(COLOR_PAIR(PAIR_OTHERS), 0)); } restart: @@ -194,12 +282,16 @@ main(int argc, char *argv[]) older[j] = newer[j] = next[j] = 0; clear(); - drawbox(); + drawbox(FALSE); do { - char buf[30]; + char buf[40]; - time(&now); + if (starts != 0) { + now = ++starts; + } else { + time(&now); + } tm = localtime(&now); mask = 0; @@ -213,12 +305,13 @@ main(int argc, char *argv[]) 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); @@ -239,40 +332,71 @@ main(int argc, char *argv[]) } } if (!s) { - if (scrol) - drawbox(); + if (smooth) + drawbox(TRUE); refresh(); /* * If we're scrolling, space out the refreshes to fake * movement. That's 7 frames, or 6 intervals, which would * be 166 msec if we spread it out over a second. It looks - * better (but will well on a slow terminal, e.g., less + * better (but will work on a slow terminal, e.g., less * than 9600bd) to squeeze that into a half-second, and use * half of 170 msec to ensure that the program doesn't eat * a lot of time when asking what time it is, at the top of - * this loop -TD + * 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(); + 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); @@ -284,10 +408,14 @@ main(int argc, char *argv[]) * 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; @@ -300,17 +428,13 @@ main(int argc, char *argv[]) case '?': goto restart; case ERR: - if (sigtermed) { - standend(); - endwin(); - fprintf(stderr, "gdc terminated by signal %d\n", sigtermed); - return EXIT_FAILURE; - } + check_term(); + /* FALLTHRU */ default: continue; } } while (--count); - standend(); + (void) standend(); endwin(); - return EXIT_SUCCESS; + ExitProgram(EXIT_SUCCESS); }