X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Fditto.c;h=acac8377aad7d2e76edb696017efe18605a1c768;hb=HEAD;hp=a0e01f25e778e86f602bac5661e4b88e1a49d4e2;hpb=92e187a3459ab7ce1613a3684ca6642447c73620;p=ncurses.git diff --git a/test/ditto.c b/test/ditto.c index a0e01f25..acac8377 100644 --- a/test/ditto.c +++ b/test/ditto.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright 2018-2022,2023 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.38 2010/05/01 22:08:03 tom Exp $ + * $Id: ditto.c,v 1.59 2023/09/23 17:08:43 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 */ @@ -92,6 +92,15 @@ typedef struct { #endif } DITTO; +#ifdef USE_PTHREADS +#define LockIt() pthread_mutex_lock(&pending_mutex) +#define UnlockIt() pthread_mutex_unlock(&pending_mutex) +pthread_mutex_t pending_mutex; +#else +#define LockIt() /* nothing */ +#define UnlockIt() /* nothing */ +#endif + /* * Structure used to pass multiple parameters via the use_screen() * single-parameter interface. @@ -109,13 +118,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,6 +157,10 @@ open_tty(char *path) int aslave; char slave_name[1024]; char s_option[sizeof(slave_name) + 80]; + 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) @@ -163,9 +169,10 @@ open_tty(char *path) 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+"); @@ -174,7 +181,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; @@ -189,7 +196,7 @@ open_tty(char *path) return fp; } -static void +static int init_screen( #if HAVE_USE_WINDOW SCREEN *sp GCC_UNUSED, @@ -205,6 +212,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); @@ -224,9 +232,19 @@ init_screen( nodelay(inner, TRUE); #endif + target->parents[k] = outer; target->windows[k] = inner; } doupdate(); + return TRUE; +} + +static void +free_screen(DITTO * target) +{ + free(target->parents); + free(target->windows); + free(target->peeks); } static void @@ -330,6 +348,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); @@ -341,7 +360,6 @@ static void * handle_screen(void *arg) { DDATA ddata; - int ch; memset(&ddata, 0, sizeof(ddata)); ddata.ditto = (DITTO *) arg; @@ -349,7 +367,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; @@ -370,17 +388,46 @@ handle_screen(void *arg) } #endif +static void +usage(int ok) +{ + 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; #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 ((data = typeCalloc(DITTO, (size_t) argc)) == 0) failed("calloc data"); @@ -392,13 +439,15 @@ main(int argc, char *argv[]) } #ifdef USE_PTHREADS + pthread_mutex_init(&pending_mutex, 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]); + (void) pthread_create(&(data[j].thread), NULL, handle_screen, + &data[j]); } pthread_join(data[1].thread, NULL); #else @@ -408,7 +457,6 @@ main(int argc, char *argv[]) */ for (count = 0;; ++count) { DDATA ddata; - int ch; int which = (count % argc); napms(20); @@ -429,6 +477,7 @@ main(int argc, char *argv[]) * Cleanup and exit */ for (j = argc - 1; j >= 0; j--) { + LockIt(); USING_SCREEN(data[j].screen, close_screen, 0); fprintf(data[j].output, "**Closed\r\n"); @@ -439,6 +488,17 @@ main(int argc, char *argv[]) fflush(data[j].output); fclose(data[j].output); delscreen(data[j].screen); + free_screen(&data[j]); + UnlockIt(); } + free(data); ExitProgram(EXIT_SUCCESS); } +#else +int +main(void) +{ + printf("This program requires the curses delscreen function\n"); + ExitProgram(EXIT_FAILURE); +} +#endif