Mercurial > hg > xemacs-beta
comparison src/intl-win32.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 | e7ee5f8bde58 |
comparison
equal
deleted
inserted
replaced
825:eb3bc15a6e0f | 826:6728e641994e |
---|---|
1272 | 1272 |
1273 | 1273 |
1274 | 1274 |
1275 #if 0 /* #### from Emacs 20.6; consider porting */ | 1275 #if 0 /* #### from Emacs 20.6; consider porting */ |
1276 | 1276 |
1277 xxDEFUN ("mswindows-get-locale-info", Fmswindows_get_locale_info, 1, 2, 0, /* | 1277 DEFUN ("mswindows-get-locale-info", Fmswindows_get_locale_info, 1, 2, 0, /* |
1278 Return information about the Windows locale LCID. | 1278 Return information about the Windows locale LCID. |
1279 By default, return a three letter locale code which encodes the default | 1279 By default, return a three letter locale code which encodes the default |
1280 language as the first two characters, and the country or regionial variant | 1280 language as the first two characters, and the country or regionial variant |
1281 as the third letter. For example, ENU refers to `English (United States)', | 1281 as the third letter. For example, ENU refers to `English (United States)', |
1282 while ENC means `English (Canadian)'. | 1282 while ENC means `English (Canadian)'. |
1337 DWORD id = atoi (codepageNum); | 1337 DWORD id = atoi (codepageNum); |
1338 Vmswindows_valid_code_pages = Fcons (make_int (id), Vmswindows_valid_code_pages); | 1338 Vmswindows_valid_code_pages = Fcons (make_int (id), Vmswindows_valid_code_pages); |
1339 return TRUE; | 1339 return TRUE; |
1340 } | 1340 } |
1341 | 1341 |
1342 xxDEFUN ("mswindows-get-valid-code-pages", Fmswindows_get_valid_code_pages, 0, 0, 0, /* | 1342 DEFUN ("mswindows-get-valid-code-pages", Fmswindows_get_valid_code_pages, 0, 0, 0, /* |
1343 Return list of all valid Windows code pages. | 1343 Return list of all valid Windows code pages. |
1344 */ | 1344 */ |
1345 ()) | 1345 ()) |
1346 { | 1346 { |
1347 Vmswindows_valid_code_pages = Qnil; | 1347 Vmswindows_valid_code_pages = Qnil; |
1350 | 1350 |
1351 Vmswindows_valid_code_pages = Fnreverse (Vmswindows_valid_code_pages); | 1351 Vmswindows_valid_code_pages = Fnreverse (Vmswindows_valid_code_pages); |
1352 return Vmswindows_valid_code_pages; | 1352 return Vmswindows_valid_code_pages; |
1353 } | 1353 } |
1354 | 1354 |
1355 xxDEFUN ("mswindows-get-console-code-page", Fmswindows_get_console_code_page, 0, 0, 0, /* | 1355 DEFUN ("mswindows-get-console-code-page", Fmswindows_get_console_code_page, 0, 0, 0, /* |
1356 Return current Windows code page for console input. | 1356 Return current Windows code page for console input. |
1357 */ | 1357 */ |
1358 ()) | 1358 ()) |
1359 { | 1359 { |
1360 return make_int (GetConsoleCP ()); | 1360 return make_int (GetConsoleCP ()); |
1361 } | 1361 } |
1362 | 1362 |
1363 xxDEFUN ("mswindows-set-console-code-page", Fmswindows_set_console_code_page, 1, 1, 0, /* | 1363 DEFUN ("mswindows-set-console-code-page", Fmswindows_set_console_code_page, 1, 1, 0, /* |
1364 Make Windows code page CP be the current code page setting for Emacs. | 1364 Make Windows code page CP be the current code page setting for Emacs. |
1365 The code page setting affects keyboard input and display in tty mode. | 1365 The code page setting affects keyboard input and display in tty mode. |
1366 If successful, the new CP is returned, otherwise nil. | 1366 If successful, the new CP is returned, otherwise nil. |
1367 */ | 1367 */ |
1368 (cp)) | 1368 (cp)) |
1376 return Qnil; | 1376 return Qnil; |
1377 | 1377 |
1378 return make_int (GetConsoleCP ()); | 1378 return make_int (GetConsoleCP ()); |
1379 } | 1379 } |
1380 | 1380 |
1381 xxDEFUN ("mswindows-get-console-output-code-page", Fmswindows_get_console_output_code_page, 0, 0, 0, /* | 1381 DEFUN ("mswindows-get-console-output-code-page", Fmswindows_get_console_output_code_page, 0, 0, 0, /* |
1382 Return current Windows code page for console output. | 1382 Return current Windows code page for console output. |
1383 */ | 1383 */ |
1384 ()) | 1384 ()) |
1385 { | 1385 { |
1386 return make_int (GetConsoleOutputCP ()); | 1386 return make_int (GetConsoleOutputCP ()); |
1387 } | 1387 } |
1388 | 1388 |
1389 xxDEFUN ("mswindows-set-console-output-code-page", Fmswindows_set_console_output_code_page, 1, 1, 0, /* | 1389 DEFUN ("mswindows-set-console-output-code-page", Fmswindows_set_console_output_code_page, 1, 1, 0, /* |
1390 Make Windows code page CP be the current code page setting for Emacs. | 1390 Make Windows code page CP be the current code page setting for Emacs. |
1391 The code page setting affects keyboard input and display in tty mode. | 1391 The code page setting affects keyboard input and display in tty mode. |
1392 If successful, the new CP is returned, otherwise nil. | 1392 If successful, the new CP is returned, otherwise nil. |
1393 */ | 1393 */ |
1394 (cp)) | 1394 (cp)) |
1402 return Qnil; | 1402 return Qnil; |
1403 | 1403 |
1404 return make_int (GetConsoleOutputCP ()); | 1404 return make_int (GetConsoleOutputCP ()); |
1405 } | 1405 } |
1406 | 1406 |
1407 xxDEFUN ("mswindows-get-code-page-charset", Fmswindows_get_code_page_charset, 1, 1, 0, /* | 1407 DEFUN ("mswindows-get-code-page-charset", Fmswindows_get_code_page_charset, 1, 1, 0, /* |
1408 Return charset of code page CP. | 1408 Return charset of code page CP. |
1409 Returns nil if the code page is not valid. | 1409 Returns nil if the code page is not valid. |
1410 */ | 1410 */ |
1411 (cp)) | 1411 (cp)) |
1412 { | 1412 { |
1421 return make_int (info.ciCharset); | 1421 return make_int (info.ciCharset); |
1422 | 1422 |
1423 return Qnil; | 1423 return Qnil; |
1424 } | 1424 } |
1425 | 1425 |
1426 xxDEFUN ("mswindows-get-valid-keyboard-layouts", Fmswindows_get_valid_keyboard_layouts, 0, 0, 0, /* | 1426 DEFUN ("mswindows-get-valid-keyboard-layouts", Fmswindows_get_valid_keyboard_layouts, 0, 0, 0, /* |
1427 Return list of Windows keyboard languages and layouts. | 1427 Return list of Windows keyboard languages and layouts. |
1428 The return value is a list of pairs of language id and layout id. | 1428 The return value is a list of pairs of language id and layout id. |
1429 */ | 1429 */ |
1430 ()) | 1430 ()) |
1431 { | 1431 { |
1446 } | 1446 } |
1447 | 1447 |
1448 return obj; | 1448 return obj; |
1449 } | 1449 } |
1450 | 1450 |
1451 xxDEFUN ("mswindows-get-keyboard-layout", Fmswindows_get_keyboard_layout, 0, 0, 0, /* | 1451 DEFUN ("mswindows-get-keyboard-layout", Fmswindows_get_keyboard_layout, 0, 0, 0, /* |
1452 Return current Windows keyboard language and layout. | 1452 Return current Windows keyboard language and layout. |
1453 The return value is the cons of the language id and the layout id. | 1453 The return value is the cons of the language id and the layout id. |
1454 */ | 1454 */ |
1455 ()) | 1455 ()) |
1456 { | 1456 { |
1458 | 1458 |
1459 return Fcons (make_int (kl & 0xffff), | 1459 return Fcons (make_int (kl & 0xffff), |
1460 make_int ((kl >> 16) & 0xffff)); | 1460 make_int ((kl >> 16) & 0xffff)); |
1461 } | 1461 } |
1462 | 1462 |
1463 xxDEFUN ("mswindows-set-keyboard-layout", Fmswindows_set_keyboard_layout, 1, 1, 0, /* | 1463 DEFUN ("mswindows-set-keyboard-layout", Fmswindows_set_keyboard_layout, 1, 1, 0, /* |
1464 Make LAYOUT be the current keyboard layout for Emacs. | 1464 Make LAYOUT be the current keyboard layout for Emacs. |
1465 The keyboard layout setting affects interpretation of keyboard input. | 1465 The keyboard layout setting affects interpretation of keyboard input. |
1466 If successful, the new layout id is returned, otherwise nil. | 1466 If successful, the new layout id is returned, otherwise nil. |
1467 */ | 1467 */ |
1468 (layout)) | 1468 (layout)) |
1825 Lisp_Object printcharfun, int escapeflag) | 1825 Lisp_Object printcharfun, int escapeflag) |
1826 { | 1826 { |
1827 struct mswindows_multibyte_to_unicode_coding_system *data = | 1827 struct mswindows_multibyte_to_unicode_coding_system *data = |
1828 XCODING_SYSTEM_TYPE_DATA (cs, mswindows_multibyte_to_unicode); | 1828 XCODING_SYSTEM_TYPE_DATA (cs, mswindows_multibyte_to_unicode); |
1829 | 1829 |
1830 write_c_string ("(", printcharfun); | 1830 write_c_string (printcharfun, "("); |
1831 if (data->locale_type == MULTIBYTE_SPECIFIED_CODE_PAGE) | 1831 if (data->locale_type == MULTIBYTE_SPECIFIED_CODE_PAGE) |
1832 print_internal (make_int (data->cp), printcharfun, 1); | 1832 print_internal (make_int (data->cp), printcharfun, 1); |
1833 else | 1833 else |
1834 { | 1834 { |
1835 write_fmt_string_lisp (printcharfun, "%s, ", 1, mswindows_multibyte_to_unicode_getprop (cs, Qlocale)); | 1835 write_fmt_string_lisp (printcharfun, "%s, ", 1, mswindows_multibyte_to_unicode_getprop (cs, Qlocale)); |
1836 print_internal (mswindows_multibyte_to_unicode_getprop (cs, Qcode_page), printcharfun, 0); | 1836 print_internal (mswindows_multibyte_to_unicode_getprop (cs, Qcode_page), printcharfun, 0); |
1837 } | 1837 } |
1838 write_c_string (")", printcharfun); | 1838 write_c_string (printcharfun, ")"); |
1839 } | 1839 } |
1840 | 1840 |
1841 /* Convert multibyte to Unicode according to the specified code page | 1841 /* Convert multibyte to Unicode according to the specified code page |
1842 and return the value as a malloc()ed string. This currently exists | 1842 and return the value as a malloc()ed string. This currently exists |
1843 because the TO_INTERNAL_FORMAT() mechanism -- the normal way to do | 1843 because the TO_INTERNAL_FORMAT() mechanism -- the normal way to do |