Hookified termcap devices, added bootstrap display device, plus many bugfixes.

lisp/frame.el (display-color-cells): Pass display parameter to tty-display-color-cells.

lisp/term/xterm.el (xterm-register-default-colors): Pass the selected-frame to display-color-cells.

src/dispextern.h (set_terminal_modes, reset_terminal_modes): Removed declarations.
(get_named_tty_display): New prototype.
(tty_clear_end_of_line, term_init): Updated to new prototype.
(initial_term_init): Renamed to init_initial_display.

src/dispnew.c (Fredraw_frame): ifdef-out DOS-specific code.  Add display parameter to set_terminal_modes call.
(update_frame): Don't flush the tty of there is no tty.
(init_display): Set up a termcap display on the controlling tty and
change the initial frame to use that.  Delete the initial display.

src/frame.c (Fframep): Return t for the initial frame.
(make_initial_frame): New function for creating the initial frame during bootstrap.  Use init_initial_display, not initial_term_init.
(make_terminal_frame): Removed special cases for creating the initial frame.

src/frame.h (enum output_method): New entry: output_initial for the bootstrap display.
(FRAME_INITIAL_P): New macro.
(make_initial_frame): New prototype.

src/keyboard.c (interrupt_signal): Exit Emacs on SIGINT from the (frameless) controlling tty, if possible.  Explain this in a comment.
(init_keyboard): Added comment about exiting on SIGINT.
(Fset_input_mode): A termcap frame is never the initial frame anymore.

src/sysdep.c (init_sys_modes): Update tty_set_terminal_modes call to the new prototype.
(reset_sys_modes): Comment out tty_clear_end_of_line call; it doesn't work anymore.  Update tty_reset_terminal_modes call.

src/termchar.h (struct tty_display_info): Added pointer to the display structure, for reset_sys_modes.

src/termhooks.h (struct display): Added display parameter to set_terminal_modes_hook and reset_terminal_modes_hook.

src/term.c (initial_display): New variable.
(tty_ring_bell, tty_update_end, tty_set_terminal_window, tty_cursor_to)
(tty_raw_cursor_to, tty_clear_to_end, tty_clear_frame, tty_clear_end_of_line)
(tty_write_glyphs, tty_insert_glyphs, tty_delete_glyphs, tty_ins_del_lines): New functions.
(ring_bell, update_end, set_terminal_window, cursor_to, raw_cursor_to)
(clear_to_end, clear_frame, clear_end_of_line, write_glyphs, insert_glyphs)
(delete_glyphs, ins_del_lines): Removed special casing of termcap displays.
(get_tty_display): New function.
(Ftty_display_color_p, Ftty_display_color_cells): Use it.
(get_named_tty_display): Removed static.
(tty_set_terminal_modes, tty_reset_terminal_modes): Changed to use a display parameter
instead of tty_display_info for hook compatibility.
(set_terminal_modes, reset_terminal_modes): Removed.
(initial_term_init): Renamed to init_initial_display.  Set up an
output_initial device, not a termcap display.
(delete_initial_display): New function.
(maybe_fatal): New function, for private use of term_init.
(term_init): New parameter for choosing between fatal and simple errors.
Removed incomprehensible special casing for the second initialization of the
controlling tty.  Use maybe_fatal for error handling.
Initialize termcap display hooks in the new device.
Initialize the display pointer in the tty_display_info structure.
(delete_tty): Replace order of reset_sys_modes and delete_display.

src/window.c (init_window_once): Call make_initial_frame instead of make_terminal_frame.

src/xfaces.c (realize_default_face, realize_face): Don't abort on the bootstrap display device.

src/xterm.c (XTset_terminal_modes, XTreset_terminal_modes): Added display parameter.

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

1 files changed, 29 insertions, 10 deletions

diff --git a/README.multi-tty b/README.multi-tty
index deb56789a7c..cfc1eb974d6 100644
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -1,4 +1,4 @@
-                        -*- coding: utf-8; -*-
+                        -*- coding: utf-8; mode: text; -*-
 GOAL
 ----
 
