ncurses 6.2 - patch 20200627

[ncurses.git] / test / ditto.c

diff --git a/test/ditto.c b/test/ditto.c
index b8aebac93c5678f28f94604b4354e52006bfe3c4..a5cec3305646a30ebb32c866c8812aabbbc45e07 100644 (file)
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright 2018,2020 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.32 2008/08/04 13:21:41 tom Exp $
+ * $Id: ditto.c,v 1.49 2020/02/02 23:34:34 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.
@@ -43,7 +44,8 @@
  */
 #include <test.priv.h>
 #include <sys/stat.h>
-#include <errno.h>
+
+#if HAVE_DELSCREEN
 
 #ifdef USE_PTHREADS
 #include <pthread.h>
@@ -81,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 */
@@ -99,6 +102,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)
 {
@@ -109,7 +115,7 @@ failed(const char *s)
 static void
 usage(void)
 {
-    fprintf(stderr, "usage: ditto [terminal1 ...]\n");
+    fprintf(stderr, "Usage: ditto [terminal1 ...]\n");
     ExitProgram(EXIT_FAILURE);
 }
 
@@ -137,8 +143,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;
 }
@@ -152,18 +158,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);
+    _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+");
@@ -187,8 +197,12 @@ open_tty(char *path)
     return fp;
 }
 
-static void
-init_screen(SCREEN *sp GCC_UNUSED, void *arg)
+static int
+init_screen(
+#if HAVE_USE_WINDOW
+              SCREEN *sp GCC_UNUSED,
+#endif
+              void *arg)
 {
     DITTO *target = (DITTO *) arg;
     int high, wide;
@@ -199,6 +213,7 @@ init_screen(SCREEN *sp GCC_UNUSED, void *arg)
     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);
 
@@ -209,7 +224,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);
@@ -218,9 +233,11 @@ init_screen(SCREEN *sp GCC_UNUSED, void *arg)
        nodelay(inner, TRUE);
 #endif
 
+       target->parents[k] = outer;
        target->windows[k] = inner;
     }
     doupdate();
+    return TRUE;
 }
 
 static void
@@ -237,6 +254,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);
@@ -248,9 +266,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();
 }
@@ -259,7 +283,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]);
@@ -278,7 +306,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]);
@@ -309,6 +341,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);
@@ -364,6 +397,8 @@ main(int argc, char *argv[])
     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);
     }
@@ -419,3 +454,11 @@ main(int argc, char *argv[])
     }
     ExitProgram(EXIT_SUCCESS);
 }
+#else
+int
+main(void)
+{
+    printf("This program requires the curses delscreen function\n");
+    ExitProgram(EXIT_FAILURE);
+}
+#endif