Mercurial > hg > xemacs-beta
annotate src/event-tty.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 | 2b6fa2618f76 |
children | c925bacdda60 |
rev | line source |
---|---|
428 | 1 /* The event_stream interface for tty's. |
2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
3 Copyright (C) 1995 Sun Microsystems, Inc. | |
788 | 4 Copyright (C) 1995, 2002 Ben Wing. |
428 | 5 |
6 This file is part of XEmacs. | |
7 | |
8 XEmacs is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
10 Free Software Foundation; either version 2, or (at your option) any | |
11 later version. | |
12 | |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with XEmacs; see the file COPYING. If not, write to | |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 Boston, MA 02111-1307, USA. */ | |
22 | |
23 /* Synched up with: Not in FSF. */ | |
24 | |
25 #include <config.h> | |
26 #include "lisp.h" | |
27 | |
28 #include "device.h" | |
872 | 29 #include "console-tty-impl.h" |
428 | 30 #include "events.h" |
31 #include "frame.h" | |
32 #include "process.h" | |
33 | |
34 #include "sysproc.h" | |
35 #include "syswait.h" | |
36 #include "systime.h" | |
37 | |
38 /* Mask of bits indicating the descriptors that we wait for input on */ | |
39 extern SELECT_TYPE input_wait_mask, non_fake_input_wait_mask; | |
40 extern SELECT_TYPE process_only_mask, tty_only_mask; | |
41 | |
42 static struct event_stream *tty_event_stream; | |
43 | |
44 | |
45 /************************************************************************/ | |
46 /* timeout events */ | |
47 /************************************************************************/ | |
48 | |
49 /* The pending timers are stored in an ordered list, where the first timer | |
50 on the list is the first one to fire. Times recorded here are | |
51 absolute. */ | |
52 static struct low_level_timeout *tty_timer_queue; | |
53 | |
54 static int | |
55 emacs_tty_add_timeout (EMACS_TIME thyme) | |
56 { | |
57 return add_low_level_timeout (&tty_timer_queue, thyme); | |
58 } | |
59 | |
60 static void | |
61 emacs_tty_remove_timeout (int id) | |
62 { | |
63 remove_low_level_timeout (&tty_timer_queue, id); | |
64 } | |
65 | |
66 static void | |
440 | 67 tty_timeout_to_emacs_event (Lisp_Event *emacs_event) |
428 | 68 { |
69 emacs_event->event_type = timeout_event; | |
70 /* timeout events have nil as channel */ | |
71 emacs_event->timestamp = 0; /* #### */ | |
72 emacs_event->event.timeout.interval_id = | |
73 pop_low_level_timeout (&tty_timer_queue, 0); | |
74 emacs_event->event.timeout.function = Qnil; | |
75 emacs_event->event.timeout.object = Qnil; | |
76 } | |
77 | |
78 | |
79 | |
80 static int | |
81 emacs_tty_event_pending_p (int user_p) | |
82 { | |
83 if (!user_p) | |
84 { | |
85 EMACS_TIME sometime; | |
86 /* see if there's a pending timeout. */ | |
87 EMACS_GET_TIME (sometime); | |
88 if (tty_timer_queue && | |
89 EMACS_TIME_EQUAL_OR_GREATER (sometime, tty_timer_queue->time)) | |
90 return 1; | |
91 } | |
92 | |
93 return poll_fds_for_input (user_p ? tty_only_mask : | |
94 non_fake_input_wait_mask); | |
95 } | |
96 | |
97 struct console * | |
98 tty_find_console_from_fd (int fd) | |
99 { | |
100 Lisp_Object concons; | |
101 | |
102 CONSOLE_LOOP (concons) | |
103 { | |
104 struct console *c; | |
105 | |
106 c = XCONSOLE (XCAR (concons)); | |
107 if (CONSOLE_TTY_P (c) && CONSOLE_TTY_DATA (c)->infd == fd) | |
108 return c; | |
109 } | |
110 | |
111 return 0; | |
112 } | |
113 | |
114 static void | |
440 | 115 emacs_tty_next_event (Lisp_Event *emacs_event) |
428 | 116 { |
117 while (1) | |
118 { | |
119 int ndesc; | |
120 int i; | |
121 SELECT_TYPE temp_mask = input_wait_mask; | |
122 EMACS_TIME time_to_block; | |
123 EMACS_SELECT_TIME select_time_to_block, *pointer_to_this; | |
124 | |
125 if (!get_low_level_timeout_interval (tty_timer_queue, &time_to_block)) | |
126 /* no timer events; block indefinitely */ | |
127 pointer_to_this = 0; | |
128 else | |
129 { | |
130 EMACS_TIME_TO_SELECT_TIME (time_to_block, select_time_to_block); | |
131 pointer_to_this = &select_time_to_block; | |
132 } | |
133 | |
134 ndesc = select (MAXDESC, &temp_mask, 0, 0, pointer_to_this); | |
135 if (ndesc > 0) | |
136 { | |
137 /* Look for a TTY event */ | |
138 for (i = 0; i < MAXDESC; i++) | |
139 { | |
140 /* To avoid race conditions (among other things, an infinite | |
141 loop when called from Fdiscard_input()), we must return | |
142 user events ahead of process events. */ | |
143 if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &tty_only_mask)) | |
144 { | |
145 struct console *c = tty_find_console_from_fd (i); | |
146 | |
147 assert (c); | |
771 | 148 if (read_event_from_tty_or_stream_desc (emacs_event, c)) |
428 | 149 return; |
150 } | |
151 } | |
152 | |
153 /* Look for a process event */ | |
154 for (i = 0; i < MAXDESC; i++) | |
155 { | |
156 if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &process_only_mask)) | |
157 { | |
158 Lisp_Object process; | |
440 | 159 Lisp_Process *p = get_process_from_usid (FD_TO_USID(i)); |
428 | 160 |
161 assert (p); | |
793 | 162 process = wrap_process (p); |
428 | 163 emacs_event->event_type = process_event; |
164 /* process events have nil as channel */ | |
165 emacs_event->timestamp = 0; /* #### */ | |
166 emacs_event->event.process.process = process; | |
167 return; | |
168 } | |
169 } | |
170 | |
171 /* We might get here when a fake event came through a signal. */ | |
172 /* Return a dummy event, so that a cycle of the command loop will | |
173 occur. */ | |
174 drain_signal_event_pipe (); | |
175 emacs_event->event_type = eval_event; | |
176 /* eval events have nil as channel */ | |
177 emacs_event->event.eval.function = Qidentity; | |
178 emacs_event->event.eval.object = Qnil; | |
179 return; | |
180 } | |
181 else if (ndesc == 0) /* timeout fired */ | |
182 { | |
183 tty_timeout_to_emacs_event (emacs_event); | |
184 return; | |
185 } | |
186 } | |
187 } | |
188 | |
189 static void | |
788 | 190 emacs_tty_format_magic_event (Lisp_Event *emacs_event, Lisp_Object pstream) |
191 { | |
192 /* Nothing to do currently */ | |
193 } | |
194 | |
195 static int | |
196 emacs_tty_compare_magic_event (Lisp_Event *e1, Lisp_Event *e2) | |
197 { | |
198 return 1; | |
199 } | |
200 | |
201 static Hashcode | |
202 emacs_tty_hash_magic_event (Lisp_Event *e) | |
203 { | |
204 return 0; | |
205 } | |
206 | |
207 static void | |
440 | 208 emacs_tty_handle_magic_event (Lisp_Event *emacs_event) |
428 | 209 { |
210 /* Nothing to do currently */ | |
211 } | |
212 | |
213 | |
214 static void | |
853 | 215 emacs_tty_select_process (Lisp_Process *process, int doin, int doerr) |
428 | 216 { |
853 | 217 int infd, errfd; |
218 | |
219 event_stream_unixoid_select_process (process, doin, doerr, &infd, &errfd); | |
428 | 220 } |
221 | |
222 static void | |
853 | 223 emacs_tty_unselect_process (Lisp_Process *process, int doin, int doerr) |
428 | 224 { |
853 | 225 int infd, errfd; |
226 | |
227 event_stream_unixoid_unselect_process (process, doin, doerr, &infd, &errfd); | |
428 | 228 } |
229 | |
230 static void | |
231 emacs_tty_select_console (struct console *con) | |
232 { | |
233 event_stream_unixoid_select_console (con); | |
234 } | |
235 | |
236 static void | |
237 emacs_tty_unselect_console (struct console *con) | |
238 { | |
239 event_stream_unixoid_unselect_console (con); | |
240 } | |
241 | |
242 static void | |
243 emacs_tty_quit_p (void) | |
244 { | |
245 /* Nothing to do currently because QUIT is handled through SIGINT. | |
246 This could change. */ | |
247 } | |
248 | |
853 | 249 static void |
250 emacs_tty_create_io_streams (void* inhandle, void* outhandle, | |
251 void *errhandle, Lisp_Object* instream, | |
252 Lisp_Object* outstream, | |
253 Lisp_Object* errstream, | |
254 USID* in_usid, | |
255 USID* err_usid, | |
256 int flags) | |
428 | 257 { |
853 | 258 event_stream_unixoid_create_io_streams |
259 (inhandle, outhandle, errhandle, instream, outstream, | |
260 errstream, in_usid, err_usid, flags); | |
428 | 261 } |
262 | |
853 | 263 static void |
264 emacs_tty_delete_io_streams (Lisp_Object instream, | |
265 Lisp_Object outstream, | |
266 Lisp_Object errstream, | |
267 USID* in_usid, | |
268 USID* err_usid) | |
428 | 269 { |
853 | 270 event_stream_unixoid_delete_io_streams |
271 (instream, outstream, errstream, in_usid, err_usid); | |
428 | 272 } |
273 | |
274 | |
275 /************************************************************************/ | |
276 /* initialization */ | |
277 /************************************************************************/ | |
278 | |
279 void | |
280 reinit_vars_of_event_tty (void) | |
281 { | |
282 tty_event_stream = xnew (struct event_stream); | |
283 | |
284 tty_event_stream->event_pending_p = emacs_tty_event_pending_p; | |
442 | 285 tty_event_stream->force_event_pending = 0; |
428 | 286 tty_event_stream->next_event_cb = emacs_tty_next_event; |
287 tty_event_stream->handle_magic_event_cb = emacs_tty_handle_magic_event; | |
788 | 288 tty_event_stream->format_magic_event_cb = emacs_tty_format_magic_event; |
289 tty_event_stream->compare_magic_event_cb= emacs_tty_compare_magic_event; | |
290 tty_event_stream->hash_magic_event_cb = emacs_tty_hash_magic_event; | |
428 | 291 tty_event_stream->add_timeout_cb = emacs_tty_add_timeout; |
292 tty_event_stream->remove_timeout_cb = emacs_tty_remove_timeout; | |
293 tty_event_stream->select_console_cb = emacs_tty_select_console; | |
294 tty_event_stream->unselect_console_cb = emacs_tty_unselect_console; | |
295 tty_event_stream->select_process_cb = emacs_tty_select_process; | |
296 tty_event_stream->unselect_process_cb = emacs_tty_unselect_process; | |
297 tty_event_stream->quit_p_cb = emacs_tty_quit_p; | |
853 | 298 tty_event_stream->create_io_streams_cb = emacs_tty_create_io_streams; |
299 tty_event_stream->delete_io_streams_cb = emacs_tty_delete_io_streams; | |
428 | 300 } |
301 | |
302 void | |
303 vars_of_event_tty (void) | |
304 { | |
305 reinit_vars_of_event_tty (); | |
306 } | |
307 | |
308 void | |
309 init_event_tty_late (void) | |
310 { | |
311 event_stream = tty_event_stream; | |
312 } |