comparison src/objects-msw.c @ 2367:ecf1ebac70d8

[xemacs-hg @ 2004-11-04 23:05:23 by ben] commit mega-patch configure.in: Turn off -Winline and -Wchar-subscripts. Use the right set of cflags when compiling modules. Rewrite ldap configuration to separate the inclusion of lber (needed in recent Cygwin) from the basic checks for the needed libraries. add a function for MAKE_JUNK_C; initially code was added to generate xemacs.def using this, but it will need to be rewritten. add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto an existing file. Sort list of auto-detected functions and eliminate unused checks for stpcpy, setlocale and getwd. Add autodetection of Cygwin scanf problems BETA: Rewrite section on configure to indicate what flags are important and what not. digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main(). make-msgfile.c: Document that this is old junk. Move proposal to text.c. make-msgfile.lex: Move proposal to text.c. make-mswin-unicode.pl: Convert error-generating code so that the entire message will be seen as a single unrecognized token. mule/mule-ccl.el: Update docs. lispref/mule.texi: Update CCL docs. ldap/eldap.c: Mule-ize. Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP. * XEmacs 21.5.18 "chestnut" is released. --------------------------------------------------------------- MULE-RELATED WORK: --------------------------------------------------------------- --------------------------- byte-char conversion --------------------------- buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. --------------------------- work on types --------------------------- alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte UChar_ASCII -> UAscbyte Char_Binary -> CBinbyte UChar_Binary -> Binbyte SChar_Binary -> SBinbyte (2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and Bitbyte and use them. (3) New types Itext, Wexttext and Textcount for separating out the concepts of bytes and textual units (different under UTF-16 and UTF-32, which are potential internal encodings). (4) qxestr*_c -> qxestr*_ascii. lisp.h: New; goes with other qxe() functions. #### Maybe goes in a different section. lisp.h: Group generic int-type defs together with EMACS_INT defs. lisp.h: * lisp.h (WEXTTEXT_IS_WIDE) New defns. lisp.h: New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. dynarr.c: int -> Bytecount. --------------------------- Mule-izing --------------------------- device-x.c: Partially Mule-ize. dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*(). sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be Unicode (e.g. startup code under Windows). emacs.c: Mule-ize. Properly deal with argv in external encoding. Use wext_*() and Wexttext. Use Rawbyte. #if 0 some old junk on SCO that is unlikely to be correct. Rewrite allocation code in run-temacs. emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). process.c: Use _wenviron not environ under Windows, to get Unicode environment variables. event-Xt.c: Mule-ize drag-n-drop related stuff. dragdrop.c, dragdrop.h, frame-x.c: Mule-ize. text.h: Add some more stand-in defines for particular kinds of conversion; use in Mule-ization work in frame-x.c etc. --------------------------- Freshening --------------------------- intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate. --------------------------- Unicode-work --------------------------- intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc() and convert_unicode_to_multibyte_dynarr() and use. Add stuff for alloca() conversion of multibyte/unicode. alloc.c: Use dfc_external_data_len() in case of unicode coding system. alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up dump-time loading. Anyway, either we load them at dump time or run time, never both. unicode.c: Dump the blank tables as well. --------------------------------------------------------------- DOCUMENTATION, MOSTLY MULE-RELATED: --------------------------------------------------------------- EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed. text.h: Add more documentation describing why DFC routines were not written to return their value. Add some other DFC documentation. console-msw.c, console-msw.h: Add pointer to docs in win32.c. emacs.c: Add comments on sources of doc info. text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and internationalization, and proposals for work to be done, in text.c or Internals manual, stuff related to specific textual API's in text.h, and stuff related to internal implementation of Unicode conversion in unicode.c. Put lots of pointers to the comments to make them easier to find. s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. events.h: Move docs about event stream callbacks to internals manual, put in pointer. profile.c, redisplay.c, signal.c: Move documentation to the Internals manual. process-nt.c: Add pointer to comment in win32-native.el. lisp.h: Add comments about some comment conventions. lisp.h: Add comment about the second argument. device-msw.c, redisplay-msw.c: @@#### comments are out-of-date. --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP: Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. lrecord.h: some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). extents.c: remove incorrect comment about pdump problems with gap array. --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. lisp.h: Moved down and consolidated with other allocation stuff. lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in LIFO order. lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs. text.h, lisp.h: Fill out convenience routines for allocating various kinds of bytes and put them in lisp.h. Use them in place of xmalloc(), ALLOCA(). text.h: Fill out the convenience functions so the _MALLOC() kinds match the alloca() kinds. --------------------------------------------------------------- ERROR-CHECKING --------------------------------------------------------------- text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN() from similar Eistring checkers and change the Eistring checkers to use them instead. --------------------------------------------------------------- MACROS IN LISP.H --------------------------------------------------------------- lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities. Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. --------------------------------------------------------------- SPACING FIXES --------------------------------------------------------------- callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes. --------------------------------------------------------------- FIX FOR GEOMETRY PROBLEM IN FIRST FRAME --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows. will be overridden by my other ws. --------------------------------------------------------------- FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner <adrian@xemacs.org>. --------------------------------------------------------------- FIX FOR CYGWIN BUG (Unicode-related): --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. --------------------------------------------------------------- WARNING FIXES: --------------------------------------------------------------- console-stream.c: `reinit' is unused. compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got. regex.c: Gather includes together to avoid warning. --------------------------------------------------------------- CHANGES TO INITIALIZATION ROUTINES: --------------------------------------------------------------- buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity. Factor out some redundant init code. Move disallowed stuff that had crept into vars_of_glyphs() into complex_vars_of_glyphs(). Call init_eval_semi_early() from eval.c not in the middle of vars_of_() in emacs.c since there should be no order dependency in the latter calls. --------------------------------------------------------------- ARMAGEDDON: --------------------------------------------------------------- alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to inhibit_non_essential_conversion_operations. text.c: Assert on !inhibit_non_essential_conversion_operations. console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file. Rearrange everything to follow this -- put all #undefs together and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA, BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE. m/gec63.h: Deleted; totally broken, not used at all, not in FSF. m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION, BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected. When in doubt, I followed recent FSF sources, which also have these things deleted.
author ben
date Thu, 04 Nov 2004 23:08:28 +0000
parents 04bc9d2f42c7
children ab71ad6ff3dd
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
48 #include "insdel.h" 48 #include "insdel.h"
49 #include "opaque.h" 49 #include "opaque.h"
50 50
51 typedef struct colormap_t 51 typedef struct colormap_t
52 { 52 {
53 const Char_ASCII *name; 53 const Ascbyte *name;
54 COLORREF colorref; 54 COLORREF colorref;
55 } colormap_t; 55 } colormap_t;
56 56
57 /* Colors from X11R6 "XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp" */ 57 /* Colors from X11R6 "XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp" */
58 /* MSWindows tends to round up the numbers in its palette, ie where X uses 58 /* MSWindows tends to round up the numbers in its palette, ie where X uses
726 }; 726 };
727 727
728 728
729 typedef struct fontmap_t 729 typedef struct fontmap_t
730 { 730 {
731 const Char_ASCII *name; 731 const Ascbyte *name;
732 int value; 732 int value;
733 } fontmap_t; 733 } fontmap_t;
734 734
735 /* Default weight first, preferred names listed before synonyms */ 735 /* Default weight first, preferred names listed before synonyms */
736 static const fontmap_t fontweight_map[] = 736 static const fontmap_t fontweight_map[] =
962 g = hexval (name[5]) * 16 + hexval (name[6]); 962 g = hexval (name[5]) * 16 + hexval (name[6]);
963 b = hexval (name[9]) * 16 + hexval (name[10]); 963 b = hexval (name[9]) * 16 + hexval (name[10]);
964 return (PALETTERGB (r, g, b)); 964 return (PALETTERGB (r, g, b));
965 } 965 }
966 } 966 }
967 else if (!qxestrncmp_c (name, "rgb:", 4)) 967 else if (!qxestrncmp_ascii (name, "rgb:", 4))
968 { 968 {
969 unsigned int r, g, b; 969 unsigned int r, g, b;
970 970
971 if (sscanf ((CIbyte *) name, "rgb:%04x/%04x/%04x", &r, &g, &b) == 3) 971 if (sscanf ((CIbyte *) name, "rgb:%04x/%04x/%04x", &r, &g, &b) == 3)
972 { 972 {
988 else 988 else
989 return (COLORREF) -1; 989 return (COLORREF) -1;
990 } 990 }
991 else if (*name) /* Can't be an empty string */ 991 else if (*name) /* Can't be an empty string */
992 { 992 {
993 Ibyte *nospaces = (Ibyte *) ALLOCA (qxestrlen (name) + 1); 993 Ibyte *nospaces = alloca_ibytes (qxestrlen (name) + 1);
994 Ibyte *c = nospaces; 994 Ibyte *c = nospaces;
995 while (*name) 995 while (*name)
996 if (*name != ' ') 996 if (*name != ' ')
997 *c++ = *name++; 997 *c++ = *name++;
998 else 998 else
999 name++; 999 name++;
1000 *c = '\0'; 1000 *c = '\0';
1001 1001
1002 for (i = 0; i < countof (mswindows_X_color_map); i++) 1002 for (i = 0; i < countof (mswindows_X_color_map); i++)
1003 if (!qxestrcasecmp_c (nospaces, mswindows_X_color_map[i].name)) 1003 if (!qxestrcasecmp_ascii (nospaces, mswindows_X_color_map[i].name))
1004 return (mswindows_X_color_map[i].colorref); 1004 return (mswindows_X_color_map[i].colorref);
1005 } 1005 }
1006 return (COLORREF) -1; 1006 return (COLORREF) -1;
1007 } 1007 }
1008 1008
1009 Lisp_Object 1009 Lisp_Object
1010 mswindows_color_to_string (COLORREF color) 1010 mswindows_color_to_string (COLORREF color)
1011 { 1011 {
1012 int i; 1012 int i;
1013 Char_ASCII buf[8]; 1013 Ascbyte buf[8];
1014 COLORREF pcolor = PALETTERGB (GetRValue (color), GetGValue (color), 1014 COLORREF pcolor = PALETTERGB (GetRValue (color), GetGValue (color),
1015 GetBValue (color)); 1015 GetBValue (color));
1016 1016
1017 for (i = 0; i < countof (mswindows_X_color_map); i++) 1017 for (i = 0; i < countof (mswindows_X_color_map); i++)
1018 if (pcolor == (mswindows_X_color_map[i].colorref)) 1018 if (pcolor == (mswindows_X_color_map[i].colorref))
1055 if (e1) *e1 = ':'; 1055 if (e1) *e1 = ':';
1056 if (e2) *e2 = ':'; 1056 if (e2) *e2 = ':';
1057 return 0; 1057 return 0;
1058 } 1058 }
1059 else if (fontname) 1059 else if (fontname)
1060 qxestrcat_c (qxestrcat (fontname, c1), ":"); 1060 qxestrcat_ascii (qxestrcat (fontname, c1), ":");
1061 } 1061 }
1062 else if (fontname) 1062 else if (fontname)
1063 { 1063 {
1064 if (c2 && c2[0] != '\0') 1064 if (c2 && c2[0] != '\0')
1065 qxestrcat_c (qxestrcat (fontname, c2), ":"); 1065 qxestrcat_ascii (qxestrcat (fontname, c2), ":");
1066 else 1066 else
1067 qxestrcat_c (fontname, ":"); 1067 qxestrcat_ascii (fontname, ":");
1068 } 1068 }
1069 1069
1070 if (e1) *(e1++) = ':'; 1070 if (e1) *(e1++) = ':';
1071 if (e2) *(e2++) = ':'; 1071 if (e2) *(e2++) = ':';
1072 c1 = e1; 1072 c1 = e1;
1132 * applies to the font weight string when matching fonts. 1132 * applies to the font weight string when matching fonts.
1133 */ 1133 */
1134 for (i = 0; i < countof (charset_map); i++) 1134 for (i = 0; i < countof (charset_map); i++)
1135 if (lpelfe->elfLogFont.lfCharSet == charset_map[i].value) 1135 if (lpelfe->elfLogFont.lfCharSet == charset_map[i].value)
1136 { 1136 {
1137 qxestrcat_c (fontname, charset_map[i].name); 1137 qxestrcat_ascii (fontname, charset_map[i].name);
1138 break; 1138 break;
1139 } 1139 }
1140 if (i == countof (charset_map)) 1140 if (i == countof (charset_map))
1141 return 1; 1141 return 1;
1142 1142
1202 font2 = XSTRING_DATA (XCAR (obj2)); 1202 font2 = XSTRING_DATA (XCAR (obj2));
1203 1203
1204 c1 = qxestrrchr (font1, ':'); 1204 c1 = qxestrrchr (font1, ':');
1205 c2 = qxestrrchr (font2, ':'); 1205 c2 = qxestrrchr (font2, ':');
1206 1206
1207 t1 = !qxestrcasecmp_c (c1 + 1, "western"); 1207 t1 = !qxestrcasecmp_ascii (c1 + 1, "western");
1208 t2 = !qxestrcasecmp_c (c2 + 1, "western"); 1208 t2 = !qxestrcasecmp_ascii (c2 + 1, "western");
1209 1209
1210 if (t1 && !t2) 1210 if (t1 && !t2)
1211 return 1; 1211 return 1;
1212 if (t2 && !t1) 1212 if (t2 && !t1)
1213 return -1; 1213 return -1;
1241 because the smaller one won't upset the total line height if it's 1241 because the smaller one won't upset the total line height if it's
1242 just a few chars. */ 1242 just a few chars. */
1243 return 1; 1243 return 1;
1244 } 1244 }
1245 1245
1246 t1 = !qxestrncasecmp_c (font1, "courier new:", 12); 1246 t1 = !qxestrncasecmp_ascii (font1, "courier new:", 12);
1247 t2 = !qxestrncasecmp_c (font2, "courier new:", 12); 1247 t2 = !qxestrncasecmp_ascii (font2, "courier new:", 12);
1248 1248
1249 if (t1 && !t2) 1249 if (t1 && !t2)
1250 return 1; 1250 return 1;
1251 if (t2 && !t1) 1251 if (t2 && !t1)
1252 return -1; 1252 return -1;
1498 } 1498 }
1499 } 1499 }
1500 1500
1501 /* weight */ 1501 /* weight */
1502 if (fields < 2) 1502 if (fields < 2)
1503 qxestrcpy_c (weight, fontweight_map[0].name); 1503 qxestrcpy_ascii (weight, fontweight_map[0].name);
1504 1504
1505 /* Maybe split weight into weight and style */ 1505 /* Maybe split weight into weight and style */
1506 if ((c = qxestrchr (weight, ' '))) 1506 if ((c = qxestrchr (weight, ' ')))
1507 { 1507 {
1508 *c = '\0'; 1508 *c = '\0';
1510 } 1510 }
1511 else 1511 else
1512 style = NULL; 1512 style = NULL;
1513 1513
1514 for (i = 0; i < countof (fontweight_map); i++) 1514 for (i = 0; i < countof (fontweight_map); i++)
1515 if (!qxestrcasecmp_c (weight, fontweight_map[i].name)) 1515 if (!qxestrcasecmp_ascii (weight, fontweight_map[i].name))
1516 { 1516 {
1517 if (logfont) 1517 if (logfont)
1518 logfont->lfWeight = fontweight_map[i].value; 1518 logfont->lfWeight = fontweight_map[i].value;
1519 break; 1519 break;
1520 } 1520 }
1535 } 1535 }
1536 1536
1537 if (style) 1537 if (style)
1538 { 1538 {
1539 /* #### what about oblique? */ 1539 /* #### what about oblique? */
1540 if (qxestrcasecmp_c (style, "italic") == 0) 1540 if (qxestrcasecmp_ascii (style, "italic") == 0)
1541 { 1541 {
1542 if (logfont) 1542 if (logfont)
1543 logfont->lfItalic = TRUE; 1543 logfont->lfItalic = TRUE;
1544 } 1544 }
1545 else 1545 else
1555 *c = ' '; 1555 *c = ' ';
1556 } 1556 }
1557 else if (logfont) 1557 else if (logfont)
1558 logfont->lfItalic = FALSE; 1558 logfont->lfItalic = FALSE;
1559 1559
1560 if (fields < 3 || !qxestrcmp_c (points, "")) 1560 if (fields < 3 || !qxestrcmp_ascii (points, ""))
1561 ; 1561 ;
1562 else if (points[0] == '0' || 1562 else if (points[0] == '0' ||
1563 qxestrspn (points, "0123456789") < qxestrlen (points)) 1563 qxestrspn (points, "0123456789") < qxestrlen (points))
1564 { 1564 {
1565 maybe_signal_error (Qinvalid_argument, "Invalid font pointsize", 1565 maybe_signal_error (Qinvalid_argument, "Invalid font pointsize",
1599 effects2 = c + 1; 1599 effects2 = c + 1;
1600 } 1600 }
1601 else 1601 else
1602 effects2 = NULL; 1602 effects2 = NULL;
1603 1603
1604 if (qxestrcasecmp_c (effects, "underline") == 0) 1604 if (qxestrcasecmp_ascii (effects, "underline") == 0)
1605 underline = TRUE; 1605 underline = TRUE;
1606 else if (qxestrcasecmp_c (effects, "strikeout") == 0) 1606 else if (qxestrcasecmp_ascii (effects, "strikeout") == 0)
1607 strikeout = TRUE; 1607 strikeout = TRUE;
1608 else 1608 else
1609 { 1609 {
1610 maybe_signal_error (Qinvalid_constant, "Invalid font effect", 1610 maybe_signal_error (Qinvalid_constant, "Invalid font effect",
1611 name_for_errors, Qfont, errb); 1611 name_for_errors, Qfont, errb);
1612 return 0; 1612 return 0;
1613 } 1613 }
1614 1614
1615 if (effects2 && effects2[0] != '\0') 1615 if (effects2 && effects2[0] != '\0')
1616 { 1616 {
1617 if (qxestrcasecmp_c (effects2, "underline") == 0) 1617 if (qxestrcasecmp_ascii (effects2, "underline") == 0)
1618 underline = TRUE; 1618 underline = TRUE;
1619 else if (qxestrcasecmp_c (effects2, "strikeout") == 0) 1619 else if (qxestrcasecmp_ascii (effects2, "strikeout") == 0)
1620 strikeout = TRUE; 1620 strikeout = TRUE;
1621 else 1621 else
1622 { 1622 {
1623 maybe_signal_error (Qinvalid_constant, "Invalid font effect", 1623 maybe_signal_error (Qinvalid_constant, "Invalid font effect",
1624 name_for_errors, Qfont, errb); 1624 name_for_errors, Qfont, errb);
1628 1628
1629 /* Regenerate sanitized effects string */ 1629 /* Regenerate sanitized effects string */
1630 if (underline) 1630 if (underline)
1631 { 1631 {
1632 if (strikeout) 1632 if (strikeout)
1633 qxestrcpy_c (effects, "underline strikeout"); 1633 qxestrcpy_ascii (effects, "underline strikeout");
1634 else 1634 else
1635 qxestrcpy_c (effects, "underline"); 1635 qxestrcpy_ascii (effects, "underline");
1636 } 1636 }
1637 else if (strikeout) 1637 else if (strikeout)
1638 qxestrcpy_c (effects, "strikeout"); 1638 qxestrcpy_ascii (effects, "strikeout");
1639 1639
1640 if (logfont) 1640 if (logfont)
1641 { 1641 {
1642 logfont->lfUnderline = underline; 1642 logfont->lfUnderline = underline;
1643 logfont->lfStrikeOut = strikeout; 1643 logfont->lfStrikeOut = strikeout;
1661 because the C code instantiates fonts using particular charsets, by 1661 because the C code instantiates fonts using particular charsets, by
1662 way of specifier_matching_instance(). Before instantiating the font, 1662 way of specifier_matching_instance(). Before instantiating the font,
1663 font_instantiate() calls the devmeth find_matching_font(), which gets 1663 font_instantiate() calls the devmeth find_matching_font(), which gets
1664 a truename font spec with the registry (i.e. the charset spec) filled 1664 a truename font spec with the registry (i.e. the charset spec) filled
1665 in appropriately to the charset. */ 1665 in appropriately to the charset. */
1666 if (!qxestrcmp_c (charset, "")) 1666 if (!qxestrcmp_ascii (charset, ""))
1667 ; 1667 ;
1668 else 1668 else
1669 { 1669 {
1670 for (i = 0; i < countof (charset_map); i++) 1670 for (i = 0; i < countof (charset_map); i++)
1671 if (!qxestrcasecmp_c (charset, charset_map[i].name)) 1671 if (!qxestrcasecmp_ascii (charset, charset_map[i].name))
1672 { 1672 {
1673 if (logfont) 1673 if (logfont)
1674 logfont->lfCharSet = charset_map[i].value; 1674 logfont->lfCharSet = charset_map[i].value;
1675 break; 1675 break;
1676 } 1676 }
1999 return 0; 1999 return 0;
2000 2000
2001 font_charset = c; 2001 font_charset = c;
2002 2002
2003 /* For border-glyph use */ 2003 /* For border-glyph use */
2004 if (!qxestrcasecmp_c (font_charset, "symbol")) 2004 if (!qxestrcasecmp_ascii (font_charset, "symbol"))
2005 font_charset = (const Ibyte *) "western"; 2005 font_charset = (const Ibyte *) "western";
2006 2006
2007 /* Get code page for the charset */ 2007 /* Get code page for the charset */
2008 charset_registry = Fmswindows_charset_registry (charset); 2008 charset_registry = Fmswindows_charset_registry (charset);
2009 if (!STRINGP (charset_registry)) 2009 if (!STRINGP (charset_registry))
2318 #ifdef MULE 2318 #ifdef MULE
2319 Vfont_signature_data = 2319 Vfont_signature_data =
2320 make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL); 2320 make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL);
2321 staticpro (&Vfont_signature_data); 2321 staticpro (&Vfont_signature_data);
2322 #endif /* MULE */ 2322 #endif /* MULE */
2323 2323 }
2324 reinit_vars_of_object_mswindows ();
2325 }