Implemented multiple tty support.

README.multi-tty: New file.

src/termchar.h (struct terminal): Renamed to struct tty_output.  Added name, type,
input, output, termscript, old_tty, term_initted, old_tty_valid,
background_pixel, foreground_pixel, next fields.
(TERMINAL_*): Renamed to TTY_* for brevity.
(CURRENT_TERMINAL): Renamed to CURTTY for brevity.
(tty_list): New variable.
(TERMINAL_PTR): Removed.
(FRAME_TTY): New function.
(TTY_NAME, TTY_TYPE): New macros.

src/term.c (current_terminal): Removed.  (_current_terminal): Removed.  (tty_list):
New variable.  (OUTPUT, OUTPUT1, OUTPUTL, OUTPUT_IF, OUTPUT1_IF): Added tty
parameter.  (set_terminal_modes): Added tty parameter.  (reset_terminal_modes):
Added tty parameter.  (cursor_to, raw_cursor_to): Updated cmgoto() calls.
(clear_end_of_line, write_glyphs): Add indirection to terminal output, updated
cmcheckmagic() calls.  (get_named_tty): New function.  (term_dummy_init): New
function.  (term_init): Added name parameter, added tty_output return value.
Changed algorithm to update tty_list.  Call init_sys_modes() to set up tty
mode on the newly opened terminal device.
(get_current_tty): New function, intended for debugging.

src/termhooks.h (termscript): Removed.

src/w32term.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Removed redundant
definition.
src/macterm.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Ditto.


src/window.c (init_window_once): Call make_terminal_frame with two zero parameters.

src/cm.h (emacs_tputs): New macro to set current_tty, and then call tputs().
(current_tty): New variable, for cmputc().
(cmcheckmagic, cmputc, cmgoto): Added prototypes.

src/cm.c (current_tty): New variable, for cmputc().
(cmputc): Use it.
(cmcheckmagic): Added tty parameter, look up terminal streams there.
(calccost): Added tty parameter.  Use emacs_tputs() instead of tputs().
(cmgoto): Added tty parameter.  Pass it on to calccost().  Use emacs_tputs()
instead of tputs().


src/dispextern.h (set_terminal_modes, reset_terminal_modes): Added tty parameter.
(term_init): Added name parameter (the filename of the terminal device). Added
return value (struct tty_output).

src/dispnew.c: Replace CURTTY() with local variables throughout the file (where applicable).
(termscript): Moved to struct tty_output.
(terminal_type): Removed.

src/emacs.c (main): Don't call init_sys_modes(), the new term_init() already does that
during init_display().
(shut_down_emacs): Call reset_all_sys_modes() instead of reset_sys_modes().

src/frame.c (Qtty, Qtty_type): New variables.
(syms_of_frame): Initialize them.
(tty_display): Removed.
(make_terminal_frame): New parameters (tty filename and type).
Initialize output_data.tty field instead of output_data.x.  Use term_init() to
find the right tty_output.  (Use term_dummy_init() during bootstrap.)
(Fmake_terminal_frame): Get device filename and type from frame parameters.

src/frame.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Do the right thing
if the frame is a tty.
(struct frame): New member in output_data: tty.
(make_terminal_frame): Updated of prototype.

src/keyboard.c (Fset_input_mode): Call reset_all_sys_modes(), not
reset_sys_modes().  Ditto with init_sys_modes().

src/lisp.h (tty_output): Added forward declaration.
(init_sys_modes, reset_sys_modes): Updated prototype.
(init_all_sys_modes, reset_all_sys_modes): New prototypes.

src/scroll.c: Replace CURTTY() with local variables throughout the file (where applicable).

