Bugfix festival.

lib-src/emacsclient.c (main_argc, main_argv): New variables.
(main): Initialize them.
(fail): Use them.
(window_change, copy_from_to): Don't kill if emacs_pid is zero.
(pty_conversation): Watch the command socket, too.  Read emacs_pid
here.  Emacs and emacsclient could deadlock if Emacs tried to do a
reset_sys_modes before sending its pid.

lisp/server.el: Automatically delete the client frame when done editing.
(server-frames): New variable.
(server-process-filter, server-sentinel, server-buffer-done): Use it.
(server-process-filter): Do a redisplay before evaluating other
parameters.  (Prevents "emacsclient -h -e '(delete-frame)'" from
messing up the system.

src/dispextern.h: Update prototypes.

src/dispnew.c (window_change_signal): Do nothing if !term_initted.
(init_display): Set the frame size from the tty data after term_init.

src/emacs.c (main): Make sure things that init_sys_modes needs are 
initialized before init_display (which calls init_sys_modes now).
(sort_args): Use xfree, not free.
(shut_down_emacs) [!EMACS_HAVE_TTY_PGRP]: Use reset_all_sys_modes
instead of reset_sys_modes.

src/frame.c (make_terminal_frame): Sigh. Move terminal initialization
back to the middle of frame setup.  Handle errors by making sure that
the delete_tty() called from term_init() will see and delete this
frame.
(Fdelete_frame): Kill the frame before calling delete_tty().  Fix
condition for tty deletion.

src/keyboard.c (Fset_input_mode): Use reset_sys_modes on the current
terminal only.

src/lisp.h: Remove duplicate prototypes.

src/msdos.c (croak): use reset_all_sys_modes().

src/sysdeps.c (init_baud_rate): Added tty parameter, use it instead of CURTTY.
(child_setup_tty): Reset sigio on stdin, not CURTTY().
(reset_sigio): Added fd parameter, put explicit fcntl there.
(request_sigio, unrequest_sigio)[FASYNC]: Simply block/unblock the
SIGIO signal, don't touch the file params.  There are multiple ttys
now, and we can't disable the SIGIO from emacsclient.
(get_tty_size)[VMS]: Use tty_out instead of CURTTY().
(reset_sys_modes): Don't call cursor_to, clear_end_of_line; call
cmgoto and tty_clear_end_of_line instead.  The frame may already be
dead.  Updated reset_sigio call.

src/term.c (clear_and_of_line): Separate tty-dependent stuff to
tty_clear_end_of_line() for reset_sys_modes.
(tty_clear_end_of_line): New function.
(term_init): Added frame parameter, don't use selected_frame.
Set the frame's output_data.tty value (in case there is an error
later).  Set the frame size in Wcm, not in the frame.  Only free the
termcap buffer if there is a termcap-related error.  Call
init_sys_modes last, not first.
(deleting_tty): New variable.
(delete_tty): Use it for handling recursive calls.  Free deleted tty,
except its Wcm (there is still a dangling reference somewhere).

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

1 files changed, 16 insertions, 0 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 0a3eb446761..d57739fbef4 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -106,6 +106,13 @@ Each element is (CLIENTID BUFFERS...) where CLIENTID is a string
 that can be given to the server process to identify a client.
 When a buffer is marked as \"done\", it is removed from this list.")
 
+(defvar server-frames nil
+  "List of current server frames.
+Each element is (CLIENTID FRAME) where CLIENTID is a string
+that can be given to the server process to identify a client.
+When all the buffers of the client are marked as \"done\", 
+the frame is deleted.")
+
 (defvar server-buffer-clients nil
   "List of client ids for clients requesting editing of current buffer.")
 (make-variable-buffer-local 'server-buffer-clients)
@@ -178,6 +185,7 @@ are done with it in the server.")
     ;; Remove PROC from the list of clients.
     (when client
       (setq server-clients (delq client server-clients))
+      (setq server-frames (delq client server-frames))
       (dolist (buf (cdr client))
         (with-current-buffer buf
           ;; Remove PROC from the clients of each buffer.
@@ -326,6 +334,8 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
               (setq request (substring request (match-end 0)))
               (condition-case err
                   (let ((frame (make-terminal-frame `((tty . ,pty) (tty-type . ,type)))))
+                    (setq server-frames (cons (list (car client) frame) server-frames))
+                    (sit-for 0)
                     (process-send-string proc (concat (number-to-string (emacs-pid)) "\n"))
                     (select-frame frame))
                 (error (process-send-string proc (nth 1 err))
@@ -368,6 +378,9 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
       (if (null (cdr client))
           ;; This client is empty; get rid of it immediately.
           (progn
+            (let ((frame (cadr (assq (car client) server-frames))))
+              ;; Close the client's frame.
+              (when frame (delete-frame frame)))
             (delete-process proc)
             (server-log "Close empty client" proc))
         ;; We visited some buffer for this client.
@@ -454,6 +467,9 @@ FOR-KILLING if non-nil indicates that we are called from `kill-buffer'."
         ;; If client now has no pending buffers,
         ;; tell it that it is done, and forget it entirely.
         (unless (cdr client)
+          (let ((frame (cadr (assq (car client) server-frames))))
+            ;; Close the client's frame.
+            (when frame (delete-frame frame)))
           (delete-process (car client))
           (server-log "Close" (car client))
           (setq server-clients (delq client server-clients))))