Mercurial > hg > xemacs-beta
comparison src/console-tty.c @ 802:19dfb459d51a
[xemacs-hg @ 2002-04-03 10:47:37 by ben]
fix tty problem et al
internals/internals.texi: Add section on correctly merging a branch back into the trunk.
console-tty.c, eval.c, event-unixoid.c, file-coding.c, file-coding.h, lisp.h, print.c, sysdep.c: Fix data corruption error in print.c from print_depth becoming
negative. Borrow primitives internal_bind_int,
internal_bind_lisp_object from my stderr-proc ws, soon to be
integrated; use them to properly bind print_depth et al.
First fix for TTY problem. The basic problem is I switched things
so that the TTY I/O is filtered through a coding system, for the
support of kterm and such, that speak JIS or similar
encodings. (#### I ***swear*** I had this working way back in
19.12.) Anyway, this introduced buffering issues, in which instead
of one char being read, it tried to read 1024 chars. I tried
setting the stdin descriptor non-blocking, but it doesn't appear
to work on Cygwin. (#### Andy, do you know anything about this?)
So I fixed it elsewhere. If you get weirdness on the TTY, look in
console-tty.c and see how it gets the coding system; maybe there's
a way to change it (and if not, there should be!).
Also fix warning in sysdep.c.
author | ben |
---|---|
date | Wed, 03 Apr 2002 10:47:52 +0000 |
parents | a5954632b187 |
children | a634e3b7acc8 |
comparison
equal
deleted
inserted
replaced
801:2b676dc88c66 | 802:19dfb459d51a |
---|---|
109 if (tty_con->infd < 0) | 109 if (tty_con->infd < 0) |
110 signal_error (Qio_error, "Unable to open tty", tty); | 110 signal_error (Qio_error, "Unable to open tty", tty); |
111 tty_con->is_stdio = 0; | 111 tty_con->is_stdio = 0; |
112 } | 112 } |
113 | 113 |
114 /* set_descriptor_non_blocking (tty_con->infd); */ | |
114 tty_con->instream = make_filedesc_input_stream (tty_con->infd, 0, -1, 0); | 115 tty_con->instream = make_filedesc_input_stream (tty_con->infd, 0, -1, 0); |
115 Lstream_set_buffering (XLSTREAM (tty_con->instream), LSTREAM_UNBUFFERED, 0); | 116 Lstream_set_buffering (XLSTREAM (tty_con->instream), LSTREAM_UNBUFFERED, 0); |
116 tty_con->instream = | 117 tty_con->instream = |
117 make_coding_input_stream (XLSTREAM (tty_con->instream), | 118 make_coding_input_stream (XLSTREAM (tty_con->instream), |
118 get_coding_system_for_text_file (Qkeyboard, 0), | 119 get_coding_system_for_text_file (Qkeyboard, 0), |
119 CODING_DECODE, 0); | 120 CODING_DECODE, CODE_FL_READ_ONE_BYTE_AT_A_TIME); |
120 Lstream_set_buffering (XLSTREAM (tty_con->instream), LSTREAM_UNBUFFERED, 0); | 121 Lstream_set_buffering (XLSTREAM (tty_con->instream), LSTREAM_UNBUFFERED, 0); |
121 Lstream_set_character_mode (XLSTREAM (tty_con->instream)); | 122 Lstream_set_character_mode (XLSTREAM (tty_con->instream)); |
122 tty_con->outstream = make_filedesc_output_stream (tty_con->outfd, 0, -1, 0); | 123 tty_con->outstream = make_filedesc_output_stream (tty_con->outfd, 0, -1, 0); |
123 tty_con->outstream = | 124 tty_con->outstream = |
124 make_coding_output_stream (XLSTREAM (tty_con->outstream), | 125 make_coding_output_stream (XLSTREAM (tty_con->outstream), |