Mercurial > hg > xemacs-beta
annotate src/macros.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 | 3d8143fc88e1 |
rev | line source |
---|---|
428 | 1 /* Keyboard macros. |
2 Copyright (C) 1985, 1986, 1992, 1993, 1994 Free Software Foundation, Inc. | |
3 | |
4 This file is part of XEmacs. | |
5 | |
6 XEmacs is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License as published by the | |
8 Free Software Foundation; either version 2, or (at your option) any | |
9 later version. | |
10 | |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with XEmacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 /* Synched up with: FSF 19.30. */ | |
22 | |
23 /* A keyboard macro is a string of ASCII characters, or a vector of event | |
24 objects. Only key-press, mouse-press, mouse-release, and menu-selection | |
25 events ever get into a keyboard macro. | |
26 | |
27 When interactively defining a keyboard macro, it will always be a vector | |
28 of events; strings may be executed for backwards compatibility. | |
29 */ | |
30 | |
31 #include <config.h> | |
32 #include "lisp.h" | |
800 | 33 |
34 #include "buffer.h" | |
428 | 35 #include "commands.h" |
872 | 36 #include "console-impl.h" |
800 | 37 #include "device.h" |
38 #include "events.h" | |
428 | 39 #include "frame.h" |
40 #include "keymap.h" | |
800 | 41 #include "macros.h" |
42 #include "window.h" | |
428 | 43 |
44 Lisp_Object Qexecute_kbd_macro; | |
45 | |
46 /* The current macro and our position in it. When executing nested kbd | |
47 macros, previous values for these are wound through the execution stack | |
48 with unwind-protect. | |
49 */ | |
50 Lisp_Object Vexecuting_macro; | |
51 int executing_macro_index; | |
52 | |
53 | |
54 DEFUN ("start-kbd-macro", Fstart_kbd_macro, 1, 1, "P", /* | |
55 Record subsequent keyboard and menu input, defining a keyboard macro. | |
56 The commands are recorded even as they are executed. | |
57 Use \\[end-kbd-macro] to finish recording and make the macro available. | |
58 Use \\[name-last-kbd-macro] to give it a permanent name. | |
59 Non-nil arg (prefix arg) means append to last macro defined; | |
60 This begins by re-executing that macro as if you typed it again. | |
61 */ | |
62 (append)) | |
63 { | |
64 /* This function can GC */ | |
65 struct console *con = XCONSOLE (Vselected_console); | |
66 if (!NILP (con->defining_kbd_macro)) | |
563 | 67 invalid_operation ("Already defining kbd macro", Qunbound); |
428 | 68 |
69 if (NILP (con->kbd_macro_builder)) | |
70 con->kbd_macro_builder = make_vector (30, Qnil); | |
71 | |
72 zmacs_region_stays = 1; /* set this before calling Fexecute_kbd_macro() | |
73 so that functions there can override */ | |
74 MARK_MODELINE_CHANGED; | |
75 if (NILP (append)) | |
76 { | |
77 con->kbd_macro_ptr = 0; | |
78 con->kbd_macro_end = 0; | |
79 message ("Defining kbd macro..."); | |
80 } | |
81 else | |
82 { | |
83 message ("Appending to kbd macro..."); | |
84 con->kbd_macro_ptr = con->kbd_macro_end; | |
85 Fexecute_kbd_macro (con->last_kbd_macro, make_int (1)); | |
86 } | |
87 con->defining_kbd_macro = Qt; | |
88 | |
89 return Qnil; | |
90 } | |
91 | |
92 DEFUN ("end-kbd-macro", Fend_kbd_macro, 0, 1, "P", /* | |
93 Finish defining a keyboard macro. | |
94 The definition was started by \\[start-kbd-macro]. | |
95 The macro is now available for use via \\[call-last-kbd-macro], | |
96 or it can be given a name with \\[name-last-kbd-macro] and then invoked | |
97 under that name. | |
98 | |
99 With numeric arg, repeat macro now that many times, | |
100 counting the definition just completed as the first repetition. | |
101 An argument of zero means repeat until error. | |
102 */ | |
103 (arg)) | |
104 { | |
105 /* This function can GC */ | |
106 struct console *con = XCONSOLE (Vselected_console); | |
107 int repeat; | |
108 | |
109 if (NILP (con->defining_kbd_macro)) | |
563 | 110 invalid_operation ("Not defining kbd macro", Qunbound); |
428 | 111 |
112 if (NILP (arg)) | |
113 repeat = -1; | |
114 else | |
115 repeat = XINT (Fprefix_numeric_value (arg)); | |
116 | |
117 if (!NILP (con->defining_kbd_macro)) | |
118 { | |
119 int i; | |
120 int size = con->kbd_macro_end; | |
121 | |
122 if (size < 0) | |
123 size = 0; | |
124 con->last_kbd_macro = make_vector (size, Qnil); | |
125 for (i = 0; i < size; i++) | |
126 XVECTOR_DATA (con->last_kbd_macro) [i] = | |
127 XVECTOR_DATA (con->kbd_macro_builder) [i]; | |
128 con->defining_kbd_macro = Qnil; | |
129 MARK_MODELINE_CHANGED; | |
130 message ("Keyboard macro defined"); | |
131 } | |
132 | |
133 zmacs_region_stays = 1; /* set this before calling Fexecute_kbd_macro() | |
134 so that functions there can override */ | |
135 if (repeat < 0) | |
136 return Qnil; | |
137 else if (repeat == 0) | |
138 return Fexecute_kbd_macro (con->last_kbd_macro, Qzero); | |
139 else | |
140 return Fexecute_kbd_macro (con->last_kbd_macro, | |
141 make_int (repeat - 1)); | |
142 } | |
143 | |
144 /* #### Read the comment in modeline.el to see why this ugliness is | |
145 needed. #### Try to avoid it, somehow! */ | |
146 DEFUN ("zap-last-kbd-macro-event", Fzap_last_kbd_macro_event, 0, 0, 0, /* | |
147 Don't look at this lest you vomit or spontaneously combust. | |
148 */ | |
149 ()) | |
150 { | |
151 struct console *con = XCONSOLE (Vselected_console); | |
152 if (con->kbd_macro_end) | |
153 --con->kbd_macro_end; | |
154 return Qnil; | |
155 } | |
156 | |
157 /* Store event into kbd macro being defined | |
158 */ | |
159 void | |
160 store_kbd_macro_event (Lisp_Object event) | |
161 { | |
162 struct console *con = event_console_or_selected (event); | |
163 | |
164 if (con->kbd_macro_ptr == XVECTOR_LENGTH (con->kbd_macro_builder)) | |
165 { | |
166 int i; | |
167 int old_size = XVECTOR_LENGTH (con->kbd_macro_builder); | |
168 int new_size = old_size * 2; | |
169 Lisp_Object new = make_vector (new_size, Qnil); | |
170 for (i = 0; i < old_size; i++) | |
171 XVECTOR_DATA (new) [i] = XVECTOR_DATA (con->kbd_macro_builder) [i]; | |
172 con->kbd_macro_builder = new; | |
173 } | |
174 XVECTOR_DATA (con->kbd_macro_builder) [con->kbd_macro_ptr++] = | |
175 Fcopy_event (event, Qnil); | |
176 } | |
177 | |
178 /* Extract the next kbd-macro element into the given event. | |
179 If we're done, throws to the catch in Fexecute_kbd_macro(). | |
180 */ | |
181 void | |
182 pop_kbd_macro_event (Lisp_Object event) | |
183 { | |
184 if (NILP (Vexecuting_macro)) abort (); | |
185 | |
186 if (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro)) | |
187 { | |
188 if (executing_macro_index < XINT (Flength (Vexecuting_macro))) | |
189 { | |
190 nth_of_key_sequence_as_event (Vexecuting_macro, | |
191 executing_macro_index++, | |
192 event); | |
193 return; | |
194 } | |
195 } | |
196 else if (!EQ (Vexecuting_macro, Qt)) /* Some things replace the macro | |
197 with Qt to force an early exit. */ | |
563 | 198 signal_error (Qinvalid_state, "junk in executing-macro", Qunbound); |
428 | 199 |
200 Fthrow (Qexecute_kbd_macro, Qt); | |
201 } | |
202 | |
203 | |
204 /* Declare that all chars stored so far in the kbd macro being defined | |
205 really belong to it. This is done in between editor commands. */ | |
206 | |
207 void | |
208 finalize_kbd_macro_chars (struct console *con) | |
209 { | |
210 con->kbd_macro_end = con->kbd_macro_ptr; | |
211 } | |
212 | |
213 DEFUN ("cancel-kbd-macro-events", Fcancel_kbd_macro_events, 0, 0, 0, /* | |
214 Cancel the events added to a keyboard macro for this command. | |
215 */ | |
216 ()) | |
217 { | |
218 struct console *con = XCONSOLE (Vselected_console); | |
219 | |
220 con->kbd_macro_ptr = con->kbd_macro_end; | |
221 | |
222 return Qnil; | |
223 } | |
224 | |
225 DEFUN ("call-last-kbd-macro", Fcall_last_kbd_macro, 0, 1, "p", /* | |
226 Call the last keyboard macro that you defined with \\[start-kbd-macro]. | |
227 | |
228 A prefix argument serves as a repeat count. Zero means repeat until error. | |
229 | |
230 To make a macro permanent so you can call it even after | |
231 defining others, use \\[name-last-kbd-macro]. | |
232 */ | |
233 (prefix)) | |
234 { | |
235 /* This function can GC */ | |
236 struct console *con = XCONSOLE (Vselected_console); | |
237 | |
238 if (!NILP (con->defining_kbd_macro)) | |
563 | 239 invalid_operation ("Can't execute anonymous macro while defining one", Qunbound); |
428 | 240 else if (NILP (con->last_kbd_macro)) |
563 | 241 invalid_operation ("No kbd macro has been defined", Qunbound); |
428 | 242 else |
243 Fexecute_kbd_macro (con->last_kbd_macro, prefix); | |
244 return Qnil; | |
245 } | |
246 | |
247 DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, 1, 2, 0, /* | |
248 Execute MACRO as string of editor command characters. | |
249 If MACRO is a symbol, its function definition is used. | |
250 COUNT is a repeat count, or nil for once, or 0 for infinite loop. | |
251 */ | |
444 | 252 (macro, count)) |
428 | 253 { |
254 /* This function can GC */ | |
255 Lisp_Object final; | |
256 int speccount = specpdl_depth (); | |
257 int repeat = 1; | |
258 struct gcpro gcpro1; | |
259 struct console *con = XCONSOLE (Vselected_console); | |
260 | |
444 | 261 if (!NILP (count)) |
428 | 262 { |
444 | 263 count = Fprefix_numeric_value (count); |
264 repeat = XINT (count); | |
428 | 265 } |
266 | |
267 final = indirect_function (macro, 1); | |
268 if (!STRINGP (final) && !VECTORP (final)) | |
563 | 269 invalid_argument ("Keyboard macros must be strings or vectors", Qunbound); |
428 | 270 |
853 | 271 internal_bind_lisp_object (&Vexecuting_macro, Vexecuting_macro); |
272 internal_bind_int (&executing_macro_index, executing_macro_index); | |
428 | 273 |
274 GCPRO1 (final); | |
275 do | |
276 { | |
277 Vexecuting_macro = final; | |
278 executing_macro_index = 0; | |
279 con->prefix_arg = Qnil; | |
280 internal_catch (Qexecute_kbd_macro, call_command_loop, | |
853 | 281 Qnil, 0, 0); |
428 | 282 } |
283 while (--repeat != 0 | |
284 && (STRINGP (Vexecuting_macro) || | |
285 VECTORP (Vexecuting_macro))); | |
286 | |
287 UNGCPRO; | |
771 | 288 return unbind_to (speccount); |
428 | 289 } |
290 | |
291 | |
292 void | |
293 syms_of_macros (void) | |
294 { | |
295 DEFSUBR (Fstart_kbd_macro); | |
296 DEFSUBR (Fend_kbd_macro); | |
297 DEFSUBR (Fzap_last_kbd_macro_event); | |
298 DEFSUBR (Fcall_last_kbd_macro); | |
299 DEFSUBR (Fexecute_kbd_macro); | |
300 DEFSUBR (Fcancel_kbd_macro_events); | |
563 | 301 DEFSYMBOL (Qexecute_kbd_macro); |
428 | 302 } |
303 | |
304 void | |
305 vars_of_macros (void) | |
306 { | |
307 DEFVAR_LISP ("executing-macro", &Vexecuting_macro /* | |
308 Currently executing keyboard macro (a vector of events or string); | |
309 nil if none executing. | |
310 */ ); | |
311 | |
312 DEFVAR_LISP ("executing-kbd-macro", &Vexecuting_macro /* | |
313 Currently executing keyboard macro (a vector of events or string); | |
314 nil if none executing. | |
315 */ ); | |
316 } | |
317 | |
318 void | |
319 init_macros (void) | |
320 { | |
321 Vexecuting_macro = Qnil; | |
322 } | |
323 |