@@ -131,7 +131,12 @@ THINGS TO DO
    sessions automatically convert the face colors to terminal colors
    when the face is loaded.  This conversion must happen instead on
    the fly in write_glyphs, which might be problematic, as color
-   approximation is done in lisp (term/tty-colors.el).)
+   approximation is currently done in lisp (term/tty-colors.el).)
+
+** frame-creation-function should always create a frame that is on the
+   same display as the selected frame.  Maybe frame-creation-function
+   should simply be removed and make-frame changed to do the right
+   thing.
 
 ** The command `emacsclient -t -e '(delete-frame)'' fails to exit.
 
@@ -141,6 +146,11 @@ THINGS TO DO
    extend emacsclient to handle suspend/resume.  A `kill -STOP' almost
    works right now.)
 
+** If there are no frames on its controlling terminal, Emacs should
+   exit if the uses presses C-c there.  (See the SIGTERM comment in
+   interrupt_signal on why this seems to be impossible to solve
+   generally.)
+
 ** During an X session, Emacs seems to read from stdin.
 
 ** Move baud_rate to struct display.
@@ -152,11 +162,20 @@ THINGS TO DO
    an initial frame.  (The user would connect to it and open frames
    later, with emacsclient.)  Not necessarily a good idea.
 
-** Fix Mac support (I can't do this myself).
+** Fix Mac support (I can't do this myself).  Note that the current
+   state of Mac-specific source files in the multi-tty tree are not
+   useful; before starting work on Mac support, revert to pristine,
+   pre-multi-tty versions.
 
-** Fix W32 support (I can't do this myself).
+** Fix W32 support (I can't do this myself).  Note that the current
+   state of W32-specific source files in the multi-tty tree are not
+   useful; before starting work on W32 support, revert to pristine,
+   pre-multi-tty versions.
 
-** Fix DOS support (I can't do this myself).
+** Fix DOS support (I can't do this myself).  Note that the current
+   state of DOS-specific source files in the multi-tty tree are not
+   useful; before starting work on DOS support, revert to pristine,
+   pre-multi-tty versions.
 
 ** Do a grep on XXX and ?? for more issues.
 
@@ -349,7 +368,7 @@ DIARY OF CHANGES
         while true; do TERM=no-such-terminal-definition emacsclient -h; done
 
    Emacs usually dumps core after a few dozen iterations.  (The bug
-   seems to be related to the xfree()ing or bzero()ing of
+   seems to be related to the xfreeing or bzeroing of
    tty_output.Wcm.  Maybe there are outside references to struct Wcm?
    Why were these vars collected into a struct before multi-tty
    support?)
@@ -358,18 +377,18 @@ DIARY OF CHANGES
    with hypothetical external references to Wcm, or any other
    tty_output component; it was simply that delete_tty closed the
    filehandles of secondary ttys twice, resulting in fclose doubly
-   free()ing memory.  Utterly trivial matter.  I love the C's memory
+   freeing memory.  Utterly trivial matter.  I love the C's memory
    management, it puts hair on your chest.)
 
 -- Support raw secondary terminals.  (Note that SIGIO works only on
-   the controlling terminal.) Hint: extend read_input_waiting() for
+   the controlling terminal.) Hint: extend read_input_waiting for
    multiple ttys and hopefully this will be fixed.
 
    (Done, it seems to have been working already for some time.  It
    seems F_SETOWN does work, after all.  Not sure what made it fail
    earlier, but it seems to be fixed (there were several changes
    around request_sigio, maybe one of them did it).
-   read_input_waiting() is only used in sys_select(), don't change
+   read_input_waiting is only used in sys_select, don't change
    it.)  (Update: After adding X support, it's broken again.)
 
 -- Find out why does Emacs abort when it wants to close its
@@ -381,7 +400,7 @@ DIARY OF CHANGES
    term_init/delete_tty.  The hint was right, in a way.)
 
 -- Issue with SIGIO: it needs to be disabled during redisplay.  See if
-   fcntl() kernel behaviour could be emulated by emacsclient.
+   fcntl kernel behaviour could be emulated by emacsclient.
 
    (Done.  Simply disabled the SIGIO emulation hack in emacsclient.)
    (Update: it was added back.)