-- Implement support for reading from multiple terminals.
(Done, read_avail_input tries to read from each terminal, until one
- succeeds. MULTIKBOARD is not used. Secondary terminals don't send
+ succeeds. MULTI_KBOARD is not used. Secondary terminals don't send
SIGIO!)
(Update: They do, now.)
** Fix X support.
** Allow simultaneous X and tty frames. (Handling input could be
- tricky.)
+ tricky. Or maybe not.)
** Implement support for starting an interactive Emacs session without
an initial frame. (The user would connect to it and open frames
** Make sure C-g goes to the right frame. This is hard, as SIGINT
doesn't have a tty parameter. :-(
-** I have seen a case when Emacs with multiple ttys went ate 100% of
- CPU time. Strace showed this loop:
+** I have seen a case when Emacs with multiple ttys fell into a loop
+ eating 100% of CPU time. Strace showed this loop:
getpid() = 30284
}
/* The terminal to use for low-level output. */
-struct tty_output * current_tty;
+struct tty_display_info *current_tty;
int
cmputc (c)
* after we reach the last column; this takes us to a known state.
*/
void
-cmcheckmagic (struct tty_output *tty)
+cmcheckmagic (struct tty_display_info *tty)
{
if (curX (tty) == FrameCols (tty))
{
*/
void
-cmcostinit (struct tty_output *tty)
+cmcostinit (struct tty_display_info *tty)
{
char *p;
*/
static int
-calccost (struct tty_output *tty, int srcy, int srcx, int dsty, int dstx, int doit)
+calccost (struct tty_display_info *tty,
+ int srcy, int srcx, int dsty, int dstx, int doit)
{
register int deltay,
deltax,
void
cmgoto (tty, row, col)
- struct tty_output *tty;
+ struct tty_display_info *tty;
int row, col;
{
int homecost,
*/
void
-Wcm_clear (struct tty_output *tty)
+Wcm_clear (struct tty_display_info *tty)
{
bzero (tty->Wcm, sizeof (struct cm));
UP = 0;
*/
int
-Wcm_init (struct tty_output *tty)
+Wcm_init (struct tty_display_info *tty)
{
#if 0
if (tty->Wcm->cm_abs && !tty->Wcm->cm_ds)
#define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str, affcnt, putc))
-extern struct tty_output *current_tty;
-extern void cmcheckmagic P_ ((struct tty_output *));
+extern struct tty_display_info *current_tty;
+extern void cmcheckmagic P_ ((struct tty_display_info *));
extern int cmputc P_ ((int));
-extern void cmcostinit P_ ((struct tty_output *));
-extern void cmgoto P_ ((struct tty_output *, int, int));
-extern void Wcm_clear P_ ((struct tty_output *));
-extern int Wcm_init P_ ((struct tty_output *));
+extern void cmcostinit P_ ((struct tty_display_info *));
+extern void cmgoto P_ ((struct tty_display_info *, int, int));
+extern void Wcm_clear P_ ((struct tty_display_info *));
+extern int Wcm_init P_ ((struct tty_display_info *));
/* arch-tag: acc1535a-7136-49d6-b22d-9bc85702251b
(do not change this comment) */
extern void update_end P_ ((struct frame *));
extern void set_terminal_window P_ ((int));
extern void set_scroll_region P_ ((int, int));
-extern void turn_off_insert P_ ((struct tty_output *));
-extern void turn_off_highlight P_ ((struct tty_output *));
-extern void background_highlight P_ ((struct tty_output *));
+extern void turn_off_insert P_ ((struct tty_display_info *));
+extern void turn_off_highlight P_ ((struct tty_display_info *));
+extern void background_highlight P_ ((struct tty_display_info *));
extern void clear_frame P_ ((void));
extern void clear_end_of_line P_ ((int));
extern void clear_end_of_line_raw P_ ((int));
-extern void tty_clear_end_of_line P_ ((struct tty_output *, int));
+extern void tty_clear_end_of_line P_ ((struct tty_display_info *, int));
extern void delete_glyphs P_ ((int));
extern void ins_del_lines P_ ((int, int));
extern int string_cost P_ ((char *));
extern int per_line_cost P_ ((char *));
extern void calculate_costs P_ ((struct frame *));
extern void set_tty_color_mode P_ ((struct frame *, Lisp_Object));
-extern void tty_setup_colors P_ ((struct tty_output *, int));
-extern struct tty_output *term_init P_ ((Lisp_Object, char *, char *));
-extern struct tty_output *term_dummy_init P_ ((void));
+extern void tty_setup_colors P_ ((struct tty_display_info *, int));
+extern struct tty_display_info *term_init P_ ((Lisp_Object, char *, char *));
+extern struct tty_display_info *term_dummy_init P_ ((void));
extern void fatal P_ ((/* char *, ... */));
void cursor_to P_ ((int, int));
-extern int tty_capable_p P_ ((struct tty_output *, unsigned, unsigned long, unsigned long));
+extern int tty_capable_p P_ ((struct tty_display_info *, unsigned, unsigned long, unsigned long));
/* Defined in scroll.c */
#endif
int old_errno = errno;
- struct tty_output *tty;
+ struct tty_display_info *tty;
/* The frame size change obviously applies to a single
termcap-controlled terminal, but we can't decide which.
#endif /* VMS */
{
- struct tty_output *tty;
+ struct tty_display_info *tty;
tty = term_init (selected_frame, 0, terminal_type);
change_frame_size (XFRAME (selected_frame), FrameRows (tty), FrameCols (tty), 0, 0, 0);
make_mac_terminal_frame (f);
#else
{
- struct tty_output *tty;
+ struct tty_display_info *tty;
f->output_method = output_termcap;
+
+ f->output_data.tty = (struct tty_output *) xmalloc (sizeof (struct tty_output));
+ bzero (f->output_data.tty, sizeof (struct tty_output));
+
+ FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
+ FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
if (initialized)
{
/* Note that term_init may signal an error, but then it is its
responsibility to make sure this frame is deleted. */
- f->output_data.tty = term_init (frame, tty_name, tty_type);
+ f->output_data.tty->display_info = term_init (frame, tty_name, tty_type);
}
else
{
/* init_display() will reinitialize the terminal with correct values after dump. */
- f->output_data.tty = term_dummy_init ();
+ f->output_data.tty->display_info = term_dummy_init ();
}
+ FRAME_TTY (f)->reference_count++;
}
#ifdef CANNOT_DUMP
if (FRAME_TERMCAP_P (f))
{
- Lisp_Object tail, frame1;
int delete = 1;
- struct tty_output *tty = FRAME_TTY (f);
+ struct tty_display_info *tty = FRAME_TTY (f);
- /* delete_tty will call us recursively, so better kill the
- frame now. */
- f->output_data.nothing = 0;
-
- /* See if the terminal needs to be closed. */
- FOR_EACH_FRAME (tail, frame1)
+ if (! --tty->reference_count)
{
- if (frame1 != frame
- && FRAME_LIVE_P (XFRAME (frame1))
- && FRAME_TERMCAP_P (XFRAME (frame1))
- && FRAME_TTY (XFRAME (frame1)) == FRAME_TTY (f))
- {
- delete = 0;
- break;
- }
+ /* delete_tty would call us recursively if we don't kill the
+ frame now. */
+ xfree (f->output_data.tty);
+ f->output_data.nothing = 0;
+ delete_tty (tty);
}
- if (delete)
- delete_tty (tty);
}
else
{
HBAR_CURSOR
};
-#if !defined(MSDOS) && !defined(WINDOWSNT) && !defined(MAC_OS)
+#define FRAME_FOREGROUND_PIXEL(f) ((f)->foreground_pixel)
+#define FRAME_BACKGROUND_PIXEL(f) ((f)->background_pixel)
-#if !defined(HAVE_X_WINDOWS)
-
-#define PIX_TYPE unsigned long
-
-/* A (mostly empty) x_output structure definition for building Emacs
- on Unix and GNU/Linux without X support. */
-struct x_output
-{
- PIX_TYPE background_pixel;
- PIX_TYPE foreground_pixel;
-};
-
-#endif /* ! HAVE_X_WINDOWS */
-
-
-#define FRAME_FOREGROUND_PIXEL(f) \
- (((f)->output_method == output_termcap) \
- ? ((f)->output_data.tty->foreground_pixel) \
- : ((f)->output_data.x->foreground_pixel))
-
-#define FRAME_BACKGROUND_PIXEL(f) \
- (((f)->output_method == output_termcap) \
- ? ((f)->output_data.tty->background_pixel) \
- : ((f)->output_data.x->background_pixel))
-
-#endif /* ! MSDOS && ! WINDOWSNT && ! MAC_OS */
+struct device;
struct frame
{
/* Canonical Y unit. Height of a line, in pixels. */
int line_height;
+ /* The display hooks to use with this frame. */
+ struct display *display;
+
/* The output method says how the contents of this frame
are displayed. It could be using termcap, or using an X window. */
enum output_method output_method;
/* A structure of auxiliary data used for displaying the contents.
- struct tty_output is used for terminal frames;
+ struct tty_output is used for termcap frames;
it is defined in term.h.
struct x_output is used for X window frames;
it is defined in xterm.h.
Clear the frame in clear_garbaged_frames if set. */
unsigned resized_p : 1;
+ /* All display backends seem to need these two pixel values. */
+ unsigned long background_pixel;
+ unsigned long foreground_pixel;
+
/* Set to non-zero if the default face for the frame has been
realized. Reset to zero whenever the default face changes.
Used to see the difference between a font change and face change. */
of characters on some systems when input is stuffed at us. */
unsigned char cbuf[KBD_BUFFER_SIZE - 1];
int n_to_read;
- struct tty_output *tty;
+ struct tty_display_info *tty;
Lisp_Object frame;
#ifdef WINDOWSNT
extern void syms_of_xmenu P_ ((void));
/* defined in termchar.h */
-struct tty_output;
+struct tty_display_info;
+
+/* defined in termhooks.h */
+struct display;
/* defined in sysdep.c */
extern void stuff_char P_ ((char c));
extern void sys_subshell P_ ((void));
extern void sys_suspend P_ ((void));
extern void discard_tty_input P_ ((void));
-extern void init_sys_modes P_ ((struct tty_output *));
-extern void reset_sys_modes P_ ((struct tty_output *));
+extern void init_sys_modes P_ ((struct tty_display_info *));
+extern void reset_sys_modes P_ ((struct tty_display_info *));
extern void init_all_sys_modes P_ ((void));
extern void reset_all_sys_modes P_ ((void));
extern void wait_for_termination P_ ((int));
void croak P_ ((char *));
#ifdef AIXHFT
-void hft_init P_ ((struct tty_output *));
-void hft_reset P_ ((struct tty_output *));
+void hft_init P_ ((struct tty_display_info *));
+void hft_reset P_ ((struct tty_display_info *));
#endif
/* Temporary used by `sigblock' when defined in terms of signprocmask. */
#else /* not VMS */
#ifdef APOLLO
{
- struct tty_output *tty;
+ struct tty_display_info *tty;
for (tty = tty_list; tty; tty = tty->next)
{
int zero = 0;
;
#else /* not MSDOS */
{
- struct tty_output *tty;
+ struct tty_display_info *tty;
for (tty = tty_list; tty; tty = tty->next)
{
EMACS_GET_TTY (fileno (TTY_INPUT (tty)), &buf);
void
init_all_sys_modes (void)
{
- struct tty_output *tty;
+ struct tty_display_info *tty;
for (tty = tty_list; tty; tty = tty->next)
init_sys_modes (tty);
}
void
init_sys_modes (tty_out)
- struct tty_output *tty_out;
+ struct tty_display_info *tty_out;
{
struct emacs_tty tty;
void
reset_all_sys_modes (void)
{
- struct tty_output *tty;
+ struct tty_display_info *tty;
for (tty = tty_list; tty; tty = tty->next)
reset_sys_modes (tty);
}
bottom of the frame, turn off interrupt-driven I/O, etc. */
void
reset_sys_modes (tty_out)
- struct tty_output *tty_out;
+ struct tty_display_info *tty_out;
{
if (noninteractive)
{
/* Called from init_sys_modes. */
void
-hft_init (struct tty_output *tty_out)
+hft_init (struct tty_display_info *tty_out)
{
int junk;
/* Reset the rubout key to backspace. */
void
-hft_reset (struct tty_output *tty_out)
+hft_reset (struct tty_display_info *tty_out)
{
struct hfbuf buf;
struct hfkeymap keymap;
static void turn_on_face P_ ((struct frame *, int face_id));
static void turn_off_face P_ ((struct frame *, int face_id));
-static void tty_show_cursor P_ ((struct tty_output *));
-static void tty_hide_cursor P_ ((struct tty_output *));
+static void tty_show_cursor P_ ((struct tty_display_info *));
+static void tty_hide_cursor P_ ((struct tty_display_info *));
-void delete_tty P_ ((struct tty_output *));
-static void delete_tty_1 P_ ((struct tty_output *));
+void delete_tty P_ ((struct tty_display_info *));
+static void delete_tty_1 P_ ((struct tty_display_info *));
#define OUTPUT(tty, a) \
/* Terminal characteristics that higher levels want to look at. */
-struct tty_output *tty_list;
+struct tty_display_info *tty_list;
/* Nonzero means no need to redraw the entire frame on resuming a
suspended Emacs. This is useful on terminals with multiple
else if (!FRAME_TERMCAP_P (f))
(*ring_bell_hook) ();
else {
- struct tty_output *tty = FRAME_TTY (f);
+ struct tty_display_info *tty = FRAME_TTY (f);
OUTPUT (tty, tty->TS_visible_bell && visible_bell ? tty->TS_visible_bell : tty->TS_bell);
}
}
-void tty_set_terminal_modes (struct tty_output *tty)
+void tty_set_terminal_modes (struct tty_display_info *tty)
{
OUTPUT_IF (tty, tty->TS_termcap_modes);
OUTPUT_IF (tty, tty->TS_cursor_visible);
(*set_terminal_modes_hook) ();
}
-void tty_reset_terminal_modes (struct tty_output *tty)
+void tty_reset_terminal_modes (struct tty_display_info *tty)
{
turn_off_highlight (tty);
turn_off_insert (tty);
{
if (FRAME_TERMCAP_P (f))
{
- struct tty_output *tty = FRAME_TTY (f);
+ struct tty_display_info *tty = FRAME_TTY (f);
if (!XWINDOW (selected_window)->cursor_off_p)
tty_show_cursor (tty);
turn_off_insert (tty);
struct frame *f = (updating_frame ? updating_frame : XFRAME (selected_frame));
if (FRAME_TERMCAP_P (f))
{
- struct tty_output *tty = FRAME_TTY (f);
+ struct tty_display_info *tty = FRAME_TTY (f);
tty->specified_window = size ? size : FRAME_LINES (f);
if (TTY_SCROLL_REGION_OK (tty))
set_scroll_region (0, tty->specified_window);
{
char *buf;
struct frame *f = (updating_frame ? updating_frame : XFRAME (selected_frame));
- struct tty_output *tty = FRAME_TTY (f);
+ struct tty_display_info *tty = FRAME_TTY (f);
if (tty->TS_set_scroll_region)
buf = tparam (tty->TS_set_scroll_region, 0, 0, start, stop - 1);
\f
static void
-turn_on_insert (struct tty_output *tty)
+turn_on_insert (struct tty_display_info *tty)
{
if (!tty->insert_mode)
OUTPUT (tty, tty->TS_insert_mode);
}
void
-turn_off_insert (struct tty_output *tty)
+turn_off_insert (struct tty_display_info *tty)
{
if (tty->insert_mode)
OUTPUT (tty, tty->TS_end_insert_mode);
/* Handle highlighting. */
void
-turn_off_highlight (struct tty_output *tty)
+turn_off_highlight (struct tty_display_info *tty)
{
if (tty->standout_mode)
OUTPUT_IF (tty, tty->TS_end_standout_mode);
}
static void
-turn_on_highlight (struct tty_output *tty)
+turn_on_highlight (struct tty_display_info *tty)
{
if (!tty->standout_mode)
OUTPUT_IF (tty, tty->TS_standout_mode);
}
static void
-toggle_highlight (struct tty_output *tty)
+toggle_highlight (struct tty_display_info *tty)
{
if (tty->standout_mode)
turn_off_highlight (tty);
/* Make cursor invisible. */
static void
-tty_hide_cursor (struct tty_output *tty)
+tty_hide_cursor (struct tty_display_info *tty)
{
if (tty->cursor_hidden == 0)
{
/* Ensure that cursor is visible. */
static void
-tty_show_cursor (struct tty_output *tty)
+tty_show_cursor (struct tty_display_info *tty)
{
if (tty->cursor_hidden)
{
depends on the user option inverse-video. */
void
-background_highlight (struct tty_output *tty)
+background_highlight (struct tty_display_info *tty)
{
if (inverse_video)
turn_on_highlight (tty);
/* Set standout mode to the mode specified for the text to be output. */
static void
-highlight_if_desired (struct tty_output *tty)
+highlight_if_desired (struct tty_display_info *tty)
{
if (inverse_video)
turn_on_highlight (tty);
int vpos, hpos;
{
struct frame *f = (updating_frame ? updating_frame : XFRAME (selected_frame));
- struct tty_output *tty;
+ struct tty_display_info *tty;
if (! FRAME_TERMCAP_P (f) && cursor_to_hook)
{
int row, col;
{
struct frame *f = updating_frame ? updating_frame : XFRAME (selected_frame);
- struct tty_output *tty;
+ struct tty_display_info *tty;
if (! FRAME_TERMCAP_P (f))
{
(*raw_cursor_to_hook) (row, col);
register int i;
struct frame *f = (updating_frame ? updating_frame : XFRAME (selected_frame));
- struct tty_output *tty;
+ struct tty_display_info *tty;
if (clear_to_end_hook && ! FRAME_TERMCAP_P (f))
{
clear_frame ()
{
struct frame *f = (updating_frame ? updating_frame : XFRAME (selected_frame));
- struct tty_output *tty;
+ struct tty_display_info *tty;
if (clear_frame_hook && ! FRAME_TERMCAP_P (f))
{
int first_unused_hpos;
{
struct frame *f = (updating_frame ? updating_frame : XFRAME (selected_frame));
- struct tty_output *tty;
+ struct tty_display_info *tty;
if (clear_end_of_line_hook
&& ! FRAME_TERMCAP_P (f))
}
void
-tty_clear_end_of_line (struct tty_output *tty, int first_unused_hpos)
+tty_clear_end_of_line (struct tty_display_info *tty, int first_unused_hpos)
{
register int i;
/* Detect the case where we are called from reset_sys_modes
{
int produced, consumed;
struct frame *f = updating_frame ? updating_frame : XFRAME (selected_frame);
- struct tty_output *tty;
+ struct tty_display_info *tty;
unsigned char conversion_buffer[1024];
int conversion_buffer_size = sizeof conversion_buffer;
char *buf;
struct glyph *glyph = NULL;
struct frame *f;
- struct tty_output *tty;
+ struct tty_display_info *tty;
if (len <= 0)
return;
char *buf;
register int i;
struct frame *f = (updating_frame ? updating_frame : XFRAME (selected_frame));
- struct tty_output *tty = FRAME_TTY (f);
+ struct tty_display_info *tty = FRAME_TTY (f);
if (delete_glyphs_hook && ! FRAME_TERMCAP_P (f))
{
}
else
{
- struct tty_output *tty = FRAME_TTY (f);
+ struct tty_display_info *tty = FRAME_TTY (f);
char *multi = n > 0 ? tty->TS_ins_multi_lines : tty->TS_del_multi_lines;
char *single = n > 0 ? tty->TS_ins_line : tty->TS_del_line;
char *scroll = n > 0 ? tty->TS_rev_scroll : tty->TS_fwd_scroll;
calculate_ins_del_char_costs (f)
FRAME_PTR f;
{
- struct tty_output *tty = FRAME_TTY (f);
+ struct tty_display_info *tty = FRAME_TTY (f);
int ins_startup_cost, del_startup_cost;
int ins_cost_per_char, del_cost_per_char;
register int i;
calculate_costs (frame)
FRAME_PTR frame;
{
- struct tty_output *tty = FRAME_TTY (frame);
+ struct tty_display_info *tty = FRAME_TTY (frame);
register char *f = (tty->TS_set_scroll_region
? tty->TS_set_scroll_region
: tty->TS_set_scroll_region_1);
FRAME_COST_BAUD_RATE (frame) = baud_rate;
if (FRAME_TERMCAP_P (frame))
- TTY_SCROLL_REGION_COST (frame->output_data.tty) = string_cost (f);
+ TTY_SCROLL_REGION_COST (FRAME_TTY (frame)) = string_cost (f);
/* These variables are only used for terminal stuff. They are allocated
once for the terminal frame of X-windows emacs, but not used afterwards.
struct face *face = FACE_FROM_ID (f, face_id);
long fg = face->foreground;
long bg = face->background;
- struct tty_output *tty = FRAME_TTY (f);
+ struct tty_display_info *tty = FRAME_TTY (f);
/* Do this first because TS_end_standout_mode may be the same
as TS_exit_attribute_mode, which turns all appearances off. */
int face_id;
{
struct face *face = FACE_FROM_ID (f, face_id);
- struct tty_output *tty = FRAME_TTY (f);
+ struct tty_display_info *tty = FRAME_TTY (f);
xassert (face != NULL);
int
tty_capable_p (tty, caps, fg, bg)
- struct tty_output *tty;
+ struct tty_display_info *tty;
unsigned caps;
unsigned long fg, bg;
{
(display)
Lisp_Object display;
{
- struct tty_output *tty = FRAME_TTY (SELECTED_FRAME ());
+ struct tty_display_info *tty = FRAME_TTY (SELECTED_FRAME ());
return tty->TN_max_colors > 0 ? Qt : Qnil;
}
(display)
Lisp_Object display;
{
- struct tty_output *tty = FRAME_TTY (SELECTED_FRAME ());
+ struct tty_display_info *tty = FRAME_TTY (SELECTED_FRAME ());
return make_number (tty->TN_max_colors);
}
/* Save or restore the default color-related capabilities of this
terminal. */
static void
-tty_default_color_capabilities (struct tty_output *tty, int save)
+tty_default_color_capabilities (struct tty_display_info *tty, int save)
{
static char
*default_orig_pair, *default_set_foreground, *default_set_background;
support; zero means set up for the default capabilities, the ones
we saw at term_init time; -1 means turn off color support. */
void
-tty_setup_colors (struct tty_output *tty, int mode)
+tty_setup_colors (struct tty_display_info *tty, int mode)
{
/* Canonicalize all negative values of MODE. */
if (mode < -1)
\f
-struct tty_output *
+struct tty_display_info *
get_named_tty (name)
char *name;
{
- struct tty_output *tty = tty_list;
+ struct tty_display_info *tty = tty_list;
while (tty) {
if ((tty->name == 0 && name == 0)
if (f->output_method != output_termcap)
wrong_type_argument (Qframe_tty_name, frame);
- if (f->output_data.tty->name)
- return build_string (f->output_data.tty->name);
+ if (FRAME_TTY (f)->name)
+ return build_string (FRAME_TTY (f)->name);
else
return Qnil;
}
if (f->output_method != output_termcap)
wrong_type_argument (Qframe_tty_type, frame);
- if (f->output_data.tty->type)
- return build_string (f->output_data.tty->type);
+ if (FRAME_TTY (f)->type)
+ return build_string (FRAME_TTY (f)->type);
else
return Qnil;
}
Initialization
***********************************************************************/
-struct tty_output *
+struct tty_display_info *
term_dummy_init (void)
{
if (initialized || tty_list)
error ("tty already initialized");
- tty_list = xmalloc (sizeof (struct tty_output));
- bzero (tty_list, sizeof (struct tty_output));
- TTY_NAME (tty_list) = 0;
- TTY_INPUT (tty_list) = stdin;
- TTY_OUTPUT (tty_list) = stdout;
+ tty_list = xmalloc (sizeof (struct tty_display_info));
+ bzero (tty_list, sizeof (struct tty_display_info));
+ tty_list->name = 0;
+ tty_list->input = stdin;
+ tty_list->input = stdout;
return tty_list;
}
-struct tty_output *
+struct tty_display_info *
term_init (Lisp_Object frame, char *name, char *terminal_type)
{
char *area;
register char *p;
int status;
struct frame *f = XFRAME (frame);
- struct tty_output *tty;
+ struct tty_display_info *tty;
tty = get_named_tty (name);
if (tty)
}
else
{
- tty = (struct tty_output *) xmalloc (sizeof (struct tty_output));
- bzero (tty, sizeof (struct tty_output));
+ tty = (struct tty_display_info *) xmalloc (sizeof (struct tty_display_info));
+ bzero (tty, sizeof (struct tty_display_info));
tty->next = tty_list;
tty_list = tty;
}
/* Make sure the frame is live; if an error happens, it must be
deleted. */
f->output_method = output_termcap;
- f->output_data.tty = tty;
+ if (! f->output_data.tty)
+ abort ();
+ f->output_data.tty->display_info = tty;
if (name)
{
error ("Could not open file: %s", name);
}
file = fdopen (fd, "w+");
- TTY_NAME (tty) = xstrdup (name);
- TTY_INPUT (tty) = file;
- TTY_OUTPUT (tty) = file;
+ tty->name = xstrdup (name);
+ tty->input = file;
+ tty->output = file;
}
else
{
- TTY_NAME (tty) = 0;
- TTY_INPUT (tty) = stdin;
- TTY_OUTPUT (tty) = stdout;
+ tty->name = 0;
+ tty->input = stdin;
+ tty->output = stdout;
}
- TTY_TYPE (tty) = xstrdup (terminal_type);
+ tty->type = xstrdup (terminal_type);
add_keyboard_wait_descriptor (fileno (tty->input));
tty->top_frame = frame;
- tty->foreground_pixel = FACE_TTY_DEFAULT_FG_COLOR;
- tty->background_pixel = FACE_TTY_DEFAULT_BG_COLOR;
-
/* Init system terminal modes (RAW or CBREAK, etc.). */
init_sys_modes (tty);
(tty)
Lisp_Object tty;
{
- struct tty_output *t;
+ struct tty_display_info *t;
char *name = 0;
CHECK_STRING (tty);
static int deleting_tty = 0;
void
-delete_tty (struct tty_output *tty)
+delete_tty (struct tty_display_info *tty)
{
Lisp_Object tail, frame;
tty_list = tty->next;
else
{
- struct tty_output *p;
+ struct tty_display_info *p;
for (p = tty_list; p && p->next != tty; p = p->next)
;
if (tty->Wcm)
xfree (tty->Wcm);
- bzero (tty, sizeof (struct tty_output));
+ bzero (tty, sizeof (struct tty_display_info));
xfree (tty);
deleting_tty = 0;
}
\f
-/* Mark the pointers in the tty_output objects.
+/* Mark the pointers in the tty_display_info objects.
Called by the Fgarbage_collector. */
void
mark_ttys ()
{
- struct tty_output *tty;
+ struct tty_display_info *tty;
Lisp_Object *p;
for (tty = tty_list; tty; tty = tty->next)
{
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* 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. */
+/* 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 termcap frames. */
struct tty_output
{
+ /* The Emacs structure for the tty device this frame is on. */
+ struct tty_display_info *display_info;
+
+ /* There is nothing else here at the moment... */
+};
+
+/* Parameters that are shared between frames on the same tty device. */
+struct tty_display_info
+{
+ struct tty_display_info *next; /* Chain of all tty devices. */
+
char *name; /* The name of the device file or 0 if
stdin/stdout. */
char *type; /* The type of the tty. */
int term_initted; /* 1 if we have been through init_sys_modes. */
- /* Structure for info on cursor positioning. */
-
+ int reference_count; /* Number of frames that are on this display. */
+
+ /* Info on cursor positioning. */
struct cm *Wcm;
/* Redisplay. */
/* The previous terminal frame we displayed on this tty. */
struct frame *previous_terminal_frame;
- /* Pixel values.
- XXX What are these used for? */
-
- unsigned long background_pixel;
- unsigned long foreground_pixel;
-
/* Terminal characteristics. */
int must_write_spaces; /* Nonzero means spaces in the text must
/* Flag used in tty_show/hide_cursor. */
int cursor_hidden;
-
-
- struct tty_output *next;
};
-extern struct tty_output *tty_list;
+/* A chain of structures for all tty devices currently in use. */
+extern struct tty_display_info *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())
+#define FRAME_TTY(f) \
+ ((f)->output_method == output_termcap \
+ ? (f)->output_data.tty->display_info \
+ : (abort(), (struct tty_display_info *) 0))
-#define TTY_NAME(t) ((t)->name)
-#define TTY_TYPE(t) ((t)->type)
+#define CURTTY() FRAME_TTY (SELECTED_FRAME())
#define TTY_INPUT(t) ((t)->input)
#define TTY_OUTPUT(t) ((t)->output)
#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 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
(do not change this comment) */
#define P_(X) ()
#endif
\f
+/* Device-local parameters. */
+struct device
+{
+ /* XXX Display hooks will go here. */
+};
+
/* Text display hooks. */
extern void (*cursor_to_hook) P_ ((int vpos, int hpos));
HCoop / bpt / emacs.git / commitdiff