Add a level of indirection to terminal characteristics.

* src/termchar.h (struct terminal): New struct.
(must_write_spaces, min_padding_speed, line_ins_del_ok)
(char_ins_del_ok, scroll_region_ok, scroll_region_cost)
(memory_below_frame, fast_clear_end_of_line): Moved to struct
terminal.
(current_terminal): New variable.
(CURRENT_TERMINAL, TERMINAL_*): New accessor macros.
(min_padding_speed, dont_calculate_costs): Commented out (unused).

* src/term.c (_current_terminal): New variable.  Will be removed when
true multi-tty support is implemented.

* src/termopts.h (no_redraw_on_reenter): Moved here.

* src/term.c (set_terminal_window, ins_del_lines, calculate_costs)
(term_init): Use the accessor macros for terminal characteristics.
* src/dispnew.c (line_hash_code, line_draw_cost)
(direct_output_for_insert, update_frame_1, scrolling)
(update_frame_line): Ditto.
* src/macterm.c (mac_initialize): Ditto.
* src/msdos.c (internal_terminal_init): Ditto.
* src/scroll.c (calculate_scrolling, calculate_direct_scrolling)
(scrolling_1, scroll_cost): Ditto.
* src/sysdep.c (hft_init): Ditto.
* src/w32term.c (w32_initialize): Ditto.
* src/xdisp.c (try_window_id): Ditto.
* src/xterm.c (x_initialize): Ditto.

* etc/TODO: Add pointer to my tla archive.

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

1 files changed, 44 insertions, 25 deletions

diff --git a/src/termchar.h b/src/termchar.h
index b1d941adc27..b7c82d04936 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -18,32 +18,51 @@ 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
+{
+  
+  /* 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.  */
+  int fast_clear_end_of_line;   /* Nonzero means terminal has a `ce' string */
+  
+  int line_ins_del_ok;          /* Terminal can insert and delete lines */
+  int char_ins_del_ok;          /* Terminal can insert and delete chars */
+  int scroll_region_ok;         /* Terminal supports setting the scroll
+                                   window */
+  int scroll_region_cost;	/* Cost of setting the scroll window,
+                                   measured in characters. */
+  int memory_below_frame;	/* Terminal remembers lines scrolled
+                                   off bottom */
 
-/* extern EMACS_INT baud_rate; */		/* Output speed in baud */
-extern 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.  */
-extern int min_padding_speed;	/* Speed below which no padding necessary */
-extern int fast_clear_end_of_line; /* Nonzero means terminal has
-				      command for this */
-
-extern int line_ins_del_ok;	/* Terminal can insert and delete lines */
-extern int char_ins_del_ok;	/* Terminal can insert and delete chars */
-extern int scroll_region_ok;	/* Terminal supports setting the scroll
-				   window */
-extern int scroll_region_cost;	/* Cost of setting the scroll window,
-				   measured in characters */
-extern int memory_below_frame;	/* Terminal remembers lines scrolled
-				   off bottom */
-extern int fast_clear_end_of_line; /* Terminal has a `ce' string */
-
-extern int dont_calculate_costs; /* Nonzero means don't bother computing
-				    various cost tables; we won't use them. */
-
-/* Nonzero means no need to redraw the entire frame on resuming
-   a suspended Emacs.  This is useful on terminals with multiple pages,
-   where one page is used for Emacs and another for all else. */
-extern int no_redraw_on_reenter;
+#if 0  /* These are not used anywhere. */
+  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
+};
+
+typedef struct terminal *TERMINAL_PTR;
+
+extern TERMINAL_PTR current_terminal;
+
+#define CURRENT_TERMINAL() \
+  (current_terminal ? current_terminal : (abort(), (TERMINAL_PTR) 0))
+
+#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)
+
+#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)
+#endif
 
 /* arch-tag: bf9f0d49-842b-42fb-9348-ec8759b27193
    (do not change this comment) */