X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fworm.c;h=23b0ef4ae85c70792dae3b0ee12d7298942bbba5;hp=61d97a9a404e866a774ee2671b23803d33de9b3a;hb=b779f5fb4516b3e6d1bc8880ea68923efb761e1d;hpb=e0371a7943009d611a4dc080dcddfcdfba9f589b;ds=sidebyside diff --git a/test/worm.c b/test/worm.c index 61d97a9a..23b0ef4a 100644 --- a/test/worm.c +++ b/test/worm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * + * 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 * @@ -61,7 +61,7 @@ Options: traces will be dumped. The program stops and waits for one character of input at the beginning and end of the interval. - $Id: worm.c,v 1.50 2007/12/22 23:55:13 tom Exp $ + $Id: worm.c,v 1.55 2008/01/26 22:07:57 tom Exp $ */ #include @@ -70,6 +70,11 @@ Options: #include #endif +WANT_USE_WINDOW(); + +#define MAX_WORMS 40 +#define MAX_LENGTH 1024 + static chtype flavor[] = { 'O', '*', '#', '$', '%', '0', '@', @@ -93,10 +98,12 @@ typedef struct worm { #endif } WORM; +static unsigned long sequence = 0; static bool quitting = FALSE; -static WORM worm[40]; +static WORM worm[MAX_WORMS]; static short **refs; +static int last_x, last_y; static const char *field; static int length = 16, number = 3; @@ -196,8 +203,7 @@ static const struct options { static void cleanup(void) { - standend(); - refresh(); + USING_WINDOW(stdscr, wrefresh); curs_set(1); endwin(); } @@ -226,23 +232,20 @@ draw_worm(WINDOW *win, void *data) int y; int h; - int bottom = LINES - 1; - int last = COLS - 1; - bool done = FALSE; if ((x = w->xpos[h = w->head]) < 0) { - wmove(win, y = w->ypos[h] = bottom, x = w->xpos[h] = 0); + wmove(win, y = w->ypos[h] = last_y, x = w->xpos[h] = 0); waddch(win, w->attrs); refs[y][x]++; } else { y = w->ypos[h]; } - if (x > last) - x = last; - if (y > bottom) - y = bottom; + if (x > last_x) + x = last_x; + if (y > last_y) + y = last_y; if (++h == length) h = 0; @@ -262,18 +265,18 @@ draw_worm(WINDOW *win, void *data) op = &(x == 0 ? (y == 0 ? upleft - : (y == bottom + : (y == last_y ? lowleft : left)) - : (x == last + : (x == last_x ? (y == 0 ? upright - : (y == bottom + : (y == last_y ? lowright : right)) : (y == 0 ? upper - : (y == bottom + : (y == last_y ? lower : normal))))[w->orientation]; @@ -306,27 +309,23 @@ draw_worm(WINDOW *win, void *data) return done; } -#if !defined(NCURSES_VERSION_PATCH) || (NCURSES_VERSION_PATCH < 20070915) -static int -use_window(WINDOW *win, int (*func) (WINDOW *, void *), void *data) -{ - return func(win, data); -} -#endif - #ifdef USE_PTHREADS static bool quit_worm(void) { - napms(20); /* let the other thread(s) have a chance */ + napms(10); /* let the other thread(s) have a chance */ return quitting; } static void * start_worm(void *arg) { + unsigned long compare = 0; while (!quit_worm()) { - use_window(stdscr, draw_worm, arg); + while (compare < sequence) { + ++compare; + use_window(stdscr, draw_worm, arg); + } } return NULL; } @@ -357,6 +356,44 @@ draw_all_worms(void) return done; } +static int +get_input(void) +{ + int ch; + ch = USING_WINDOW(stdscr, wgetch); + return ch; +} + +#ifdef KEY_RESIZE +static int +update_refs(WINDOW *win) +{ + int x, y; + + (void) win; + if (last_x != COLS - 1) { + for (y = 0; y <= last_y; y++) { + refs[y] = typeRealloc(short, COLS, refs[y]); + for (x = last_x + 1; x < COLS; x++) + refs[y][x] = 0; + } + last_x = COLS - 1; + } + if (last_y != LINES - 1) { + for (y = LINES; y <= last_y; y++) + free(refs[y]); + refs = typeRealloc(short *, LINES, refs); + for (y = last_y + 1; y < LINES; y++) { + refs[y] = typeMalloc(short, COLS); + for (x = 0; x < COLS; x++) + refs[y][x] = 0; + } + last_y = LINES - 1; + } + return OK; +} +#endif + int main(int argc, char *argv[]) { @@ -364,7 +401,6 @@ main(int argc, char *argv[]) int n; struct worm *w; short *ip; - int last, bottom; bool done = FALSE; setlocale(LC_ALL, ""); @@ -381,7 +417,7 @@ main(int argc, char *argv[]) case 'l': if (++x == argc) goto usage; - if ((length = atoi(argv[x])) < 2 || length > 1024) { + if ((length = atoi(argv[x])) < 2 || length > MAX_LENGTH) { fprintf(stderr, "%s: Invalid length\n", *argv); ExitProgram(EXIT_FAILURE); } @@ -389,7 +425,7 @@ main(int argc, char *argv[]) case 'n': if (++x == argc) goto usage; - if ((number = atoi(argv[x])) < 1 || number > 40) { + if ((number = atoi(argv[x])) < 1 || number > MAX_WORMS) { fprintf(stderr, "%s: Invalid number of worms\n", *argv); ExitProgram(EXIT_FAILURE); } @@ -422,8 +458,8 @@ main(int argc, char *argv[]) curs_set(0); - bottom = LINES - 1; - last = COLS - 1; + last_y = LINES - 1; + last_x = COLS - 1; #ifdef A_COLOR if (has_colors()) { @@ -458,7 +494,7 @@ main(int argc, char *argv[]) #ifdef BADCORNER /* if addressing the lower right corner doesn't work in your curses */ - refs[bottom][last] = 1; + refs[last_y][last_x] = 1; #endif /* BADCORNER */ for (n = number, w = &worm[0]; --n >= 0; w++) { @@ -484,7 +520,7 @@ main(int argc, char *argv[]) if (field) { const char *p; p = field; - for (y = bottom; --y >= 0;) { + for (y = last_y; --y >= 0;) { for (x = COLS; --x >= 0;) { addch((chtype) (*p++)); if (!*p) @@ -492,50 +528,34 @@ main(int argc, char *argv[]) } } } - napms(10); - refresh(); + USING_WINDOW(stdscr, wrefresh); nodelay(stdscr, TRUE); while (!done) { int ch; - if ((ch = getch()) > 0) { + ++sequence; + if ((ch = get_input()) > 0) { #ifdef TRACE if (trace_start || trace_end) { if (generation == trace_start) { trace(TRACE_CALLS); - getch(); + get_input(); } else if (generation == trace_end) { trace(0); - getch(); + get_input(); } generation++; } #endif + #ifdef KEY_RESIZE if (ch == KEY_RESIZE) { - if (last != COLS - 1) { - for (y = 0; y <= bottom; y++) { - refs[y] = typeRealloc(short, COLS, refs[y]); - for (x = last + 1; x < COLS; x++) - refs[y][x] = 0; - } - last = COLS - 1; - } - if (bottom != LINES - 1) { - for (y = LINES; y <= bottom; y++) - free(refs[y]); - refs = typeRealloc(short *, LINES, refs); - for (y = bottom + 1; y < LINES; y++) { - refs[y] = typeMalloc(short, COLS); - for (x = 0; x < COLS; x++) - refs[y][x] = 0; - } - bottom = LINES - 1; - } + USING_WINDOW(stdscr, update_refs); } #endif + /* * Make it simple to put this into single-step mode, or resume * normal operation -T.Dickey @@ -553,7 +573,7 @@ main(int argc, char *argv[]) done = draw_all_worms(); napms(10); - refresh(); + USING_WINDOW(stdscr, wrefresh); } cleanup();