src/sysdep.c (old_tty, term_initted, old_tty_valid): Moved to struct tty_output.(
(init_all_sys_modes): New function.
(init_sys_modes): Added tty_output parameter.  Use it.
(reset_all_sys_modes): New function.
(reset_sys_modes): Added tty_output parameter.  Use it.

src/Makefile.in: Update dependencies.

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

1 files changed, 54 insertions, 15 deletions

diff --git a/src/termchar.h b/src/termchar.h
index b7c82d04936..9d7399e80d9 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -18,10 +18,37 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-struct terminal
+/* Each termcap frame points to its own struct tty_output object in the
+   output_data.tty field.  The tty_output structure contains the information
+   that is specific to terminals. */
+struct tty_output
 {
+  char *name;                   /* The name of the device file or 0 if
+                                   stdin/stdout. */
+  char *type;                   /* The type of the tty. */
+  
+  /* Input/output */
+  
+  FILE *input;                  /* The stream to be used for terminal input. */
+  FILE *output;                 /* The stream to be used for terminal output. */
+  
+  FILE *termscript;             /* If nonzero, send all terminal output
+                                   characters to this stream also.  */
+
+  struct emacs_tty old_tty;     /* The initial tty mode bits */
+
+  int term_initted;             /* 1 if we have been through init_sys_modes. */
+  int old_tty_valid;            /* 1 if outer tty status has been recorded.  */
+  
+  
+  /* Pixel values.
+     XXX What are these used for? */
+  
+  unsigned long background_pixel;
+  unsigned long foreground_pixel;
+
+  /* Terminal characteristics. */
   
-  /* EMACS_INT baud_rate; */	/* Output speed in baud */
   int must_write_spaces;	/* Nonzero means spaces in the text must
 				   actually be output; can't just skip over
 				   some columns to leave them blank.  */
@@ -37,31 +64,43 @@ struct terminal
                                    off bottom */
 
 #if 0  /* These are not used anywhere. */
+  /* EMACS_INT baud_rate; */	/* Output speed in baud */
   int min_padding_speed;	/* Speed below which no padding necessary. */
   int dont_calculate_costs;     /* Nonzero means don't bother computing
                                    various cost tables; we won't use them. */
 #endif
+
+  struct tty_output *next;
 };
 
-typedef struct terminal *TERMINAL_PTR;
+extern struct tty_output *tty_list;
+
+
+#define FRAME_TTY(f) \
+  ((f)->output_method == output_termcap \
+   ? (f)->output_data.tty : (abort(), (struct tty_output *) 0))
+  
+#define CURTTY() FRAME_TTY (SELECTED_FRAME())
 
-extern TERMINAL_PTR current_terminal;
+#define TTY_NAME(t) ((t)->name)
+#define TTY_TYPE(t) ((t)->type)
 
-#define CURRENT_TERMINAL() \
-  (current_terminal ? current_terminal : (abort(), (TERMINAL_PTR) 0))
+#define TTY_INPUT(t) ((t)->input)
+#define TTY_OUTPUT(t) ((t)->output)
+#define TTY_TERMSCRIPT(t) ((t)->termscript)
 
-#define TERMINAL_MUST_WRITE_SPACES(t) ((t)->must_write_spaces)
-#define TERMINAL_FAST_CLEAR_END_OF_LINE(t) ((t)->fast_clear_end_of_line)
-#define TERMINAL_LINE_INS_DEL_OK(t) ((t)->line_ins_del_ok)
-#define TERMINAL_CHAR_INS_DEL_OK(t) ((t)->char_ins_del_ok)
-#define TERMINAL_SCROLL_REGION_OK(t) ((t)->scroll_region_ok)
-#define TERMINAL_SCROLL_REGION_COST(t) ((t)->scroll_region_cost)
-#define TERMINAL_MEMORY_BELOW_FRAME(t) ((t)->memory_below_frame)
+#define TTY_MUST_WRITE_SPACES(t) ((t)->must_write_spaces)
+#define TTY_FAST_CLEAR_END_OF_LINE(t) ((t)->fast_clear_end_of_line)
+#define TTY_LINE_INS_DEL_OK(t) ((t)->line_ins_del_ok)
+#define TTY_CHAR_INS_DEL_OK(t) ((t)->char_ins_del_ok)
+#define TTY_SCROLL_REGION_OK(t) ((t)->scroll_region_ok)
+#define TTY_SCROLL_REGION_COST(t) ((t)->scroll_region_cost)
+#define TTY_MEMORY_BELOW_FRAME(t) ((t)->memory_below_frame)
 
 #if 0
 /* These are not used anywhere. */
-#define TERMINAL_MIN_PADDING_SPEED(t) ((t)->min_padding_speed)
-#define TERMINAL_DONT_CALCULATE_COSTS(t) ((t)->dont_calculate_costs)
+#define TTY_MIN_PADDING_SPEED(t) ((t)->min_padding_speed)
+#define TTY_DONT_CALCULATE_COSTS(t) ((t)->dont_calculate_costs)
 #endif
 
 /* arch-tag: bf9f0d49-842b-42fb-9348-ec8759b27193