Mercurial > hg > xemacs-beta
view src/console-tty.h @ 853:2b6fa2618f76
[xemacs-hg @ 2002-05-28 08:44:22 by ben]
merge my stderr-proc ws
make-docfile.c: Fix places where we forget to check for EOF.
code-init.el: Don't use CRLF conversion by default on process output. CMD.EXE and
friends work both ways but Cygwin programs don't like the CRs.
code-process.el, multicast.el, process.el: Removed.
Improvements to call-process-internal:
-- allows a buffer to be specified for input and stderr output
-- use it on all systems
-- implement C-g as documented
-- clean up and comment
call-process-region uses new call-process facilities; no temp file.
remove duplicate funs in process.el.
comment exactly how coding systems work and fix various problems.
open-multicast-group now does similar coding-system frobbing to
open-network-stream.
dumped-lisp.el, faces.el, msw-faces.el: Fix some hidden errors due to code not being defined at the right time.
xemacs.mak: Add -DSTRICT.
================================================================
ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES
================================================================
Standard output and standard error can be processed separately in
a process. Each can have its own buffer, its own mark in that buffer,
and its filter function. You can specify a separate buffer for stderr
in `start-process' to get things started, or use the new primitives:
set-process-stderr-buffer
process-stderr-buffer
process-stderr-mark
set-process-stderr-filter
process-stderr-filter
Also, process-send-region takes a 4th optional arg, a buffer.
Currently always uses a pipe() under Unix to read the error output.
(#### Would a PTY be better?)
sysdep.h, sysproc.h, unexfreebsd.c, unexsunos4.c, nt.c, emacs.c, callproc.c, symsinit.h, sysdep.c, Makefile.in.in, process-unix.c: Delete callproc.c. Move child_setup() to process-unix.c.
wait_for_termination() now only needed on a few really old systems.
console-msw.h, event-Xt.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.h, process-nt.c, process-unix.c, process.c, process.h, procimpl.h: Rewrite the process methods to handle a separate channel for
error input. Create Lstreams for reading in the error channel.
Many process methods need change. In general the changes are
fairly clear as they involve duplicating what's used for reading
the normal stdout and changing for stderr -- although tedious,
as such changes are required throughout the entire process code.
Rewrote the code that reads process output to do two loops, one
for stdout and one for stderr.
gpmevent.c, tooltalk.c: set_process_filter takes an argument for stderr.
================================================================
NEW ERROR-TRAPPING MECHANISM
================================================================
Totally rewrite error trapping code to be unified and support more
features. Basic function is call_trapping_problems(), which lets
you specify, by means of flags, what sorts of problems you want
trapped. these can include
-- quit
-- errors
-- throws past the function
-- creation of "display objects" (e.g. buffers)
-- deletion of already-existing "display objects" (e.g. buffers)
-- modification of already-existing buffers
-- entering the debugger
-- gc
-- errors->warnings (ala suspended errors)
etc. All other error funs rewritten in terms of this one.
Various older mechanisms removed or rewritten.
window.c, insdel.c, console.c, buffer.c, device.c, frame.c: When creating a display object, added call to
note_object_created(), for use with trapping_problems mechanism.
When deleting, call check_allowed_operation() and note_object
deleted().
The trapping-problems code records the objects created since the
call-trapping-problems began. Those objects can be deleted, but
none others (i.e. previously existing ones).
bytecode.c, cmdloop.c: internal_catch takes another arg.
eval.c: Add long comments describing the "five lists" used to maintain
state (backtrace, gcpro, specbind, etc.) in the Lisp engine.
backtrace.h, eval.c: Implement trapping-problems mechanism, eliminate old mechanisms or
redo in terms of new one.
frame.c, gutter.c: Flush out the concept of "critical display section", defined by
the in_display() var. Use an internal_bind() to get it reset,
rather than just doing it at end, because there may be a non-local
exit.
event-msw.c, event-stream.c, console-msw.h, device.c, dialog-msw.c, frame.c, frame.h, intl.c, toolbar.c, menubar-msw.c, redisplay.c, alloc.c, menubar-x.c: Make use of new trapping-errors stuff and rewrite code based on
old mechanisms.
glyphs-widget.c, redisplay.h: Protect calling Lisp in redisplay.
insdel.c: Protect hooks against deleting existing buffers.
frame-msw.c: Use EQ, not EQUAL in hash tables whose keys are just numbers.
Otherwise we run into stickiness in redisplay because
internal_equal() can QUIT.
================================================================
SIGNAL, C-G CHANGES
================================================================
Here we change the way that C-g interacts with event reading. The
idea is that a C-g occurring while we're reading a user event
should be read as C-g, but elsewhere should be a QUIT. The former
code did all sorts of bizarreness -- requiring that no QUIT occurs
anywhere in event-reading code (impossible to enforce given the
stuff called or Lisp code invoked), and having some weird system
involving enqueue/dequeue of a C-g and interaction with Vquit_flag
-- and it didn't work.
Now, we simply enclose all code where we want C-g read as an event
with {begin/end}_dont_check_for_quit(). This completely turns off
the mechanism that checks (and may remove or alter) C-g in the
read-ahead queues, so we just get the C-g normal.
Signal.c documents this very carefully.
cmdloop.c: Correct use of dont_check_for_quit to new scheme, remove old
out-of-date comments.
event-stream.c: Fix C-g handling to actually work.
device-x.c: Disable quit checking when err out.
signal.c: Cleanup. Add large descriptive comment.
process-unix.c, process-nt.c, sysdep.c: Use QUIT instead of REALLY_QUIT.
It's not necessary to use REALLY_QUIT and just confuses the issue.
lisp.h: Comment quit handlers.
================================================================
CONS CHANGES
================================================================
free_cons() now takes a Lisp_Object not the result of XCONS().
car and cdr have been renamed so that they don't get used directly;
go through XCAR(), XCDR() instead.
alloc.c, dired.c, editfns.c, emodules.c, fns.c, glyphs-msw.c, glyphs-x.c, glyphs.c, keymap.c, minibuf.c, search.c, eval.c, lread.c, lisp.h: Correct free_cons calling convention: now takes Lisp_Object,
not Lisp_Cons
chartab.c: Eliminate direct use of ->car, ->cdr, should be black box.
callint.c: Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons.
================================================================
USE INTERNAL-BIND-*
================================================================
eval.c: Cleanups of these funs.
alloc.c, fileio.c, undo.c, specifier.c, text.c, profile.c, lread.c, redisplay.c, menubar-x.c, macros.c: Rewrote to use internal_bind_int() and internal_bind_lisp_object()
in place of whatever varied and cumbersome mechanisms were
formerly there.
================================================================
SPECBIND SANITY
================================================================
backtrace.h: - Improved comments
backtrace.h, bytecode.c, eval.c: Add new mechanism check_specbind_stack_sanity() for sanity
checking code each time the catchlist or specbind stack change.
Removed older prototype of same mechanism.
================================================================
MISC
================================================================
lisp.h, insdel.c, window.c, device.c, console.c, buffer.c: Fleshed out authorship.
device-msw.c: Correct bad Unicode-ization.
print.c: Be more careful when not initialized or in fatal error handling.
search.c: Eliminate running_asynch_code, an FSF holdover.
alloc.c: Added comments about gc-cons-threshold.
dialog-x.c: Use begin_gc_forbidden() around code to build up a widget value
tree, like in menubar-x.c.
gui.c: Use Qunbound not Qnil as the default for
gethash.
lisp-disunion.h, lisp-union.h: Added warnings on use of VOID_TO_LISP().
lisp.h: Use ERROR_CHECK_STRUCTURES to turn on
ERROR_CHECK_TRAPPING_PROBLEMS and ERROR_CHECK_TYPECHECK
lisp.h: Add assert_with_message.
lisp.h: Add macros for gcproing entire arrays. (You could do this before
but it required manual twiddling the gcpro structure.)
lisp.h: Add prototypes for new functions defined elsewhere.
author | ben |
---|---|
date | Tue, 28 May 2002 08:45:36 +0000 |
parents | 190b164ddcac |
children | 84762348c6f9 |
line wrap: on
line source
/* Define TTY specific console, device, and frame object for XEmacs. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1996 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Written by Chuck Thompson and Ben Wing. */ /* NOTE: Currently each TTY console can have only one device. Therefore, all stuff for both input and output is lumped into the console structure. If it ever becomes meaningful to have more than one device on a TTY console, the output stuff will have to get separated out. */ #ifndef INCLUDED_console_tty_h_ #define INCLUDED_console_tty_h_ #include "console.h" #include "syssignal.h" /* Always include before systty.h */ #include "systty.h" DECLARE_CONSOLE_TYPE (tty); struct tty_console { int infd, outfd; Lisp_Object instream, outstream; Lisp_Object terminal_type; Lisp_Object controlling_process; char *term_entry_buffer; /* Physical location of cursor on this console. */ int cursor_x; int cursor_y; /* The real location of the cursor. The above physical location may be ahead of where we really are. */ int real_cursor_x; int real_cursor_y; int final_cursor_x; int final_cursor_y; int height; int width; /* The count of frame number. */ int frame_count; /* flags indicating presence, absence or value of various features */ struct { unsigned int must_write_spaces :1; /* terminal inserts nulls, not spaces to fill whitespace on screen */ unsigned int insert_mode_motion :1; /* cursor movement commands work while in insert mode */ unsigned int standout_motion :1; /* cursor movement is graceful in standout or underline mode */ unsigned int memory_above_frame :1; /* display retained above screen */ unsigned int memory_below_frame :1; /* display retained below screen */ unsigned int meta_key :2; /* 0 == mask off top bit; 1 == top bit is meta; 2 == top bit is useful as character info */ unsigned int flow_control :1; /* Nonzero means use ^S/^Q as cretinous flow control. */ int standout_width; /* # of spaces printed when change to standout mode */ int underline_width; /* # of spaces printed when change to underline mode */ } flags; /* cursor motion entries - each entry is commented with the terminfo and the termcap entry */ struct { /* local cursor movement */ const char *up; /* cuu1, up */ const char *down; /* cud1, do */ const char *left; /* cub1, le */ const char *right; /* cuf1, nd */ const char *home; /* home, ho */ const char *low_left; /* ll, ll */ const char *car_return; /* cr, cr */ /* parameterized local cursor movement */ const char *multi_up; /* cuu, UP */ const char *multi_down; /* cud, DO */ const char *multi_left; /* cub, LE */ const char *multi_right; /* cuf, RI */ /* absolute cursor motion */ const char *abs; /* cup, cm */ const char *hor_abs; /* hpa, ch */ const char *ver_abs; /* vpa, cv */ /* scrolling */ const char *scroll_forw; /* ind, sf */ const char *scroll_back; /* ri, sr */ const char *multi_scroll_forw; /* indn, SF */ const char *multi_scroll_back; /* rin, SR */ const char *set_scroll_region; /* csr, cs */ } cm; /* screen editing entries - each entry is commented with the terminfo and the termcap entry */ struct { /* adding to the screen */ const char *ins_line; /* il1, al */ const char *multi_ins_line; /* il, AL */ const char *repeat; /* rep, rp */ const char *begin_ins_mode; /* smir, im */ const char *end_ins_mode; /* rmir, ei */ const char *ins_char; /* ich1, ic */ const char *multi_ins_char; /* ich, IC */ const char *insert_pad; /* ip, ip */ /* deleting from the screen */ const char *clr_frame; /* clear, cl */ const char *clr_from_cursor; /* ed, cd */ const char *clr_to_eol; /* el, ce */ const char *del_line; /* dl1, dl */ const char *multi_del_line; /* dl, DL */ const char *del_char; /* dch1, dc */ const char *multi_del_char; /* dch, DC */ const char *begin_del_mode; /* smdc, dm */ const char *end_del_mode; /* rmdc, ed */ const char *erase_at_cursor; /* ech, ec */ } se; /* screen display entries - each entry is commented with the terminfo and termcap entry */ struct { const char *begin_standout; /* smso, so */ const char *end_standout; /* rmso, se */ const char *begin_underline; /* smul, us */ const char *end_underline; /* rmul, ue */ const char *begin_alternate; /* smacs, as */ const char *end_alternate; /* rmacs, ae */ const char *turn_on_reverse; /* rev, mr */ const char *turn_on_blinking; /* blink, mb */ const char *turn_on_bold; /* bold, md */ const char *turn_on_dim; /* dim, mh */ const char *turn_off_attributes; /* sgr0, me */ const char *visual_bell; /* flash, vb */ const char *audio_bell; /* bel, bl */ const char *cursor_visible; /* cvvis, vs */ const char *cursor_normal; /* cnorm, ve */ const char *init_motion; /* smcup, ti */ const char *end_motion; /* rmcup, te */ const char *keypad_on; /* smkx, ks */ const char *keypad_off; /* rmkx, ke */ const char *orig_pair; /* op, op */ } sd; /* costs of various operations */ struct { int cm_up; int cm_down; int cm_left; int cm_right; int cm_home; int cm_low_left; int cm_car_return; int cm_abs; int cm_hor_abs; int cm_ver_abs; } cost; /* The initial tty mode bits */ struct emacs_tty old_tty; /* Is this TTY our controlling terminal? */ unsigned int controlling_terminal :1; unsigned int is_stdio :1; }; #define CONSOLE_TTY_DATA(c) CONSOLE_TYPE_DATA (c, tty) #define CONSOLE_TTY_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->cursor_x) #define CONSOLE_TTY_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->cursor_y) #define CONSOLE_TTY_REAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->real_cursor_x) #define CONSOLE_TTY_REAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->real_cursor_y) #define CONSOLE_TTY_FINAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->final_cursor_x) #define CONSOLE_TTY_FINAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->final_cursor_y) #define TTY_CM(c) (CONSOLE_TTY_DATA (c)->cm) #define TTY_SE(c) (CONSOLE_TTY_DATA (c)->se) #define TTY_SD(c) (CONSOLE_TTY_DATA (c)->sd) #define TTY_FLAGS(c) (CONSOLE_TTY_DATA (c)->flags) #define TTY_COST(c) (CONSOLE_TTY_DATA (c)->cost) #define TTY_INC_CURSOR_X(c, n) do { \ int TICX_n = (n); \ assert (CONSOLE_TTY_CURSOR_X (c) == CONSOLE_TTY_REAL_CURSOR_X (c)); \ CONSOLE_TTY_CURSOR_X (c) += TICX_n; \ CONSOLE_TTY_REAL_CURSOR_X (c) += TICX_n; \ } while (0) #define TTY_INC_CURSOR_Y(c, n) do { \ int TICY_n = (n); \ CONSOLE_TTY_CURSOR_Y (c) += TICY_n; \ CONSOLE_TTY_REAL_CURSOR_Y (c) += TICY_n; \ } while (0) struct tty_device { #ifdef HAVE_TERMIOS speed_t ospeed; /* Output speed (from sg_ospeed) */ #else short ospeed; /* Output speed (from sg_ospeed) */ #endif }; #define DEVICE_TTY_DATA(d) DEVICE_TYPE_DATA (d, tty) /* termcap requires this to be global */ #ifndef HAVE_TERMIOS extern short ospeed; /* Output speed (from sg_ospeed) */ #endif extern FILE *termscript; EXFUN (Fconsole_tty_controlling_process, 1); /****************** Prototypes from cm.c *******************/ /* #### Verify that all of these are still needed. */ void cm_cost_init (struct console *c); void cmputc (int c); void cmgoto (struct frame *f, int row, int col); extern struct console *cmputc_console; void send_string_to_tty_console (struct console *c, unsigned char *str, int len); /*************** Prototypes from redisplay-tty.c ****************/ enum term_init_status { TTY_UNABLE_OPEN_DATABASE, TTY_TYPE_UNDEFINED, TTY_TYPE_INSUFFICIENT, TTY_SIZE_UNSPECIFIED, TTY_INIT_SUCCESS }; int init_tty_for_redisplay (struct device *d, char *terminal_type); /* #### These should probably be methods. */ void set_tty_modes (struct console *c); void reset_tty_modes (struct console *c); /* Used in sysdep.c to properly clear and position the cursor when exiting. */ void tty_redisplay_shutdown (struct console *c); /* called from console-stream.c */ Lisp_Object tty_semi_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb); Lisp_Object tty_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb); Lisp_Object tty_semi_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb); Lisp_Object tty_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb); struct console * tty_find_console_from_fd (int fd); #endif /* INCLUDED_console_tty_h_ */