Mercurial > hg > xemacs-beta
comparison src/keymap.c @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | a5954632b187 |
children | 2b6fa2618f76 |
comparison
equal
deleted
inserted
replaced
825:eb3bc15a6e0f | 826:6728e641994e |
---|---|
257 { | 257 { |
258 /* This function can GC */ | 258 /* This function can GC */ |
259 Lisp_Keymap *keymap = XKEYMAP (obj); | 259 Lisp_Keymap *keymap = XKEYMAP (obj); |
260 if (print_readably) | 260 if (print_readably) |
261 printing_unreadable_object ("#<keymap 0x%x>", keymap->header.uid); | 261 printing_unreadable_object ("#<keymap 0x%x>", keymap->header.uid); |
262 write_c_string ("#<keymap ", printcharfun); | 262 write_c_string (printcharfun, "#<keymap "); |
263 if (!NILP (keymap->name)) | 263 if (!NILP (keymap->name)) |
264 { | 264 { |
265 write_fmt_string_lisp (printcharfun, "%S ", 1, keymap->name); | 265 write_fmt_string_lisp (printcharfun, "%S ", 1, keymap->name); |
266 } | 266 } |
267 write_fmt_string (printcharfun, "size %ld 0x%x>", | 267 write_fmt_string (printcharfun, "size %ld 0x%x>", |
473 abort (); | 473 abort (); |
474 | 474 |
475 k = XKEYMAP (keymap); | 475 k = XKEYMAP (keymap); |
476 | 476 |
477 /* If the keysym is a one-character symbol, use the char code instead. */ | 477 /* If the keysym is a one-character symbol, use the char code instead. */ |
478 if (SYMBOLP (keysym) && XSTRING_CHAR_LENGTH (XSYMBOL (keysym)->name) == 1) | 478 if (SYMBOLP (keysym) && string_char_length (XSYMBOL (keysym)->name) == 1) |
479 { | 479 { |
480 Lisp_Object i_fart_on_gcc = | 480 Lisp_Object i_fart_on_gcc = |
481 make_char (XSTRING_CHAR (XSYMBOL (keysym)->name, 0)); | 481 make_char (string_emchar (XSYMBOL (keysym)->name, 0)); |
482 keysym = i_fart_on_gcc; | 482 keysym = i_fart_on_gcc; |
483 } | 483 } |
484 | 484 |
485 if (modifiers & XEMACS_MOD_META) /* Utterly hateful ESC lossage */ | 485 if (modifiers & XEMACS_MOD_META) /* Utterly hateful ESC lossage */ |
486 { | 486 { |
651 assert ((modifiers & ~(XEMACS_MOD_CONTROL | XEMACS_MOD_META | 651 assert ((modifiers & ~(XEMACS_MOD_CONTROL | XEMACS_MOD_META |
652 | XEMACS_MOD_SUPER | XEMACS_MOD_HYPER | 652 | XEMACS_MOD_SUPER | XEMACS_MOD_HYPER |
653 | XEMACS_MOD_ALT | XEMACS_MOD_SHIFT)) == 0); | 653 | XEMACS_MOD_ALT | XEMACS_MOD_SHIFT)) == 0); |
654 | 654 |
655 /* If the keysym is a one-character symbol, use the char code instead. */ | 655 /* If the keysym is a one-character symbol, use the char code instead. */ |
656 if (SYMBOLP (keysym) && XSTRING_CHAR_LENGTH (XSYMBOL (keysym)->name) == 1) | 656 if (SYMBOLP (keysym) && string_char_length (XSYMBOL (keysym)->name) == 1) |
657 keysym = make_char (XSTRING_CHAR (XSYMBOL (keysym)->name, 0)); | 657 keysym = make_char (string_emchar (XSYMBOL (keysym)->name, 0)); |
658 | 658 |
659 if (modifiers & XEMACS_MOD_META) /* Utterly hateful ESC lossage */ | 659 if (modifiers & XEMACS_MOD_META) /* Utterly hateful ESC lossage */ |
660 { | 660 { |
661 Lisp_Object submap = Fgethash (MAKE_MODIFIER_HASH_KEY (XEMACS_MOD_META), | 661 Lisp_Object submap = Fgethash (MAKE_MODIFIER_HASH_KEY (XEMACS_MOD_META), |
662 k->table, Qnil); | 662 k->table, Qnil); |
1259 int modifiers) | 1259 int modifiers) |
1260 { | 1260 { |
1261 /* Now, check and massage the trailing keysym specifier. */ | 1261 /* Now, check and massage the trailing keysym specifier. */ |
1262 if (SYMBOLP (*keysym)) | 1262 if (SYMBOLP (*keysym)) |
1263 { | 1263 { |
1264 if (XSTRING_CHAR_LENGTH (XSYMBOL (*keysym)->name) == 1) | 1264 if (string_char_length (XSYMBOL (*keysym)->name) == 1) |
1265 { | 1265 { |
1266 Lisp_Object ream_gcc_up_the_ass = | 1266 Lisp_Object ream_gcc_up_the_ass = |
1267 make_char (XSTRING_CHAR (XSYMBOL (*keysym)->name, 0)); | 1267 make_char (string_emchar (XSYMBOL (*keysym)->name, 0)); |
1268 *keysym = ream_gcc_up_the_ass; | 1268 *keysym = ream_gcc_up_the_ass; |
1269 goto fixnum_keysym; | 1269 goto fixnum_keysym; |
1270 } | 1270 } |
1271 } | 1271 } |
1272 else if (CHAR_OR_CHAR_INTP (*keysym)) | 1272 else if (CHAR_OR_CHAR_INTP (*keysym)) |
1859 struct gcpro gcpro1, gcpro2, gcpro3; | 1859 struct gcpro gcpro1, gcpro2, gcpro3; |
1860 | 1860 |
1861 if (VECTORP (keys)) | 1861 if (VECTORP (keys)) |
1862 len = XVECTOR_LENGTH (keys); | 1862 len = XVECTOR_LENGTH (keys); |
1863 else if (STRINGP (keys)) | 1863 else if (STRINGP (keys)) |
1864 len = XSTRING_CHAR_LENGTH (keys); | 1864 len = string_char_length (keys); |
1865 else if (CHAR_OR_CHAR_INTP (keys) || SYMBOLP (keys) || CONSP (keys)) | 1865 else if (CHAR_OR_CHAR_INTP (keys) || SYMBOLP (keys) || CONSP (keys)) |
1866 { | 1866 { |
1867 if (!CONSP (keys)) keys = list1 (keys); | 1867 if (!CONSP (keys)) keys = list1 (keys); |
1868 len = 1; | 1868 len = 1; |
1869 keys = make_vector (1, keys); /* this is kinda sleazy. */ | 1869 keys = make_vector (1, keys); /* this is kinda sleazy. */ |
1897 Lisp_Object c; | 1897 Lisp_Object c; |
1898 struct key_data raw_key1; | 1898 struct key_data raw_key1; |
1899 struct key_data raw_key2; | 1899 struct key_data raw_key2; |
1900 | 1900 |
1901 if (STRINGP (keys)) | 1901 if (STRINGP (keys)) |
1902 c = make_char (XSTRING_CHAR (keys, idx)); | 1902 c = make_char (string_emchar (keys, idx)); |
1903 else | 1903 else |
1904 c = XVECTOR_DATA (keys) [idx]; | 1904 c = XVECTOR_DATA (keys) [idx]; |
1905 | 1905 |
1906 define_key_parser (c, &raw_key1); | 1906 define_key_parser (c, &raw_key1); |
1907 | 1907 |
2215 !NILP (accept_default)); | 2215 !NILP (accept_default)); |
2216 else if (SYMBOLP (keys) || CHAR_OR_CHAR_INTP (keys) || CONSP (keys)) | 2216 else if (SYMBOLP (keys) || CHAR_OR_CHAR_INTP (keys) || CONSP (keys)) |
2217 return lookup_keys (keymap, 1, &keys, !NILP (accept_default)); | 2217 return lookup_keys (keymap, 1, &keys, !NILP (accept_default)); |
2218 else if (STRINGP (keys)) | 2218 else if (STRINGP (keys)) |
2219 { | 2219 { |
2220 int length = XSTRING_CHAR_LENGTH (keys); | 2220 int length = string_char_length (keys); |
2221 int i; | 2221 int i; |
2222 struct key_data *raw_keys = alloca_array (struct key_data, length); | 2222 struct key_data *raw_keys = alloca_array (struct key_data, length); |
2223 if (length == 0) | 2223 if (length == 0) |
2224 return Qnil; | 2224 return Qnil; |
2225 | 2225 |
2226 for (i = 0; i < length; i++) | 2226 for (i = 0; i < length; i++) |
2227 { | 2227 { |
2228 Emchar n = XSTRING_CHAR (keys, i); | 2228 Emchar n = string_emchar (keys, i); |
2229 define_key_parser (make_char (n), &(raw_keys[i])); | 2229 define_key_parser (make_char (n), &(raw_keys[i])); |
2230 } | 2230 } |
2231 return raw_lookup_key (keymap, raw_keys, length, 0, | 2231 return raw_lookup_key (keymap, raw_keys, length, 0, |
2232 !NILP (accept_default)); | 2232 !NILP (accept_default)); |
2233 } | 2233 } |
2982 Lisp_Object binding, | 2982 Lisp_Object binding, |
2983 void *function) | 2983 void *function) |
2984 { | 2984 { |
2985 /* This function can GC */ | 2985 /* This function can GC */ |
2986 Lisp_Object fn; | 2986 Lisp_Object fn; |
2987 VOID_TO_LISP (fn, function); | 2987 fn = VOID_TO_LISP (function); |
2988 call2 (fn, make_key_description (key, 1), binding); | 2988 call2 (fn, make_key_description (key, 1), binding); |
2989 } | 2989 } |
2990 | 2990 |
2991 | 2991 |
2992 static void | 2992 static void |
3238 | 3238 |
3239 for (i = 0; i < size; i++) | 3239 for (i = 0; i < size; i++) |
3240 { | 3240 { |
3241 Lisp_Object s2 = Fsingle_key_description | 3241 Lisp_Object s2 = Fsingle_key_description |
3242 (STRINGP (keys) | 3242 (STRINGP (keys) |
3243 ? make_char (XSTRING_CHAR (keys, i)) | 3243 ? make_char (string_emchar (keys, i)) |
3244 : XVECTOR_DATA (keys)[i]); | 3244 : XVECTOR_DATA (keys)[i]); |
3245 | 3245 |
3246 if (i == 0) | 3246 if (i == 0) |
3247 string = s2; | 3247 string = s2; |
3248 else | 3248 else |