Mercurial > hg > xemacs-beta
annotate src/console-tty-impl.h @ 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 | |
children | 141c2920ea48 |
rev | line source |
---|---|
872 | 1 /* Define TTY specific console, device, and frame object for XEmacs. |
2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
3 Copyright (C) 1996 Ben Wing. | |
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 /* Written by Chuck Thompson and Ben Wing. */ | |
25 | |
26 /* NOTE: Currently each TTY console can have only one device. | |
27 Therefore, all stuff for both input and output is lumped into | |
28 the console structure. If it ever becomes meaningful to | |
29 have more than one device on a TTY console, the output stuff | |
30 will have to get separated out. */ | |
31 | |
32 #ifndef INCLUDED_console_tty_impl_h_ | |
33 #define INCLUDED_console_tty_impl_h_ | |
34 | |
35 #include "console-impl.h" | |
36 #include "console-tty.h" | |
37 | |
38 DECLARE_CONSOLE_TYPE (tty); | |
39 | |
40 struct tty_console | |
41 { | |
42 int infd, outfd; | |
43 Lisp_Object instream, outstream; | |
44 Lisp_Object terminal_type; | |
45 Lisp_Object controlling_process; | |
46 char *term_entry_buffer; | |
47 | |
48 /* Physical location of cursor on this console. */ | |
49 int cursor_x; | |
50 int cursor_y; | |
51 | |
52 /* The real location of the cursor. The above physical location may | |
53 be ahead of where we really are. */ | |
54 int real_cursor_x; | |
55 int real_cursor_y; | |
56 | |
57 int final_cursor_x; | |
58 int final_cursor_y; | |
59 | |
60 int height; | |
61 int width; | |
62 | |
63 /* The count of frame number. */ | |
64 int frame_count; | |
65 | |
66 /* flags indicating presence, absence or value of various features */ | |
67 struct | |
68 { | |
69 unsigned int must_write_spaces :1; /* terminal inserts nulls, not | |
70 spaces to fill whitespace on | |
71 screen */ | |
72 unsigned int insert_mode_motion :1; /* cursor movement commands | |
73 work while in insert mode */ | |
74 unsigned int standout_motion :1; /* cursor movement is graceful | |
75 in standout or underline mode */ | |
76 unsigned int memory_above_frame :1; /* display retained above screen */ | |
77 unsigned int memory_below_frame :1; /* display retained below screen */ | |
78 unsigned int meta_key :2; /* 0 == mask off top bit; | |
79 1 == top bit is meta; | |
80 2 == top bit is useful as | |
81 character info */ | |
82 unsigned int flow_control :1; /* Nonzero means use ^S/^Q as | |
83 cretinous flow control. */ | |
84 int standout_width; /* # of spaces printed when | |
85 change to standout mode */ | |
86 int underline_width; /* # of spaces printed when | |
87 change to underline mode */ | |
88 } flags; | |
89 | |
90 /* cursor motion entries - each entry is commented with the terminfo | |
91 and the termcap entry */ | |
92 struct | |
93 { | |
94 /* local cursor movement */ | |
95 const char *up; /* cuu1, up */ | |
96 const char *down; /* cud1, do */ | |
97 const char *left; /* cub1, le */ | |
98 const char *right; /* cuf1, nd */ | |
99 const char *home; /* home, ho */ | |
100 const char *low_left; /* ll, ll */ | |
101 const char *car_return; /* cr, cr */ | |
102 | |
103 /* parameterized local cursor movement */ | |
104 const char *multi_up; /* cuu, UP */ | |
105 const char *multi_down; /* cud, DO */ | |
106 const char *multi_left; /* cub, LE */ | |
107 const char *multi_right; /* cuf, RI */ | |
108 | |
109 /* absolute cursor motion */ | |
110 const char *abs; /* cup, cm */ | |
111 const char *hor_abs; /* hpa, ch */ | |
112 const char *ver_abs; /* vpa, cv */ | |
113 | |
114 /* scrolling */ | |
115 const char *scroll_forw; /* ind, sf */ | |
116 const char *scroll_back; /* ri, sr */ | |
117 const char *multi_scroll_forw; /* indn, SF */ | |
118 const char *multi_scroll_back; /* rin, SR */ | |
119 const char *set_scroll_region; /* csr, cs */ | |
120 } cm; | |
121 | |
122 /* screen editing entries - each entry is commented with the | |
123 terminfo and the termcap entry */ | |
124 struct | |
125 { | |
126 /* adding to the screen */ | |
127 const char *ins_line; /* il1, al */ | |
128 const char *multi_ins_line; /* il, AL */ | |
129 const char *repeat; /* rep, rp */ | |
130 const char *begin_ins_mode; /* smir, im */ | |
131 const char *end_ins_mode; /* rmir, ei */ | |
132 const char *ins_char; /* ich1, ic */ | |
133 const char *multi_ins_char; /* ich, IC */ | |
134 const char *insert_pad; /* ip, ip */ | |
135 | |
136 /* deleting from the screen */ | |
137 const char *clr_frame; /* clear, cl */ | |
138 const char *clr_from_cursor; /* ed, cd */ | |
139 const char *clr_to_eol; /* el, ce */ | |
140 const char *del_line; /* dl1, dl */ | |
141 const char *multi_del_line; /* dl, DL */ | |
142 const char *del_char; /* dch1, dc */ | |
143 const char *multi_del_char; /* dch, DC */ | |
144 const char *begin_del_mode; /* smdc, dm */ | |
145 const char *end_del_mode; /* rmdc, ed */ | |
146 const char *erase_at_cursor; /* ech, ec */ | |
147 } se; | |
148 | |
149 /* screen display entries - each entry is commented with the | |
150 terminfo and termcap entry */ | |
151 struct | |
152 { | |
153 const char *begin_standout; /* smso, so */ | |
154 const char *end_standout; /* rmso, se */ | |
155 const char *begin_underline; /* smul, us */ | |
156 const char *end_underline; /* rmul, ue */ | |
157 const char *begin_alternate; /* smacs, as */ | |
158 const char *end_alternate; /* rmacs, ae */ | |
159 | |
160 const char *turn_on_reverse; /* rev, mr */ | |
161 const char *turn_on_blinking; /* blink, mb */ | |
162 const char *turn_on_bold; /* bold, md */ | |
163 const char *turn_on_dim; /* dim, mh */ | |
164 const char *turn_off_attributes; /* sgr0, me */ | |
165 | |
166 const char *visual_bell; /* flash, vb */ | |
167 const char *audio_bell; /* bel, bl */ | |
168 | |
169 const char *cursor_visible; /* cvvis, vs */ | |
170 const char *cursor_normal; /* cnorm, ve */ | |
171 const char *init_motion; /* smcup, ti */ | |
172 const char *end_motion; /* rmcup, te */ | |
173 const char *keypad_on; /* smkx, ks */ | |
174 const char *keypad_off; /* rmkx, ke */ | |
175 | |
176 const char *orig_pair; /* op, op */ | |
177 } sd; | |
178 | |
179 /* costs of various operations */ | |
180 struct | |
181 { | |
182 int cm_up; | |
183 int cm_down; | |
184 int cm_left; | |
185 int cm_right; | |
186 int cm_home; | |
187 int cm_low_left; | |
188 int cm_car_return; | |
189 int cm_abs; | |
190 int cm_hor_abs; | |
191 int cm_ver_abs; | |
192 } cost; | |
193 | |
194 /* The initial tty mode bits */ | |
195 struct emacs_tty old_tty; | |
196 | |
197 /* Is this TTY our controlling terminal? */ | |
198 unsigned int controlling_terminal :1; | |
199 unsigned int is_stdio :1; | |
200 }; | |
201 | |
202 #define CONSOLE_TTY_DATA(c) CONSOLE_TYPE_DATA (c, tty) | |
203 #define CONSOLE_TTY_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->cursor_x) | |
204 #define CONSOLE_TTY_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->cursor_y) | |
205 #define CONSOLE_TTY_REAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->real_cursor_x) | |
206 #define CONSOLE_TTY_REAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->real_cursor_y) | |
207 #define CONSOLE_TTY_FINAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->final_cursor_x) | |
208 #define CONSOLE_TTY_FINAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->final_cursor_y) | |
209 | |
210 #define TTY_CM(c) (CONSOLE_TTY_DATA (c)->cm) | |
211 #define TTY_SE(c) (CONSOLE_TTY_DATA (c)->se) | |
212 #define TTY_SD(c) (CONSOLE_TTY_DATA (c)->sd) | |
213 #define TTY_FLAGS(c) (CONSOLE_TTY_DATA (c)->flags) | |
214 #define TTY_COST(c) (CONSOLE_TTY_DATA (c)->cost) | |
215 | |
216 #define TTY_INC_CURSOR_X(c, n) do { \ | |
217 int TICX_n = (n); \ | |
218 assert (CONSOLE_TTY_CURSOR_X (c) == CONSOLE_TTY_REAL_CURSOR_X (c)); \ | |
219 CONSOLE_TTY_CURSOR_X (c) += TICX_n; \ | |
220 CONSOLE_TTY_REAL_CURSOR_X (c) += TICX_n; \ | |
221 } while (0) | |
222 | |
223 #define TTY_INC_CURSOR_Y(c, n) do { \ | |
224 int TICY_n = (n); \ | |
225 CONSOLE_TTY_CURSOR_Y (c) += TICY_n; \ | |
226 CONSOLE_TTY_REAL_CURSOR_Y (c) += TICY_n; \ | |
227 } while (0) | |
228 | |
229 struct tty_device | |
230 { | |
231 #ifdef HAVE_TERMIOS | |
232 speed_t ospeed; /* Output speed (from sg_ospeed) */ | |
233 #else | |
234 short ospeed; /* Output speed (from sg_ospeed) */ | |
235 #endif | |
236 }; | |
237 | |
238 #define DEVICE_TTY_DATA(d) DEVICE_TYPE_DATA (d, tty) | |
239 | |
240 /* termcap requires this to be global */ | |
241 #ifndef HAVE_TERMIOS | |
242 extern short ospeed; /* Output speed (from sg_ospeed) */ | |
243 #endif | |
244 | |
245 #endif /* INCLUDED_console_tty_impl_h_ */ |