X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fditto.c;h=84327c0fcdc54336efa8c2b5abd1a18d64590493;hp=9d1116c279eaa1e8e38802b1b17b4b0402fa72ae;hb=07e31b3b587a07281ff7c71e5c13248a31048257;hpb=4e6cadb948fd73686614442733848fe271e5d7b2 diff --git a/test/ditto.c b/test/ditto.c index 9d1116c2..84327c0f 100644 --- a/test/ditto.c +++ b/test/ditto.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * + * Copyright (c) 1998-2012,2016 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 * @@ -29,7 +29,7 @@ /* * Author: Thomas E. Dickey (1998-on) * - * $Id: ditto.c,v 1.30 2008/06/14 23:00:26 tom Exp $ + * $Id: ditto.c,v 1.44 2016/09/04 20:43:04 tom Exp $ * * The program illustrates how to set up multiple screens from a single * program. @@ -43,7 +43,6 @@ */ #include #include -#include #ifdef USE_PTHREADS #include @@ -81,6 +80,7 @@ typedef struct { int which1; /* this screen's index in DITTO[] array */ int length; /* length of windows[] and peeks[] */ char **titles; /* per-window titles */ + WINDOW **parents; /* display boxes around each screen's data */ WINDOW **windows; /* display data from each screen */ PEEK *peeks; /* indices for each screen's fifo */ FIFO fifo; /* fifo for this screen */ @@ -99,6 +99,9 @@ typedef struct { DITTO *ditto; /* data for all screens */ } DDATA; +static void failed(const char *) GCC_NORETURN; +static void usage(void) GCC_NORETURN; + static void failed(const char *s) { @@ -137,8 +140,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; } @@ -151,21 +154,28 @@ open_tty(char *path) int amaster; int aslave; char slave_name[1024]; - char s_option[1024]; - char *leaf; + char s_option[sizeof(slave_name) + 80]; + const char *xterm_prog = 0; - if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0) + if ((xterm_prog = getenv("XTERM_PROG")) == 0) + xterm_prog = "xterm"; + + if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0 + || strlen(slave_name) > sizeof(slave_name) - 1) failed("openpty"); - if ((leaf = strrchr(slave_name, '/')) == 0) { + if (strrchr(slave_name, '/') == 0) { errno = EISDIR; failed(slave_name); } - sprintf(s_option, "-S%s/%d", slave_name, aslave); + _nc_SPRINTF(s_option, _nc_SLIMIT(sizeof(s_option)) + "-S%s/%d", slave_name, aslave); if (fork()) { - execlp("xterm", "xterm", s_option, "-title", path, (char *) 0); + execlp(xterm_prog, xterm_prog, s_option, "-title", path, (char *) 0); _exit(0); } fp = fdopen(amaster, "r+"); + if (fp == 0) + failed(path); #else struct stat sb; @@ -180,11 +190,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; @@ -195,8 +210,9 @@ init_screen(SCREEN *sp GCC_UNUSED, void *arg) scrollok(stdscr, TRUE); box(stdscr, 0, 0); - target->windows = typeCalloc(WINDOW *, target->length); - target->peeks = typeCalloc(PEEK, target->length); + target->parents = typeCalloc(WINDOW *, (size_t) 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); @@ -205,7 +221,7 @@ init_screen(SCREEN *sp GCC_UNUSED, void *arg) WINDOW *inner = derwin(outer, high - 2, wide - 2, 1, 1); box(outer, 0, 0); - mvwaddstr(outer, 0, 2, target->titles[k]); + MvWAddStr(outer, 0, 2, target->titles[k]); wnoutrefresh(outer); scrollok(inner, TRUE); @@ -214,6 +230,7 @@ init_screen(SCREEN *sp GCC_UNUSED, void *arg) nodelay(inner, TRUE); #endif + target->parents[k] = outer; target->windows[k] = inner; } doupdate(); @@ -233,6 +250,7 @@ open_screen(DITTO * target, char **source, int length, int which1) 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); @@ -244,9 +262,15 @@ open_screen(DITTO * target, char **source, int length, int which1) } 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(); } @@ -255,7 +279,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]); @@ -274,7 +302,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]); @@ -290,7 +322,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); } } @@ -305,6 +337,7 @@ show_ditto(DITTO * data, int count, DDATA * ddata) { int n; + (void) data; for (n = 0; n < count; n++) { ddata->target = n; USING_SCREEN(data[n].screen, write_screen, (void *) ddata); @@ -357,9 +390,11 @@ main(int argc, char *argv[]) if (argc <= 1) usage(); - if ((data = typeCalloc(DITTO, argc)) == 0) + if ((data = typeCalloc(DITTO, (size_t) argc)) == 0) failed("calloc data"); + assert(data != 0); + for (j = 0; j < argc; j++) { open_screen(&data[j], argv, argc, j); }