comparison src/intl-win32.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 804517e16990
children 184461bc8de4
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
36 #include "lisp.h" 36 #include "lisp.h"
37 37
38 #include "elhash.h" 38 #include "elhash.h"
39 #include "faces.h" 39 #include "faces.h"
40 #include "file-coding.h" 40 #include "file-coding.h"
41 #include "frame.h" 41 #include "frame-impl.h"
42 #include "window.h" 42 #include "window-impl.h"
43 43
44 #include "console-msw.h" 44 #include "console-msw-impl.h"
45 #include "objects-msw.h" 45 #include "objects-msw-impl.h"
46 46
47 #ifndef CYGWIN_HEADERS 47 #ifndef CYGWIN_HEADERS
48 # include <mbctype.h> 48 # include <mbctype.h>
49 #elif defined (MINGW) 49 #elif defined (MINGW)
50 int _setmbcp (int); 50 int _setmbcp (int);
62 general-slots.h */ 62 general-slots.h */
63 63
64 #ifdef MULE 64 #ifdef MULE
65 65
66 static Lisp_Object Vmswindows_charset_code_page_table; 66 static Lisp_Object Vmswindows_charset_code_page_table;
67 static Lisp_Object Vmswindows_charset_registry_table;
67 68
68 LCID current_locale; 69 LCID current_locale;
69 70
70 71
71 /************************************************************************/ 72 /************************************************************************/
1021 return Qnil; 1022 return Qnil;
1022 } 1023 }
1023 1024
1024 #ifdef DEBUG_XEMACS 1025 #ifdef DEBUG_XEMACS
1025 1026
1026 static int getacp (void); 1027 int getacp (void);
1027 int 1028 int
1028 getacp (void) 1029 getacp (void)
1029 { 1030 {
1030 return GetACP (); 1031 return GetACP ();
1031 } 1032 }
1268 } 1269 }
1269 } 1270 }
1270 return charset; 1271 return charset;
1271 } 1272 }
1272 1273
1274 DEFUN ("mswindows-charset-registry",
1275 Fmswindows_charset_registry, 1, 1, 0, /*
1276 Return the registry for the CHARSET.
1277 This is the last item in an MS Windows font spec.
1278
1279 #### This function may be changed in the near future.
1280 */
1281 (charset))
1282 {
1283 charset = Fget_charset (charset);
1284 return Fgethash (charset, Vmswindows_charset_registry_table, Qnil);
1285 }
1286
1287 DEFUN ("mswindows-set-charset-registry",
1288 Fmswindows_set_charset_registry, 2, 2, 0, /*
1289 Set the REGISTRY for the CHARSET.
1290
1291 #### This function may be changed once full Unicode support is present.
1292 */
1293 (charset, registry))
1294 {
1295 charset = Fget_charset (charset);
1296 CHECK_STRING (registry);
1297 Fputhash (charset, registry, Vmswindows_charset_registry_table);
1298 invalidate_charset_font_caches (charset);
1299 face_property_was_changed (Vdefault_face, Qfont, Qglobal);
1300 return Qnil;
1301 }
1302
1303 Lisp_Object
1304 mswindows_get_registry_charset (Ibyte *registry)
1305 {
1306 Lisp_Object charset_tail;
1307 Lisp_Object charset = Qunbound;
1308
1309 LIST_LOOP (charset_tail, Fcharset_list ())
1310 {
1311 Lisp_Object charset_registry;
1312
1313 charset_registry = Fmswindows_charset_registry (XCAR (charset_tail));
1314 if (STRINGP (charset_registry) &&
1315 !qxestrcasecmp (XSTRING_DATA (charset_registry), registry))
1316 {
1317 charset = Fget_charset (XCAR (charset_tail));
1318 break;
1319 }
1320 }
1321 return charset;
1322 }
1323
1273 1324
1274 1325
1275 #if 0 /* #### from Emacs 20.6; consider porting */ 1326 #if 0 /* #### from Emacs 20.6; consider porting */
1276 1327
1277 DEFUN ("mswindows-get-locale-info", Fmswindows_get_locale_info, 1, 2, 0, /* 1328 DEFUN ("mswindows-get-locale-info", Fmswindows_get_locale_info, 1, 2, 0, /*
2124 DEFSUBR (Fmswindows_locale_code_page); 2175 DEFSUBR (Fmswindows_locale_code_page);
2125 DEFSUBR (Fmswindows_locale_oem_code_page); 2176 DEFSUBR (Fmswindows_locale_oem_code_page);
2126 DEFSUBR (Fmswindows_supported_locales); 2177 DEFSUBR (Fmswindows_supported_locales);
2127 DEFSUBR (Fmswindows_charset_code_page); 2178 DEFSUBR (Fmswindows_charset_code_page);
2128 DEFSUBR (Fmswindows_set_charset_code_page); 2179 DEFSUBR (Fmswindows_set_charset_code_page);
2180 DEFSUBR (Fmswindows_charset_registry);
2181 DEFSUBR (Fmswindows_set_charset_registry);
2129 2182
2130 #if 0 2183 #if 0
2131 DEFSUBR (Fmswindows_get_locale_info); 2184 DEFSUBR (Fmswindows_get_locale_info);
2132 DEFSUBR (Fmswindows_get_current_locale_id); 2185 DEFSUBR (Fmswindows_get_current_locale_id);
2133 DEFSUBR (Fmswindows_get_default_locale_id); 2186 DEFSUBR (Fmswindows_get_default_locale_id);
2196 { 2249 {
2197 #ifdef MULE 2250 #ifdef MULE
2198 Vmswindows_charset_code_page_table = 2251 Vmswindows_charset_code_page_table =
2199 make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); 2252 make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
2200 staticpro (&Vmswindows_charset_code_page_table); 2253 staticpro (&Vmswindows_charset_code_page_table);
2254 Vmswindows_charset_registry_table =
2255 make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
2256 staticpro (&Vmswindows_charset_registry_table);
2201 #endif /* MULE */ 2257 #endif /* MULE */
2202 } 2258 }
2203 2259
2204 static void 2260 static void
2205 determine_if_using_unicode (void) 2261 determine_if_using_unicode (void)