Full support for multiple terminal I/O (with some rough edges).

lib-src/emacsclient.c (emacs_pid): New variable.  
(window_change): Forward the SIGWINCH signal to the Emacs process
after copying the size parameters to the proxy terminal.
(copy_from_to): New parameter (sigio), kill Emacs with SIGIO if it is
nonzero.
(main): Set emacs_pid.

lisp/server.el (server-process-filter): Send the pid of Emacs to emacsclient.

src/cm.c: Added tty parameters to all functions and all Wcm macro calls.

src/cm.h: Added tty parameters to all macros.   Updated function prototypes.
(Wcm): Moved to struct tty_output.

src/dispextern.h: Updated function prototypes.

src/dispnew.c: Added tty parameters to all Wcm macro calls.
(do_switch_frame): Make old frame obscured, not invisible, to solve
problems with other-frame.
(Wcm): Moved to struct tty_output.

src/keyboard.c (read_avail_input): Select the frame corresponding to
the tty that was read.  Slight rearrangement of tty loop.

src/lisp.h (tabs_safe_p): Removed duplicate prototype.

src/sysdep.c (hft_init, hft_reset): Added tty_output parameter.
(discard_tty_input): Discard input from all ttys on APOLLO, too.
Whatever it is.
(narrow_foreground_group, widen_foreground_group): Added tty parameter
(not really useful, the functions only work on the controlling tty.)
(tabs_safe_p): Added tty parameter.

src/term.c Added tty parameters to all Wcm macro calls.
Standardised updating_frame vs. selected frame and tty_output access.
(term_init): Allocate Wcm.
(syms_of_term): Provide the `multi-tty' feature.

src/termchar.h (struct tty_output): Added Wcm.

src/xdisp.c (try_window_id): Make sure we use the tty device
corresponding to the current frame.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-8

1 files changed, 25 insertions, 4 deletions

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 2f0f45e1f59..14da37b1bb8 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -380,6 +380,7 @@ int tty_erase_char;
 int flow_control = 0;
 int meta_key = 0;
 char _sobuf[BUFSIZ];
+int emacs_pid;
 
 /* Adapted from init_sys_modes() in sysdep.c. */
 int
@@ -548,7 +549,7 @@ init_tty ()
 void
 window_change ()
 {
-  int width, height;
+  int width = 0, height = 0;
 
 #ifdef TIOCGWINSZ
   {
@@ -601,6 +602,9 @@ window_change ()
   }
 #endif /* not SunOS-style */
 #endif /* not BSD-style */
+
+  if (width != 0 && height != 0)
+    kill (emacs_pid, SIGWINCH);
 }
 
 int in_conversation = 0;
@@ -696,7 +700,7 @@ init_pty ()
 }
 
 int
-copy_from_to (int in, int out)
+copy_from_to (int in, int out, int sigio)
 {
   static char buf[BUFSIZ];
   int nread = read (in, &buf, BUFSIZ);
@@ -716,6 +720,11 @@ copy_from_to (int in, int out)
       
       if (r < 0)
         return 0;               /* Error */
+
+      if (sigio)
+        {
+          kill (emacs_pid, SIGIO);
+        }
     }
   return 1;
 }
@@ -744,13 +753,13 @@ pty_conversation ()
         if (FD_ISSET (master, &set))
           {
             /* Copy Emacs output to stdout. */
-            if (! copy_from_to (master, 0))
+            if (! copy_from_to (master, 0, 0))
               return 1;
           }
         if (FD_ISSET (1, &set))
           {
             /* Forward user input to Emacs. */
-            if (! copy_from_to (1, master))
+            if (! copy_from_to (1, master, 1))
               return 1;
           }
       }
@@ -1078,6 +1087,18 @@ To start the server in Emacs, type \"M-x server-start\".\n",
 
   if (here)
     {
+      /* First of all, get the pid of the Emacs process.
+         XXX Is there is some nifty libc/kernel feature for doing this?
+       */
+      str = fgets (string, BUFSIZ, in);
+      emacs_pid = atoi (str);
+      if (emacs_pid == 0)
+        {
+          reset_tty ();
+          fprintf (stderr, "%s: Could not get process id of Emacs\n", argv[0]);
+          fail (argc, argv);
+        }
+      
       if (! pty_conversation ())
         {
           reset_tty ();