+/****************************************************************************
+ * Copyright (c) 1998-2010,2012 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)
* modified 10-18-89 for curses (jrl)
* 10-18-89 added signal handling
*
- * $Id: gdc.c,v 1.23 2002/08/10 19:20:14 tom Exp $
+ * $Id: gdc.c,v 1.36 2012/12/29 22:51:57 tom Exp $
*/
-#include <time.h>
-
#include <test.priv.h>
+#include <time.h>
+
#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,
}
static void
-drawbox(void)
+drawbox(bool scrolling)
{
chtype bottom[XLENGTH + 1];
int n;
if (hascolor)
- attrset(COLOR_PAIR(3));
+ (void) attrset((attr_t) COLOR_PAIR(PAIR_FRAMES));
- 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);
vline(ACS_VLINE, YDEPTH);
if (hascolor)
- attrset(COLOR_PAIR(2));
+ (void) attrset((attr_t) COLOR_PAIR(PAIR_OTHERS));
}
static void
{
if (on) {
if (hascolor) {
- attron(COLOR_PAIR(1));
+ attron((attr_t) COLOR_PAIR(PAIR_DIGITS));
} else {
attron(A_STANDOUT);
}
} else {
if (hascolor) {
- attron(COLOR_PAIR(2));
+ attron((attr_t) COLOR_PAIR(PAIR_OTHERS));
} else {
attroff(A_STANDOUT);
}
setlocale(LC_ALL, "");
- signal(SIGINT, sighndl);
- signal(SIGTERM, sighndl);
+ CATCHALL(sighndl);
- while ((k = getopt(argc, argv, "sn")) != EOF) {
+ while ((k = getopt(argc, argv, "sn")) != -1) {
switch (k) {
case 's':
scrol = TRUE;
}
if (optind < argc) {
count = atoi(argv[optind++]);
+ assert(count >= 0);
}
if (optind < argc)
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)
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((attr_t) COLOR_PAIR(PAIR_OTHERS));
}
restart:
older[j] = newer[j] = next[j] = 0;
clear();
- drawbox();
+ drawbox(FALSE);
do {
- char buf[30];
+ char buf[40];
time(&now);
tm = localtime(&now);
}
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);
}
/* this depends on the detailed format of ctime(3) */
- (void) strcpy(buf, ctime(&now));
+ (void) strncpy(buf, ctime(&now), 30);
(void) strcpy(buf + 10, buf + 19);
- mvaddstr(16, 30, buf);
+ MvAddStr(16, 30, buf);
move(6, 0);
- drawbox();
+ drawbox(FALSE);
refresh();
/*
goto restart;
case ERR:
if (sigtermed) {
- standend();
+ (void) standend();
endwin();
fprintf(stderr, "gdc terminated by signal %d\n", sigtermed);
ExitProgram(EXIT_FAILURE);
continue;
}
} while (--count);
- standend();
+ (void) standend();
endwin();
ExitProgram(EXIT_SUCCESS);
}
projects / ncurses.git / blobdiff