X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fditto.c;h=93fbe02805cb91cf1a3c06ca9005ec1550d25a31;hp=4873d0d99ad932ddf2e101c46180723f50257f03;hb=8fc9fa113b27e0749e0840fef04c9d4acad4aae7;hpb=ed530db2c5b10aa19d06104dfe82cf248a813860 diff --git a/test/ditto.c b/test/ditto.c index 4873d0d9..93fbe028 100644 --- a/test/ditto.c +++ b/test/ditto.c @@ -29,7 +29,7 @@ /* * Author: Thomas E. Dickey (1998-on) * - * $Id: ditto.c,v 1.26 2008/04/26 23:42:39 tom Exp $ + * $Id: ditto.c,v 1.34 2009/07/17 00:07:25 tom Exp $ * * The program illustrates how to set up multiple screens from a single * program. @@ -45,6 +45,10 @@ #include #include +#ifdef USE_PTHREADS +#include +#endif + #ifdef USE_XTERM_PTY #include USE_OPENPTY_HEADER #endif @@ -74,11 +78,15 @@ typedef struct { FILE *input; FILE *output; SCREEN *screen; /* this screen - curses internal data */ + int which1; /* this screen's index in DITTO[] array */ int length; /* length of windows[] and peeks[] */ char **titles; /* per-window titles */ WINDOW **windows; /* display data from each screen */ PEEK *peeks; /* indices for each screen's fifo */ FIFO fifo; /* fifo for this screen */ +#ifdef USE_PTHREADS + pthread_t thread; +#endif } DITTO; /* @@ -129,8 +137,8 @@ peek_fifo(FIFO * fifo, PEEK * peek) { int result = -1; if (peek->sequence < fifo->sequence) { - peek->sequence += 1; result = fifo->data[THIS_FIFO(peek->sequence)]; + peek->sequence += 1; } return result; } @@ -143,10 +151,11 @@ open_tty(char *path) int amaster; int aslave; char slave_name[1024]; - char s_option[1024]; + char s_option[sizeof(slave_name) + 80]; char *leaf; - if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0) + if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0 + || strlen(slave_name) > sizeof(slave_name) - 1) failed("openpty"); if ((leaf = strrchr(slave_name, '/')) == 0) { errno = EISDIR; @@ -158,6 +167,8 @@ open_tty(char *path) _exit(0); } fp = fdopen(amaster, "r+"); + if (fp == 0) + failed(path); #else struct stat sb; @@ -172,11 +183,16 @@ open_tty(char *path) failed(path); printf("opened %s\n", path); #endif + assert(fp != 0); return fp; } static void -init_screen(SCREEN *sp GCC_UNUSED, void *arg) +init_screen( +#if HAVE_USE_WINDOW + SCREEN *sp GCC_UNUSED, +#endif + void *arg) { DITTO *target = (DITTO *) arg; int high, wide; @@ -185,11 +201,10 @@ init_screen(SCREEN *sp GCC_UNUSED, void *arg) cbreak(); noecho(); scrollok(stdscr, TRUE); - nodelay(stdscr, TRUE); box(stdscr, 0, 0); - target->windows = typeCalloc(WINDOW *, target->length); - target->peeks = typeCalloc(PEEK, target->length); + target->windows = typeCalloc(WINDOW *, (size_t) target->length); + target->peeks = typeCalloc(PEEK, (size_t) target->length); high = (LINES - 2) / target->length; wide = (COLS - 2); @@ -202,8 +217,10 @@ init_screen(SCREEN *sp GCC_UNUSED, void *arg) wnoutrefresh(outer); scrollok(inner, TRUE); - nodelay(inner, TRUE); keypad(inner, TRUE); +#ifndef USE_PTHREADS + nodelay(inner, TRUE); +#endif target->windows[k] = inner; } @@ -211,18 +228,20 @@ init_screen(SCREEN *sp GCC_UNUSED, void *arg) } static void -open_screen(DITTO * target, char **source, int length, int which) +open_screen(DITTO * target, char **source, int length, int which1) { - if (which != 0) { + if (which1 != 0) { target->input = - target->output = open_tty(source[which]); + target->output = open_tty(source[which1]); } else { target->input = stdin; target->output = stdout; } + target->which1 = which1; target->titles = source; target->length = length; + target->fifo.head = -1; target->screen = newterm((char *) 0, /* assume $TERM is the same */ target->output, target->input); @@ -234,9 +253,15 @@ open_screen(DITTO * target, char **source, int length, int which) } static int -close_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED) +close_screen( +#if HAVE_USE_WINDOW + SCREEN *sp GCC_UNUSED, +#endif + void *arg GCC_UNUSED) { +#if HAVE_USE_WINDOW (void) sp; +#endif (void) arg; return endwin(); } @@ -245,7 +270,11 @@ close_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED) * Read data from the 'source' screen. */ static int -read_screen(SCREEN *sp GCC_UNUSED, void *arg) +read_screen( +#if HAVE_USE_WINDOW + SCREEN *sp GCC_UNUSED, +#endif + void *arg) { DDATA *data = (DDATA *) arg; DITTO *ditto = &(data->ditto[data->source]); @@ -264,7 +293,11 @@ read_screen(SCREEN *sp GCC_UNUSED, void *arg) * Write all of the data that's in fifos for the 'target' screen. */ static int -write_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED) +write_screen( +#if HAVE_USE_WINDOW + SCREEN *sp GCC_UNUSED, +#endif + void *arg GCC_UNUSED) { DDATA *data = (DDATA *) arg; DITTO *ditto = &(data->ditto[data->target]); @@ -280,7 +313,7 @@ write_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED) while ((ch = peek_fifo(fifo, peek)) > 0) { changed = TRUE; - waddch(win, ch); + waddch(win, (chtype) ch); wnoutrefresh(win); } } @@ -301,24 +334,70 @@ show_ditto(DITTO * data, int count, DDATA * ddata) } } +#ifdef USE_PTHREADS +static void * +handle_screen(void *arg) +{ + DDATA ddata; + int ch; + + memset(&ddata, 0, sizeof(ddata)); + ddata.ditto = (DITTO *) arg; + ddata.source = ddata.ditto->which1; + ddata.ditto -= ddata.source; /* -> base of array */ + + for (;;) { + ch = read_screen(ddata.ditto->screen, &ddata); + if (ch == CTRL('D')) { + int later = (ddata.source ? ddata.source : -1); + int j; + + for (j = ddata.ditto->length - 1; j > 0; --j) { + if (j != later) { + pthread_cancel(ddata.ditto[j].thread); + } + } + if (later > 0) { + pthread_cancel(ddata.ditto[later].thread); + } + break; + } + show_ditto(ddata.ditto, ddata.ditto->length, &ddata); + } + return NULL; +} +#endif + int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int j; - int count; DITTO *data; +#ifndef USE_PTHREADS + int count; +#endif if (argc <= 1) usage(); - - if ((data = typeCalloc(DITTO, argc)) == 0) + + if ((data = typeCalloc(DITTO, (size_t) argc)) == 0) failed("calloc data"); for (j = 0; j < argc; j++) { open_screen(&data[j], argv, argc, j); } +#ifdef USE_PTHREADS + /* + * For multi-threaded operation, set up a reader for each of the screens. + * That uses blocking I/O rather than polling for input, so no calls to + * napms() are needed. + */ + for (j = 0; j < argc; j++) { + (void) pthread_create(&(data[j].thread), NULL, handle_screen, &data[j]); + } + pthread_join(data[1].thread, NULL); +#else /* * Loop, reading characters from any of the inputs and writing to all * of the screens. @@ -340,6 +419,7 @@ main(int argc GCC_UNUSED, show_ditto(data, argc, &ddata); } } +#endif /* * Cleanup and exit