X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftclock.c;h=96e1d19f6669e21b131be0984078b6f0cfbb99f1;hp=1c047090d22a470ba518bf3f21dd3803dd445112;hb=4b1d778499db088254fdf97fa7dc271c82c36622;hpb=b802d89ac4a8abdc19fd39ec9bdc9a300c3dd181 diff --git a/test/tclock.c b/test/tclock.c index 1c047090..96e1d19f 100644 --- a/test/tclock.c +++ b/test/tclock.c @@ -1,4 +1,4 @@ -/* $Id: tclock.c,v 1.32 2013/09/07 23:12:30 Ray.Donnelly Exp $ */ +/* $Id: tclock.c,v 1.34 2014/08/02 16:37:03 tom Exp $ */ #include @@ -53,14 +53,14 @@ /* Plot a point */ static void -plot(int x, int y, char col) +plot(int x, int y, int col) { MvAddCh(y, x, (chtype) col); } /* Draw a diagonal(arbitrary) line using Bresenham's alogrithm. */ static void -dline(int pair, int from_x, int from_y, int x2, int y2, char ch) +dline(int pair, int from_x, int from_y, int x2, int y2, int ch) { int dx, dy; int ax, ay; @@ -69,7 +69,7 @@ dline(int pair, int from_x, int from_y, int x2, int y2, char ch) int d; if (has_colors()) - (void) attrset((attr_t) COLOR_PAIR(pair)); + (void) attrset(AttrArg(COLOR_PAIR(pair), 0)); dx = x2 - from_x; dy = y2 - from_y; @@ -216,12 +216,12 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) attroff(A_REVERSE); if (has_colors()) - (void) attrset((attr_t) COLOR_PAIR(1)); + (void) attrset(AttrArg(COLOR_PAIR(1), 0)); dline(1, cx, cy, cx + sdx, cy - sdy, 'O'); if (has_colors()) - (void) attrset((attr_t) COLOR_PAIR(0)); + (void) attrset(AttrArg(COLOR_PAIR(0), 0)); text = ctime(&tim); MvPrintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);