Mercurial > emacs
view README.multi-tty @ 82990:2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
lib-src/emacsclient.c (copy_from_to, pty_conversation): Re-added SIGIO
hack. (Sigh.)
lisp/frame.el (make-frame-on-tty): Use make-terminal-frame, not
make-frame.
src/dispnew.c (line_hash_code, line_draw_cost): Updated to use
the new display_method parameters.
(Fredraw_frame): fflush the tty only if f is a termcap frame.
(direct_output_for_insert): Updated to use the new display_method
parameters. fflush the tty only if f is a termcap frame.
(direct_output_forward_char, update_frame_1, scrolling): Ditto.
(update_frame_line, Fding, bitch_at_user): Ditto.
(Fsend_string_to_terminal): Fail if current frame is not on a tty.
(init_display): Frame size change is safe here.
src/frame.c (Vterminal_frame): Restored previously deleted variable.
(syms_of_frame): Initialize it.
(make_terminal_frame): Copy the frame's display_method from tty_display_info.
(Fmake_terminal_frame): Enable simultaneous X and tty frames (buggy).
(Fredirect_frame_focus): Don't call frame_rehighlight_hook if frame
is on a termcap device.
src/frame.h (struct frame): Renamed display to display_method.
(Vterminal_frame): Re-added declaration.
src/keyboard.c (flow_control): Moved to struct tty_display_info.
(read_avail_input): Check ttys even if there is a read_socket_hook.
(Fset_input_mode): Call reset_sys_modes/init_sys_modes and set
flow_control or meta_key only when the frame is a termcap frame.
(Fcurrent_input_mode): Handle flow_control and meta_key right on
non-termcap frames.
src/scroll.c (calculate_scrolling, calculate_direct_scrolling): Update
to use the new display_method parameters.
(scrolling_1, scroll_cost): Ditto.
src/sysdep.c (init_sys_modes, reset_sys_modes): Always set the
terminal parameters if tty_out->input is not stdin. Updated to the
new location of flow_control.
(hft_init): Moved HFT init code to term_init, as it needs the frame.
src/term.c (tty_display_method_template): New variable.
(update_begin): Added rif hack.
(set_terminal_window, ins_del_lines, term_init): Updated to use the
new display_method parameters.
(insert_glyphs, ins_del_lines): Only call insert_glyphs_hook if the
current frame is not on a tty.
(calculate_costs): Don't calculate costs if not on a tty.
(term_dummy_init): Fixed tty->output initialization. Preallocate Wcm
and display_method.
(term_init): Allocate & initialize display_method. Blindly fixed
WINDOWSNT-specific parts. Added HFT-specific initialization
exception from hft_init.
(delete_tty): Only delete termcap frames. Free() the display_method.
src/termchar.h (struct tty_display_info): Moved high-level terminal
characteristics to struct display_method. Added flow_control and
display_method members.
src/termhooks.h (struct display_method): New struct (renamed from
struct device). Added accessor macros.
src/window.c (init_window_once): Initialize Vterminal_frame.
src/xdisp.c (init_iterator, expose_frame): Added rif hack.
(try_window_id): Updated to use the new display_method parameters.
src/xfaces.c (realize_basic_faces): Don't call
x_update_menu_appearance if the frame is a tty frame.
src/xfns.c (Fx_create_frame): Added rif hack. Initialize
display_method.
(x_create_tip_frame): Initialize display_method.
src/xterm.c (x_display_method): New variable.
(x_flush, x_frame_of_widget, XTmouse_position): Ignore non-X frames.
(x_window_to_scroll_bar, x_window_to_menu_bar): Ditto.
(xim_destroy_callback, xim_instantiate_callback): Ditto.
(frame_highlight, frame_unhighlight): Added rif hack.
(x_initialize): Don't initialize rif. Do initialize x_display_method.
src/xterm.h (x_display_method): New declaration.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-30
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 02 Jan 2004 01:15:26 +0000 |
parents | f3845715a5f6 |
children | 2b26656ff804 |
line wrap: on
line source
-*- coding: utf-8; -*- GOAL ---- The ultimate goal of this branch is to implement support for opening multiple, different tty devices and simultaneous X and tty frames from a single Emacs session. WHO IS DOING IT --------------- I'm Károly Lőrentey. My address: lorentey@elte.hu. Patches or suggestions are welcome! Retrieving the latest version of the branch: tla register-archive lorentey@elte.hu--2004 http://lorentey.web.elte.hu/arch/2004/ tla get lorentey@elte.hu--2004/emacs--multi-tty <directory> (I use tla 1.1.) STATUS ------ Basic multi-tty support is there; there are some rough edges, but it already seems to be usable. Emacsclient has been extended to support opening a new terminal frame. To try it out, compile the multi-tty branch with the following commands: mkdir +build cd +build ../configure make bootstrap then start up the emacs server (src/emacs -nw, M-x server-start), and then (from a shell prompt on another terminal) start emacsclient with lib-src/emacsclient -f /optional/file/names... You'll hopefully have two fully working, independent frames on separate terminals. (This seems to be very useful, emacsclient starts up even faster than vi!) :-) You can close the newly opened frame and return to the shell without exiting Emacs by pressing C-x 5 0, i.e., delete-frame. Creating new frames on the same tty with C-x 5 2 works exactly as before. Suspending Emacs is disabled at the moment. If you exit emacs, all terminals should be restored to their previous states. X support is (I hope) working, but at the moment there are problems with simultaneous X and tty devices, so don't do that. Mac, Windows and DOS support is broken, probably doesn't even compile -- this will be solved later. Only tested on my GNU/Linux box. NEWS ---- For the NEWS file: ** Support for multiple terminal devices has been added. You can specify a terminal device (`tty' parameter) and a terminal type (`tty-type' parameter) to `make-terminal-frame'. `tty' must be a terminal device created by the updated emacsclient, or there will be problems with terminal input and window resizes. You can test for the presence of multiple terminal support by testing for the `multi-tty' feature. ** A make-frame-on-tty function has been added to make it easier to create frames on new terminals. ** New functions: frame-tty-name, frame-tty-type for accessing terminal parameters, and delete-tty for closing the terminal device. ** Emacsclient has been extended to support opening a new terminal frame. CHANGELOG --------- See arch logs. DIARY OF CHANGES ---------------- (ex-TODO items with explanations.) -- Introduce a new struct for terminal devices. (Done, see struct tty_output. The list of members is not yet complete.) -- Change the bootstrap procedure to initialize tty_list. (Done, but needs review.) -- Change make-terminal-frame to support specifying another tty. (Done, new frame parameters: `tty' and `tty-type'.) -- Implement support for reading from multiple terminals. (Done, read_avail_input tries to read from each terminal, until one succeeds. MULTI_KBOARD is not used. Secondary terminals don't send SIGIO!) (Update: They do, now.) (Update2: After enabling X, they don't.) -- other-frame should cycle through the frames on the `current' terminal only. (Done, by trivially modifiying next_frame and prev_frame.) -- Support different terminal sizes. (Done, no problem.) -- Make sure terminal resizes are handled gracefully. (Could be problematic.) (Done. We don't get automatic SIGWINCH for additional ttys, though.) -- Extend emacsclient to automatically open a new tty when it connects to Emacs. (Done. It's an ugly hack, needs more work.) -- Redisplay must refresh the topmost frame on *all* terminals, not just the initial terminal. (Done, but introduced an ugly redisplay problems. Ugh.) -- Fix redisplay problems. (Done; it turned out that the entire Wcm structure must be moved inside tty_output. Why didn't I catch this earlier?) -- Provide a way for emacsclient to tell Emacs that the tty has been resized. (Done, simply forward the SIGWINCH signal.) -- Each keypress should automatically select the frame corresponding to the terminal that it was coming from. This means that Emacs must know from which terminal the last keyboard event came from. (Done, it was quite simple, the input event system already supported multiple frames.) -- Fix SIGIO issue with secondary terminals. (Done, emacsclient signals Emacs after writing to the proxy pseudo terminal. Note that this means that multi-tty does not work with raw ttys!) (Update: This is bullshit. There is a read_input_waiting function, extend that somehow.) (Update of update: The first update was not right either, extending read_input_waiting was not necessary. Secondary ttys do seem to send signals on input.) (Update^3: Not any more.) -- Make make-terminal-frame look up the `tty' and `tty-type' frame parameters from the currently selected terminal before the global default. (Done.) -- Put all cached terminal escape sequences into struct tty_output. Currently, they are still stored in global variables, so we don't really support multiple terminal types. (Done. It was not fun.) -- Implement sane error handling after initialization. (Currently emacs exits if you specify a bad terminal type.) The helpful error messages must still be provided when Emacs starts. (Done.) -- Implement terminal deletion, i.e., deleting local frames, closing the tty device and restoring its previous state without exiting Emacs. (Done, but at the moment only called when an error happens during initialization. There is a memory corruption error around this somewhere.) (Update: now it is fully enabled.) -- Implement automatic deletion of terminals when the last frame on that terminal is closed. (Done.) -- Restore tty screen after closing the terminal. (Done, we do the same as Emacs 21.2 for all terminals.) -- 'TERM=dumb src/emacs' does not restore the terminal state. (Done.) -- C-g should work on secondary terminals. (Done, but the binding is not configurable.) -- Deal with SIGHUP in Emacs and in emacsclient. (After this, the server-frames may be removed from server.el.) (Done, nothing to do. It seems that Emacs does not receive SIGHUP from secondary ttys, which is actually a good thing.) (Update: I think it would be a bad idea to remove server-frames anyway.) -- Change emacsclient/server.el to support the -t argument better, i.e. automatically close the socket when the frame is closed. (Seems to be working OK.) -- Fix mysterious memory corruption error with tty deletion. To trigger it, try the following shell command: 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 tty_output.Wcm. Maybe there are outside references to struct Wcm? Why were these vars collected into a struct before multi-tty support?) (Done. Whew. It turned out that the problem had nothing to do 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 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 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 it.) (Update: After adding X support, it's broken again.) -- Find out why does Emacs abort when it wants to close its controlling tty. Hint: chan_process[] array. Hey, maybe noninterrupt-IO would work, too? Update: no, there is no process for stdin/out. (Done. Added add/delete_keyboard_wait_descriptor to 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. (Done. Simply disabled the SIGIO emulation hack in emacsclient.) (Update: it was added back.) -- server.el: There are issues with saving files in buffers of closed clients. Try editing a file with emacsclient -f, and (without saving it) do a delete-frame. The frame is closed without question, and a surprising confirmation prompt appears in another frame. (Done. delete-frame now asks for confirmation if it still has pending buffers, and modified buffers don't seem to be deleted.) -- emacsclient.el, server.el: Handle eval or file open errors when doing -t. (Done.) -- Make parts of struct tty_output accessible from Lisp. The device name and the type is sufficient. (Done, see frame-tty-name and frame-tty-type.) -- Export delete_tty to the Lisp environment, for emacsclient. (Done, see delete-tty.) -- Get rid of the accessor macros in termchar.h, or define macros for all members. (Done.) -- Move device-specific parameters (like costs) commonly used by device backends to a common, device-dependent structure. (Done. See struct display_method in termhooks.h.) -- Fix X support. (Done. Well, it seems to be working.) -- Allow simultaneous X and tty frames. (Handling input could be tricky. Or maybe not.) (Done. Allowed, that is. It is currently extremely unstable, to the point of being unusable. The rif variable causes constant core dumps. Handling input is indeed tricky.) THINGS TO DO ------------ ** Fix rif issue with X-tty combo sessions. IMHO the best thing to do is to get rid of that global variable (and use the value value in display_method, which is guaranteed to be correct). ** Fix faces on tty frames during X-tty combo sessions. ** Find out the best way to support suspending Emacs with multiple ttys. My guess: disable it on the controlling tty, but from other ttys pass it on to emacsclient somehow. (It is (I hope) trivial to extend emacsclient to handle suspend/resume. A `kill -STOP' almost works right now.) ** Move baud_rate to tty_output. ** Do tty output through term_hooks, like graphical display backends. ** Implement support for starting an interactive Emacs session without an initial frame. (The user would connect to it and open frames later, with emacsclient.) Not necessarily a good idea. ** Fix input from raw ttys (again). ** Fix Mac support (I can't do this myself). ** Fix W32 support (I can't do this myself). ** Fix DOS support (I can't do this myself). ** Do a grep on XXX and ?? for more issues. ** Understand Emacs's low-level input system (it seems complicated) :-) and maybe rewrite multi-tty input in terms of MULTI_KBOARD. (Update: This backtrace from a tty-X combo session hints that this may be necessary.) #0 abort () at /home/lorentey/work/emacs/emacs--multi-tty/src/emacs.c:417 #1 0x081104fb in read_char (commandflag=0, nmaps=0, maps=0x0, prev_event=675499188, used_mouse_menu=0x0) at /home/lorentey/work/emacs/emacs--multi-tty/src/keyboard.c:2581 #2 0x0819f23e in read_filtered_event (no_switch_frame=1, ascii_required=0, error_nonascii=0, input_method=0) at /home/lorentey/work/emacs/emacs--multi-tty/src/lread.c:468 #3 0x0819387c in Fy_or_n_p (prompt=1759896324) at /home/lorentey/work/emacs/emacs--multi-tty/src/fns.c:3115 ... ** What does interrupt_input do? I tried to disable it for raw secondary tty support, but it does not seem to do anything useful. (Update: Look again. X unconditionally enables this, maybe that's why raw terminal support is broken again. I really do need to understand input.) ** 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 fell into a loop eating 100% of CPU time. Strace showed this loop: getpid() = 30284 kill(30284, SIGIO) = 0 --- SIGIO (I/O possible) @ 0 (0) --- ioctl(6, FIONREAD, [0]) = -1 EIO (Input/output error) ioctl(5, FIONREAD, [0]) = -1 EIO (Input/output error) ioctl(0, FIONREAD, [0]) = 0 sigreturn() = ? (mask now []) gettimeofday({1072842297, 747760}, NULL) = 0 gettimeofday({1072842297, 747806}, NULL) = 0 select(9, [0 3 5 6], NULL, NULL, {0, 0}) = 2 (in [5 6], left {0, 0}) select(9, [0 3 5 6], NULL, NULL, {0, 0}) = 2 (in [5 6], left {0, 0}) gettimeofday({1072842297, 748245}, NULL) = 0 I have not been able to reproduce this. ;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d