X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fgdc.c;h=ef220fed59ba7f6ead313bc6f46622c56f247336;hp=df9a0c3fdf5c23ad5abffb5db33bffd5142f7299;hb=26522e4669dbf45cba32138b5d81c6c292e88e60;hpb=c633e5103a29a38532cf1925257b91cea33fd090;ds=sidebyside diff --git a/test/gdc.c b/test/gdc.c index df9a0c3f..ef220fed 100644 --- a/test/gdc.c +++ b/test/gdc.c @@ -1,3 +1,30 @@ +/**************************************************************************** + * Copyright (c) 1998-2007,2008 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) @@ -6,20 +33,22 @@ * modified 10-18-89 for curses (jrl) * 10-18-89 added signal handling * - * $Id: gdc.c,v 1.15 2000/09/02 18:40:39 tom Exp $ + * $Id: gdc.c,v 1.31 2008/08/03 23:58:42 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, @@ -38,28 +67,32 @@ sighndl(int signo) sigtermed = signo; if (redirected) { endwin(); - exit(EXIT_FAILURE); + ExitProgram(EXIT_FAILURE); } } static void -drawbox(void) +drawbox(bool scrolling) { chtype bottom[XLENGTH + 1]; int n; if (hascolor) - attrset(COLOR_PAIR(3)); + attrset(COLOR_PAIR(PAIR_FRAMES)); 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); + 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); + } mvaddch(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER); move(YBASE, XBASE - 1); @@ -69,7 +102,7 @@ drawbox(void) vline(ACS_VLINE, YDEPTH); if (hascolor) - attrset(COLOR_PAIR(2)); + attrset(COLOR_PAIR(PAIR_OTHERS)); } static void @@ -77,13 +110,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 +130,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) @@ -120,7 +153,7 @@ usage(void) unsigned j; for (j = 0; j < SIZEOF(msg); j++) fprintf(stderr, "%s\n", msg[j]); - exit(EXIT_FAILURE); + ExitProgram(EXIT_FAILURE); } int @@ -135,11 +168,11 @@ main(int argc, char *argv[]) FILE *ifp = stdin; bool scrol = FALSE; - signal(SIGINT, sighndl); - signal(SIGTERM, sighndl); - signal(SIGKILL, sighndl); + setlocale(LC_ALL, ""); + + CATCHALL(sighndl); - while ((k = getopt(argc, argv, "sn")) != EOF) { + while ((k = getopt(argc, argv, "sn")) != -1) { switch (k) { case 's': scrol = TRUE; @@ -154,6 +187,7 @@ main(int argc, char *argv[]) } if (optind < argc) { count = atoi(argv[optind++]); + assert(count >= 0); } if (optind < argc) usage(); @@ -163,7 +197,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 { @@ -183,10 +217,10 @@ main(int argc, char *argv[]) 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); + attrset(COLOR_PAIR(PAIR_OTHERS)); } restart: @@ -194,7 +228,7 @@ main(int argc, char *argv[]) older[j] = newer[j] = next[j] = 0; clear(); - drawbox(); + drawbox(FALSE); do { char buf[30]; @@ -240,17 +274,17 @@ main(int argc, char *argv[]) } if (!s) { if (scrol) - drawbox(); + 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) napms(85); @@ -264,7 +298,7 @@ main(int argc, char *argv[]) mvaddstr(16, 30, buf); move(6, 0); - drawbox(); + drawbox(FALSE); refresh(); /* @@ -304,13 +338,14 @@ main(int argc, char *argv[]) standend(); endwin(); fprintf(stderr, "gdc terminated by signal %d\n", sigtermed); - return EXIT_FAILURE; + ExitProgram(EXIT_FAILURE); } + /* FALLTHRU */ default: continue; } } while (--count); standend(); endwin(); - return EXIT_SUCCESS; + ExitProgram(EXIT_SUCCESS); }