ncurses 6.0 - patch 20160206

[ncurses.git] / test / ditto.c

diff --git a/test/ditto.c b/test/ditto.c
index 93fbe02805cb91cf1a3c06ca9005ec1550d25a31..627cf84e5ad7e95d5f9bf00aee70cf0ec6a81ffc 100644 (file)
--- 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            *
  *                                                                          *
  * 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)
  *
 /*
  * Author: Thomas E. Dickey (1998-on)
  *

- * $Id: ditto.c,v 1.34 2009/07/17 00:07:25 tom Exp $
+ * $Id: ditto.c,v 1.43 2016/02/06 21:19:28 tom Exp $

  *
  * The program illustrates how to set up multiple screens from a single
  * program.
  *
  * The program illustrates how to set up multiple screens from a single
  * program.


@@ -43,7 +43,6 @@
  */
 #include <test.priv.h>
 #include <sys/stat.h>
  */
 #include <test.priv.h>
 #include <sys/stat.h>

-#include <errno.h>

 
 #ifdef USE_PTHREADS
 #include <pthread.h>
 
 #ifdef USE_PTHREADS
 #include <pthread.h>


@@ -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 */
     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 */
     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;
 
     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)
 {
 static void
 failed(const char *s)
 {


@@ -152,18 +155,21 @@ open_tty(char *path)
     int aslave;
     char slave_name[1024];
     char s_option[sizeof(slave_name) + 80];
     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 (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 (fork()) {
        errno = EISDIR;
        failed(slave_name);
     }
     sprintf(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+");
        _exit(0);
     }
     fp = fdopen(amaster, "r+");


@@ -203,6 +209,7 @@ init_screen(
     scrollok(stdscr, TRUE);
     box(stdscr, 0, 0);
 
     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);
 
     target->windows = typeCalloc(WINDOW *, (size_t) target->length);
     target->peeks = typeCalloc(PEEK, (size_t) target->length);
 


@@ -213,7 +220,7 @@ init_screen(
        WINDOW *inner = derwin(outer, high - 2, wide - 2, 1, 1);
 
        box(outer, 0, 0);
        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);
        wnoutrefresh(outer);
 
        scrollok(inner, TRUE);


@@ -222,6 +229,7 @@ init_screen(
        nodelay(inner, TRUE);
 #endif
 
        nodelay(inner, TRUE);
 #endif
 

+       target->parents[k] = outer;

        target->windows[k] = inner;
     }
     doupdate();
        target->windows[k] = inner;
     }
     doupdate();


@@ -328,6 +336,7 @@ show_ditto(DITTO * data, int count, DDATA * ddata)
 {
     int n;
 
 {
     int n;
 

+    (void) data;

     for (n = 0; n < count; n++) {
        ddata->target = n;
        USING_SCREEN(data[n].screen, write_screen, (void *) ddata);
     for (n = 0; n < count; n++) {
        ddata->target = n;
        USING_SCREEN(data[n].screen, write_screen, (void *) ddata);


@@ -379,10 +388,12 @@ main(int argc, char *argv[])
 
     if (argc <= 1)
        usage();
 
     if (argc <= 1)
        usage();

-    
+

     if ((data = typeCalloc(DITTO, (size_t) argc)) == 0)
        failed("calloc data");
 
     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);
     }
     for (j = 0; j < argc; j++) {
        open_screen(&data[j], argv, argc, j);
     }