Mercurial > hg > xemacs-beta
annotate src/console-stream.c @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 804517e16990 |
children | e22b0213b713 |
rev | line source |
---|---|
428 | 1 /* Stream device functions. |
2 Copyright (C) 1995 Free Software Foundation, Inc. | |
771 | 3 Copyright (C) 1996, 2001 Ben Wing. |
428 | 4 |
5 This file is part of XEmacs. | |
6 | |
7 XEmacs is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
9 Free Software Foundation; either version 2, or (at your option) any | |
10 later version. | |
11 | |
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with XEmacs; see the file COPYING. If not, write to | |
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
20 Boston, MA 02111-1307, USA. */ | |
21 | |
22 /* Synched up with: Not in FSF. */ | |
23 | |
24 /* This file has been Mule-ized. */ | |
25 | |
26 /* Written by Ben Wing. */ | |
27 | |
28 #include <config.h> | |
29 #include "lisp.h" | |
30 | |
872 | 31 #include "device-impl.h" |
428 | 32 #include "events.h" |
872 | 33 #include "frame-impl.h" |
428 | 34 #include "redisplay.h" |
35 #include "sysdep.h" | |
800 | 36 #include "window.h" |
37 | |
872 | 38 #include "console-stream-impl.h" |
800 | 39 #include "console-tty.h" |
40 | |
428 | 41 #include "sysfile.h" |
42 | |
43 DEFINE_CONSOLE_TYPE (stream); | |
44 | |
45 Lisp_Object Vterminal_console; | |
46 Lisp_Object Vterminal_device; | |
47 Lisp_Object Vterminal_frame; | |
48 | |
49 Lisp_Object Vstdio_str; | |
50 | |
51 static void | |
52 stream_init_console (struct console *con, Lisp_Object params) | |
53 { | |
54 Lisp_Object tty = CONSOLE_CONNECTION (con); | |
55 struct stream_console *stream_con; | |
56 | |
57 if (CONSOLE_STREAM_DATA (con) == NULL) | |
58 CONSOLE_STREAM_DATA (con) = xnew (struct stream_console); | |
59 | |
60 stream_con = CONSOLE_STREAM_DATA (con); | |
61 | |
62 stream_con->needs_newline = 0; | |
63 | |
64 /* Open the specified console */ | |
65 if (NILP (tty) || internal_equal (tty, Vstdio_str, 0)) | |
66 { | |
67 stream_con->in = stdin; | |
68 stream_con->out = stdout; | |
69 stream_con->err = stderr; | |
70 } | |
71 else | |
72 { | |
73 CHECK_STRING (tty); | |
74 stream_con->in = stream_con->out = stream_con->err = | |
442 | 75 /* #### We don't currently do coding-system translation on |
76 this descriptor. */ | |
771 | 77 qxe_fopen (XSTRING_DATA (tty), READ_PLUS_TEXT); |
428 | 78 if (!stream_con->in) |
563 | 79 signal_error (Qio_error, "Unable to open tty", tty); |
428 | 80 } |
81 } | |
82 | |
83 static void | |
84 stream_init_device (struct device *d, Lisp_Object params) | |
85 { | |
86 struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); | |
87 | |
88 DEVICE_INFD (d) = fileno (CONSOLE_STREAM_DATA (con)->in); | |
89 DEVICE_OUTFD (d) = fileno (CONSOLE_STREAM_DATA (con)->out); | |
90 init_baud_rate (d); | |
91 init_one_device (d); | |
92 } | |
93 | |
94 static int | |
95 stream_initially_selected_for_input (struct console *con) | |
96 { | |
97 return noninteractive && initialized; | |
98 } | |
99 | |
100 extern int stdout_needs_newline; | |
101 | |
102 static void | |
103 stream_delete_console (struct console *con) | |
104 { | |
105 struct stream_console *stream_con = CONSOLE_STREAM_DATA (con); | |
106 if (stream_con) | |
107 { | |
108 if (/* stream_con->needs_newline */ | |
109 stdout_needs_newline) /* #### clean this up */ | |
110 { | |
111 fputc ('\n', stream_con->out); | |
112 fflush (stream_con->out); | |
113 } | |
114 if (stream_con->in != stdin) | |
771 | 115 retry_fclose (stream_con->in); |
428 | 116 |
117 xfree (stream_con); | |
118 CONSOLE_STREAM_DATA (con) = NULL; | |
119 } | |
120 } | |
121 | |
122 Lisp_Object | |
123 stream_semi_canonicalize_console_connection (Lisp_Object connection, | |
578 | 124 Error_Behavior errb) |
428 | 125 { |
126 return NILP (connection) ? Vstdio_str : connection; | |
127 } | |
128 | |
129 Lisp_Object | |
130 stream_canonicalize_console_connection (Lisp_Object connection, | |
578 | 131 Error_Behavior errb) |
428 | 132 { |
133 if (NILP (connection) || internal_equal (connection, Vstdio_str, 0)) | |
134 return Vstdio_str; | |
135 | |
136 if (!ERRB_EQ (errb, ERROR_ME)) | |
137 { | |
138 if (!STRINGP (connection)) | |
139 return Qunbound; | |
140 } | |
141 else | |
142 CHECK_STRING (connection); | |
143 | |
144 return Ffile_truename (connection, Qnil); | |
145 } | |
146 | |
147 Lisp_Object | |
148 stream_semi_canonicalize_device_connection (Lisp_Object connection, | |
578 | 149 Error_Behavior errb) |
428 | 150 { |
151 return stream_semi_canonicalize_console_connection (connection, errb); | |
152 } | |
153 | |
154 Lisp_Object | |
155 stream_canonicalize_device_connection (Lisp_Object connection, | |
578 | 156 Error_Behavior errb) |
428 | 157 { |
158 return stream_canonicalize_console_connection (connection, errb); | |
159 } | |
160 | |
161 | |
162 static void | |
771 | 163 stream_init_frame_1 (struct frame *f, Lisp_Object props, |
164 int frame_name_is_defaulted) | |
428 | 165 { |
166 #if 0 | |
167 struct device *d = XDEVICE (FRAME_DEVICE (f)); | |
168 if (!NILP (DEVICE_FRAME_LIST (d))) | |
563 | 169 invalid_operation ("Only one frame allowed on stream devices", Qunbound); |
428 | 170 #endif |
771 | 171 if (frame_name_is_defaulted) |
172 f->name = build_string ("stream"); | |
428 | 173 f->height = 80; |
174 f->width = 24; | |
175 f->visible = 0; /* so redisplay doesn't try to do anything */ | |
176 } | |
177 | |
178 | |
179 static int | |
180 stream_text_width (struct frame *f, struct face_cachel *cachel, | |
867 | 181 const Ichar *str, Charcount len) |
428 | 182 { |
183 return len; | |
184 } | |
185 | |
186 static int | |
187 stream_left_margin_width (struct window *w) | |
188 { | |
189 return 0; | |
190 } | |
191 | |
192 static int | |
193 stream_right_margin_width (struct window *w) | |
194 { | |
195 return 0; | |
196 } | |
197 | |
198 static int | |
199 stream_divider_height (void) | |
200 { | |
201 return 1; | |
202 } | |
203 | |
204 static int | |
205 stream_eol_cursor_width (void) | |
206 { | |
207 return 1; | |
208 } | |
209 | |
210 static void | |
211 stream_output_display_block (struct window *w, struct display_line *dl, | |
212 int block, int start, int end, | |
213 int start_pixpos, int cursor_start, | |
214 int cursor_width, int cursor_height) | |
215 { | |
216 } | |
217 | |
218 static void | |
219 stream_clear_region (Lisp_Object window, struct device* d, struct frame * f, | |
826 | 220 face_index findex, int x, int y, |
221 int width, int height, Lisp_Object fcolor, | |
222 Lisp_Object bcolor, Lisp_Object background_pixmap) | |
428 | 223 { |
224 } | |
225 | |
226 static int | |
227 stream_flash (struct device *d) | |
228 { | |
229 return 0; /* sorry can't do it */ | |
230 } | |
231 | |
232 static void | |
233 stream_ring_bell (struct device *d, int volume, int pitch, int duration) | |
234 { | |
235 struct console *c = XCONSOLE (DEVICE_CONSOLE (d)); | |
826 | 236 /* Don't output ^G when not a TTY -- in particular, under MS Windows, ^G |
237 is interpreted as bell by the console, but not when running under | |
238 VC++. Probably this would be the same under Unix. */ | |
239 if (isatty (fileno (CONSOLE_STREAM_DATA (c)->out))) | |
240 { | |
241 fputc (07, CONSOLE_STREAM_DATA (c)->out); | |
242 fflush (CONSOLE_STREAM_DATA (c)->out); | |
243 } | |
428 | 244 } |
245 | |
246 | |
247 /************************************************************************/ | |
248 /* initialization */ | |
249 /************************************************************************/ | |
250 | |
251 void | |
252 console_type_create_stream (void) | |
253 { | |
254 INITIALIZE_CONSOLE_TYPE (stream, "stream", "console-stream-p"); | |
255 | |
256 /* console methods */ | |
257 CONSOLE_HAS_METHOD (stream, init_console); | |
258 CONSOLE_HAS_METHOD (stream, initially_selected_for_input); | |
259 CONSOLE_HAS_METHOD (stream, delete_console); | |
260 CONSOLE_HAS_METHOD (stream, canonicalize_console_connection); | |
261 CONSOLE_HAS_METHOD (stream, canonicalize_device_connection); | |
262 CONSOLE_HAS_METHOD (stream, semi_canonicalize_console_connection); | |
263 CONSOLE_HAS_METHOD (stream, semi_canonicalize_device_connection); | |
264 | |
265 /* device methods */ | |
266 CONSOLE_HAS_METHOD (stream, init_device); | |
267 | |
268 /* frame methods */ | |
269 CONSOLE_HAS_METHOD (stream, init_frame_1); | |
270 | |
271 /* redisplay methods */ | |
272 CONSOLE_HAS_METHOD (stream, left_margin_width); | |
273 CONSOLE_HAS_METHOD (stream, right_margin_width); | |
274 CONSOLE_HAS_METHOD (stream, text_width); | |
275 CONSOLE_HAS_METHOD (stream, output_display_block); | |
276 CONSOLE_HAS_METHOD (stream, divider_height); | |
277 CONSOLE_HAS_METHOD (stream, eol_cursor_width); | |
278 CONSOLE_HAS_METHOD (stream, clear_region); | |
279 CONSOLE_HAS_METHOD (stream, flash); | |
280 CONSOLE_HAS_METHOD (stream, ring_bell); | |
281 } | |
282 | |
283 void | |
284 reinit_console_type_create_stream (void) | |
285 { | |
286 REINITIALIZE_CONSOLE_TYPE (stream); | |
287 } | |
288 | |
289 void | |
290 vars_of_console_stream (void) | |
291 { | |
292 DEFVAR_LISP ("terminal-console", &Vterminal_console /* | |
444 | 293 The initial console object, which represents XEmacs' stdout. |
428 | 294 */ ); |
295 Vterminal_console = Qnil; | |
296 | |
297 DEFVAR_LISP ("terminal-device", &Vterminal_device /* | |
444 | 298 The initial device object, which represents XEmacs' stdout. |
428 | 299 */ ); |
300 Vterminal_device = Qnil; | |
301 | |
302 DEFVAR_LISP ("terminal-frame", &Vterminal_frame /* | |
444 | 303 The initial frame object, which represents XEmacs' stdout. |
428 | 304 */ ); |
305 Vterminal_frame = Qnil; | |
306 | |
307 /* Moved from console-tty.c */ | |
308 Vstdio_str = build_string ("stdio"); | |
309 staticpro (&Vstdio_str); | |
310 } | |
311 | |
312 #ifndef PDUMP | |
313 void | |
442 | 314 init_console_stream (int reinit) |
428 | 315 { |
316 /* This function can GC */ | |
317 if (!initialized) | |
318 { | |
319 Vterminal_device = Fmake_device (Qstream, Qnil, Qnil); | |
320 Vterminal_console = Fdevice_console (Vterminal_device); | |
321 Vterminal_frame = Fmake_frame (Qnil, Vterminal_device); | |
322 minibuf_window = XFRAME (Vterminal_frame)->minibuffer_window; | |
323 } | |
324 else | |
325 { | |
326 /* Re-initialize the FILE fields of the console. */ | |
327 stream_init_console (XCONSOLE (Vterminal_console), Qnil); | |
328 if (noninteractive) | |
329 event_stream_select_console (XCONSOLE (Vterminal_console)); | |
330 } | |
331 } | |
332 | |
333 #else | |
334 | |
335 void | |
442 | 336 init_console_stream (int reinit) |
428 | 337 { |
338 /* This function can GC */ | |
442 | 339 if (!reinit) |
340 { | |
341 Vterminal_device = Fmake_device (Qstream, Qnil, Qnil); | |
342 Vterminal_console = Fdevice_console (Vterminal_device); | |
343 Vterminal_frame = Fmake_frame (Qnil, Vterminal_device); | |
344 minibuf_window = XFRAME (Vterminal_frame)->minibuffer_window; | |
345 } | |
428 | 346 if (initialized) |
347 { | |
348 stream_init_console (XCONSOLE (Vterminal_console), Qnil); | |
349 if (noninteractive) | |
350 event_stream_select_console (XCONSOLE (Vterminal_console)); | |
351 } | |
352 } | |
353 #endif |