X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fditto.c;h=34ef6a532e5c1928c67e2f0a6c0e98ddc6671962;hp=96677b99a8519434661158ea7c4c50fbbeda2085;hb=396a05943b7da5039dd15d79c4385c7d2a75d6d4;hpb=f7b8e526e024ce141e61633e966255400de67772

diff --git a/test/ditto.c b/test/ditto.c
index 96677b99..34ef6a53 100644
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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 <dickey@clark.net> 1998
  *
- * $Id: ditto.c,v 1.8 2007/09/01 21:10:38 tom Exp $
+ * $Id: ditto.c,v 1.19 2008/04/12 23:37:32 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.  Invoke the program by specifying another terminal on the same
@@ -40,6 +40,10 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#ifdef USE_XTERM_PTY
+#include USE_OPENPTY_HEADER
+#endif
+
 typedef struct {
     FILE *input;
     FILE *output;
@@ -64,6 +68,26 @@ static FILE *
 open_tty(char *path)
 {
     FILE *fp;
+#ifdef USE_XTERM_PTY
+    int amaster;
+    int aslave;
+    char slave_name[1024];
+    char s_option[1024];
+    char *leaf;
+
+    if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0)
+	failed("openpty");
+    if ((leaf = strrchr(slave_name, '/')) == 0) {
+	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);
+	_exit(0);
+    }
+    fp = fdopen(amaster, "r+");
+#else
     struct stat sb;
 
     if (stat(path, &sb) < 0)
@@ -76,20 +100,40 @@ open_tty(char *path)
     if (fp == 0)
 	failed(path);
     printf("opened %s\n", path);
+#endif
     return fp;
 }
 
+static int
+close_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED)
+{
+    (void) sp;
+    (void) arg;
+    return endwin();
+}
+
+static int
+read_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED)
+{
+    return getch();
+}
+
+static int
+write_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED)
+{
+    addstr((char *) arg);
+    refresh();
+    return OK;
+}
+
 static void
-show_ditto(DITTO * data, int count, int which, int ch)
+show_ditto(DITTO * data, int count, char *msg)
 {
     int n;
 
     for (n = 0; n < count; n++) {
-	set_term(data[n].screen);
-	addch(UChar(ch));
-	refresh();
+	USING_SCREEN(data[n].screen, write_screen, (void *) msg);
     }
-    set_term(data[which].screen);
 }
 
 int
@@ -103,7 +147,7 @@ main(int argc GCC_UNUSED,
     if (argc <= 1)
 	usage();
 
-    if ((data = (DITTO *) calloc((unsigned) argc, sizeof(DITTO))) == 0)
+    if ((data = typeCalloc(DITTO, argc)) == 0)
 	failed("calloc data");
 
     data[0].input = stdin;
@@ -134,27 +178,30 @@ main(int argc GCC_UNUSED,
      * of the screens.
      */
     for (count = 0;; ++count) {
+	char message[80];
 	int ch;
 	int which = (count % argc);
 
-	set_term(data[which].screen);
 	napms(20);
-	ch = getch();
+	ch = USING_SCREEN(data[which].screen, read_screen, 0);
 	if (ch == ERR) {
-	    /* echochar('.'); */
 	    continue;
 	}
 	if (ch == CTRL('D'))
 	    break;
-	show_ditto(data, argc, which, ch);
+	sprintf(message, "from[%d:%d] '%c' (%#x)\n", count, which, ch, ch);
+	show_ditto(data, argc, message);
     }
 
     /*
      * Cleanup and exit
      */
     for (j = argc - 1; j >= 0; j--) {
-	set_term(data[j].screen);
-	endwin();
+	USING_SCREEN(data[j].screen, close_screen, 0);
+	fprintf(data[j].output, "**Closed\r\n");
+	fflush(data[j].output);
+	fclose(data[j].output);
+	delscreen(data[j].screen);
     }
     ExitProgram(EXIT_SUCCESS);
 }