X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Fditto.c;h=06b635536dfefecd40a5811b6d35ca5702cc0632;hb=6641601a9dd7f34deeaa978899b3730b27635afb;hp=6e559261857bca5c75ee979e73c43ab685270346;hpb=41068edef084c39be0cecdf949d9b538d925f42c;p=ncurses.git diff --git a/test/ditto.c b/test/ditto.c index 6e559261..06b63553 100644 --- a/test/ditto.c +++ b/test/ditto.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 1998-2016,2017 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 +30,7 @@ /* * Author: Thomas E. Dickey (1998-on) * - * $Id: ditto.c,v 1.36 2010/01/30 23:39:09 tom Exp $ + * $Id: ditto.c,v 1.55 2022/12/04 00:40:55 tom Exp $ * * The program illustrates how to set up multiple screens from a single * program. @@ -44,6 +45,8 @@ #include #include +#if HAVE_DELSCREEN + #ifdef USE_PTHREADS #include #endif @@ -52,10 +55,6 @@ #include USE_OPENPTY_HEADER #endif -#ifdef HAVE_VFORK_H -#include -#endif - #define MAX_FIFO 256 #define THIS_FIFO(n) ((n) % MAX_FIFO) @@ -84,6 +83,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 */ @@ -109,13 +109,6 @@ failed(const char *s) ExitProgram(EXIT_FAILURE); } -static void -usage(void) -{ - fprintf(stderr, "usage: ditto [terminal1 ...]\n"); - ExitProgram(EXIT_FAILURE); -} - /* Add to the head of the fifo, checking for overflow. */ static void put_fifo(FIFO * fifo, int value) @@ -155,18 +148,22 @@ open_tty(char *path) int aslave; char slave_name[1024]; char s_option[sizeof(slave_name) + 80]; - char *leaf; + const char *xterm_prog = 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); - if (vfork()) { - execlp("xterm", "xterm", s_option, "-title", path, (char *) 0); + _nc_SPRINTF(s_option, _nc_SLIMIT(sizeof(s_option)) + "-S%s/%d", slave_name, aslave); + if (fork()) { + execlp(xterm_prog, xterm_prog, s_option, "-title", path, (char *) 0); _exit(0); } fp = fdopen(amaster, "r+"); @@ -175,7 +172,7 @@ open_tty(char *path) #else struct stat sb; - if (stat(path, &sb) < 0) + if (stat(path, &sb) == -1) failed(path); if ((sb.st_mode & S_IFMT) != S_IFCHR) { errno = ENOTTY; @@ -190,7 +187,7 @@ open_tty(char *path) return fp; } -static void +static int init_screen( #if HAVE_USE_WINDOW SCREEN *sp GCC_UNUSED, @@ -206,6 +203,7 @@ init_screen( scrollok(stdscr, TRUE); box(stdscr, 0, 0); + target->parents = typeCalloc(WINDOW *, (size_t) target->length); target->windows = typeCalloc(WINDOW *, (size_t) target->length); target->peeks = typeCalloc(PEEK, (size_t) target->length); @@ -216,7 +214,7 @@ init_screen( 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); @@ -225,9 +223,11 @@ init_screen( nodelay(inner, TRUE); #endif + target->parents[k] = outer; target->windows[k] = inner; } doupdate(); + return TRUE; } static void @@ -331,6 +331,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); @@ -342,7 +343,6 @@ static void * handle_screen(void *arg) { DDATA ddata; - int ch; memset(&ddata, 0, sizeof(ddata)); ddata.ditto = (DITTO *) arg; @@ -350,7 +350,7 @@ handle_screen(void *arg) ddata.ditto -= ddata.source; /* -> base of array */ for (;;) { - ch = read_screen(ddata.ditto->screen, &ddata); + int ch = read_screen(ddata.ditto->screen, &ddata); if (ch == CTRL('D')) { int later = (ddata.source ? ddata.source : -1); int j; @@ -371,73 +371,111 @@ handle_screen(void *arg) } #endif -int -main(int argc, char *argv[]) +static void +usage(int ok) { - int j; - DITTO *data; + static const char *msg[] = + { + "Usage: ditto [terminal [terminal2 ...]]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +/* *INDENT-OFF* */} +VERSION_COMMON() +/* *INDENT-ON* */ + + int + main(int argc, char *argv[]) { + int j; + int ch; + DITTO *data; #ifndef USE_PTHREADS - int count; + int count; #endif - if (argc <= 1) - usage(); + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } if (optind < argc) + usage(FALSE); - if ((data = typeCalloc(DITTO, (size_t) argc)) == 0) - failed("calloc data"); + if ((data = typeCalloc(DITTO, (size_t) argc)) == 0) + failed("calloc data"); - for (j = 0; j < argc; j++) { - open_screen(&data[j], argv, argc, j); - } + assert(data != 0); + + 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); + /* + * 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. - */ - for (count = 0;; ++count) { - DDATA ddata; - int ch; - int which = (count % argc); + /* + * Loop, reading characters from any of the inputs and writing to all + * of the screens. + */ + for (count = 0;; ++count) { + DDATA ddata; + int which = (count % argc); - napms(20); + napms(20); - ddata.source = which; - ddata.ditto = data; + ddata.source = which; + ddata.ditto = data; - ch = USING_SCREEN(data[which].screen, read_screen, &ddata); - if (ch == CTRL('D')) { - break; - } else if (ch != ERR) { - show_ditto(data, argc, &ddata); + ch = USING_SCREEN(data[which].screen, read_screen, &ddata); + if (ch == CTRL('D')) { + break; + } else if (ch != ERR) { + show_ditto(data, argc, &ddata); + } } - } #endif - /* - * Cleanup and exit - */ - for (j = argc - 1; j >= 0; j--) { - USING_SCREEN(data[j].screen, close_screen, 0); - fprintf(data[j].output, "**Closed\r\n"); - /* - * Closing before a delscreen() helps ncurses determine that there - * is no valid output buffer, and can remove the setbuf() data. + * Cleanup and exit */ - fflush(data[j].output); - fclose(data[j].output); - delscreen(data[j].screen); + for (j = argc - 1; j >= 0; j--) { + USING_SCREEN(data[j].screen, close_screen, 0); + fprintf(data[j].output, "**Closed\r\n"); + + /* + * Closing before a delscreen() helps ncurses determine that there + * is no valid output buffer, and can remove the setbuf() data. + */ + fflush(data[j].output); + fclose(data[j].output); + delscreen(data[j].screen); + } + ExitProgram(EXIT_SUCCESS); } - ExitProgram(EXIT_SUCCESS); +#else +int +main(void) +{ + printf("This program requires the curses delscreen function\n"); + ExitProgram(EXIT_FAILURE); } +#endif