X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fnewdemo.c;h=20b26d024e4ae32e38de030572ce86c4fda6cf78;hp=21a8f64f0bd17acda1e8a34e66855c9968665530;hb=22a4b929f47f85588dc07fddf98b09776cec658f;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8 diff --git a/test/newdemo.c b/test/newdemo.c index 21a8f64f..20b26d02 100644 --- a/test/newdemo.c +++ b/test/newdemo.c @@ -2,19 +2,17 @@ * newdemo.c - A demo program using PDCurses. The program illustrate * the use of colours for text output. * - * $Id: newdemo.c,v 1.27 2005/05/28 21:40:00 tom Exp $ + * $Id: newdemo.c,v 1.45 2017/09/30 15:43:08 tom Exp $ */ #include #include -#define delay_output(x) napms(x) - /* * The Australian map */ -static const char *AusMap[16] = +static CONST_MENUS char *AusMap[16] = { " A A ", " N.T. AAAAA AAAA ", @@ -35,7 +33,7 @@ static const char *AusMap[16] = */ #define NMESSAGES 6 -static NCURSES_CONST char *messages[] = +static const char *messages[] = { "Hello from the Land Down Under", "The Land of crocs. and a big Red Rock", @@ -49,10 +47,10 @@ static NCURSES_CONST char *messages[] = /* * Trap interrupt */ -static RETSIGTYPE +static void trap(int sig GCC_UNUSED) { - endwin(); + exit_curses(); ExitProgram(EXIT_FAILURE); } @@ -68,7 +66,7 @@ WaitForUser(WINDOW *win) nodelay(win, TRUE); t = time((time_t *) 0); while (1) { - if ((int) (key = wgetch(win)) != ERR) { + if ((int) (key = (chtype) wgetch(win)) != ERR) { if (key == 'q' || key == 'Q') return 1; else @@ -85,8 +83,8 @@ set_colors(WINDOW *win, int pair, int foreground, int background) if (has_colors()) { if (pair > COLOR_PAIRS) pair = COLOR_PAIRS; - init_pair(pair, foreground, background); - wattrset(win, COLOR_PAIR(pair)); + init_pair((short) pair, (short) foreground, (short) background); + (void) wattrset(win, AttrArg(COLOR_PAIR(pair), 0)); } } @@ -96,9 +94,9 @@ use_colors(WINDOW *win, int pair, chtype attrs) if (has_colors()) { if (pair > COLOR_PAIRS) pair = COLOR_PAIRS; - attrs |= COLOR_PAIR(pair); + attrs |= (chtype) COLOR_PAIR(pair); } - wattrset(win, attrs); + (void) wattrset(win, AttrArg(attrs, 0)); return attrs; } @@ -115,26 +113,33 @@ SubWinTest(WINDOW *win) getbegyx(win, by, bx); sw = w / 3; sh = h / 3; - if ((swin1 = subwin(win, sh, sw, by + 3, bx + 5)) == NULL) + + if ((swin1 = subwin(win, sh, sw, by + 3, bx + 5)) == NULL) { return 1; - if ((swin2 = subwin(win, sh, sw, by + 4, bx + 8)) == NULL) + } + if ((swin2 = subwin(win, sh, sw, by + 4, bx + 8)) == NULL) { + delwin(swin1); return 1; - if ((swin3 = subwin(win, sh, sw, by + 5, bx + 11)) == NULL) + } + if ((swin3 = subwin(win, sh, sw, by + 5, bx + 11)) == NULL) { + delwin(swin1); + delwin(swin2); return 1; + } set_colors(swin1, 8, COLOR_RED, COLOR_BLUE); werase(swin1); - mvwaddstr(swin1, 0, 3, "Sub-window 1"); + MvWAddStr(swin1, 0, 3, "Sub-window 1"); wrefresh(swin1); set_colors(swin2, 9, COLOR_CYAN, COLOR_MAGENTA); werase(swin2); - mvwaddstr(swin2, 0, 3, "Sub-window 2"); + MvWAddStr(swin2, 0, 3, "Sub-window 2"); wrefresh(swin2); set_colors(swin3, 10, COLOR_YELLOW, COLOR_GREEN); werase(swin3); - mvwaddstr(swin3, 0, 3, "Sub-window 3"); + MvWAddStr(swin3, 0, 3, "Sub-window 3"); wrefresh(swin3); delwin(swin1); @@ -194,13 +199,13 @@ BouncingBalls(WINDOW *win) y3 = bounce(y3, &yd3, h); set_colors(win, 11, COLOR_RED, COLOR_BLUE); - mvwaddch(win, y1, x1, 'O'); + MvWAddCh(win, y1, x1, 'O'); set_colors(win, 12, COLOR_BLUE, COLOR_RED); - mvwaddch(win, y2, x2, '*'); + MvWAddCh(win, y2, x2, '*'); set_colors(win, 13, COLOR_YELLOW, COLOR_WHITE); - mvwaddch(win, y3, x3, '@'); + MvWAddCh(win, y3, x3, '@'); wmove(win, 0, 0); wrefresh(win); @@ -217,7 +222,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) { WINDOW *win; int w, x, y, i, j, k; - char buffer[200]; + char buffer[SIZEOF(messages) * 80]; const char *message; int width, height; chtype save[80]; @@ -225,17 +230,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) setlocale(LC_ALL, ""); - initscr(); + InitAndCatch(initscr(), trap); if (has_colors()) start_color(); cbreak(); curs_set(0); - signal(SIGINT, trap); width = 48; height = 14; /* Create a drawing window */ win = newwin(height, width, (LINES - height) / 2, (COLS - width) / 2); if (win == NULL) { - endwin(); + exit_curses(); ExitProgram(EXIT_FAILURE); } @@ -252,7 +256,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) for (i = 0; i < 5000; ++i) { x = rand() % (width - 2) + 1; y = rand() % (height - 2) + 1; - mvwaddch(win, y, x, c); + MvWAddCh(win, y, x, c); wrefresh(win); nodelay(win, TRUE); if (wgetch(win) != ERR) @@ -277,7 +281,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) use_colors(win, 4, A_BOLD); i = 0; while (*AusMap[i]) { - mvwaddstr(win, i + 1, 8, AusMap[i]); + MvWAddStr(win, i + 1, 8, AusMap[i]); wrefresh(win); delay_output(50); ++i; @@ -285,7 +289,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) set_colors(win, 5, COLOR_BLUE, COLOR_WHITE); use_colors(win, 5, A_BLINK); - mvwaddstr(win, height - 2, 6, " PDCurses 2.1 for DOS, OS/2 and Unix"); + MvWAddStr(win, height - 2, 6, " PDCurses 2.1 for DOS, OS/2 and Unix"); wrefresh(win); /* Draw running messages */ @@ -293,17 +297,17 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) message = messages[j = 0]; i = 1; w = width - 2; - strcpy(buffer, message); + _nc_STRCPY(buffer, message, sizeof(buffer)); while (j < NMESSAGES) { while ((int) strlen(buffer) < w) { - strcat(buffer, " ... "); - strcat(buffer, messages[++j % NMESSAGES]); + _nc_STRCAT(buffer, " ... ", sizeof(buffer)); + _nc_STRCAT(buffer, messages[++j % NMESSAGES], sizeof(buffer)); } if (i < w) - mvwaddnstr(win, height / 2, w - i, buffer, i); + (void) mvwaddnstr(win, height / 2, w - i, buffer, i); else - mvwaddnstr(win, height / 2, 1, buffer, w); + (void) mvwaddnstr(win, height / 2, 1, buffer, w); wrefresh(win); nodelay(win, TRUE); @@ -320,20 +324,21 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) j = 0; /* Draw running As across in RED */ set_colors(win, 7, COLOR_RED, COLOR_GREEN); + memset(save, ' ', sizeof(save)); for (i = 2; i < width - 4; ++i) { - k = mvwinch(win, 4, i); + k = (int) mvwinch(win, 4, i); if (k == ERR) break; - save[j++] = c = k; + save[j++] = c = (chtype) k; c &= A_CHARTEXT; - mvwaddch(win, 4, i, c); + MvWAddCh(win, 4, i, c); } wrefresh(win); /* Put a message up wait for a key */ i = height - 2; use_colors(win, 5, A_NORMAL); - mvwaddstr(win, i, 5, " Type a key to continue or 'Q' to quit "); + MvWAddStr(win, i, 5, " Type a key to continue or 'Q' to quit "); wrefresh(win); if (WaitForUser(win) == 1) @@ -341,18 +346,18 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) j = 0; /* Restore the old line */ for (i = 2; i < width - 4; ++i) - mvwaddch(win, 4, i, save[j++]); + MvWAddCh(win, 4, i, save[j++]); wrefresh(win); BouncingBalls(win); /* Put a message up wait for a key */ i = height - 2; use_colors(win, 5, A_NORMAL); - mvwaddstr(win, i, 5, " Type a key to continue or 'Q' to quit "); + MvWAddStr(win, i, 5, " Type a key to continue or 'Q' to quit "); wrefresh(win); if (WaitForUser(win) == 1) break; } - endwin(); + exit_curses(); ExitProgram(EXIT_SUCCESS); }