Mercurial > hg > xemacs-beta
annotate src/objects-xlike-inc.c @ 4932:8b63e21b0436
fix compile issues with gcc 4
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* aclocal.m4 (XE_SHLIB_STUFF):
Use -export-all-symbols instead of -export-dynamic on PE targets
(Cygwin and MinGW).
* configure.ac (XE_EXPAND_VARIABLE):
* configure.ac (TAB):
Create variable XEMACS_CC_GPP to check whether we're running g++.
Don't just check for an executable called `g++' -- it might be
called g++-4 or whatever. Instead, check for either named `g++*'
or claiming to be g++ when called with --version. Rewrite code do
use the variable.
Add -fno-strict-aliasing to optimization flags when GCC and
optimized, and in all cases with g++, since under these circumstances
strict aliasing is otherwise assumed, and XEmacs can't easily be
made to respect its restrictions.
* configure: Regenerate.
lib-src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* fakemail.c (args_size):
* fakemail.c (parse_header):
* ootags.c (C_entries):
Fix warnings about possible use of uninitialized vars.
lwlib/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* xlwgauge.c (GaugeResize):
* xlwgauge.c (GaugeSize):
Fix warnings about possible use of uninitialized vars.
modules/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_exec):
* postgresql/postgresql.c (Fpq_get_result):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* chartab.c (decode_char_table_range):
* extents.c (extent_fragment_update):
* objects-msw.c (initialize_font_instance):
* process.c (Fgetenv):
* redisplay-output.c (get_next_display_block):
Fix warnings about possible use of uninitialized vars.
* compiler.h:
* compiler.h (REGISTER):
* event-stream.c (is_scrollbar_event):
* window.c (window_scrollbar_width):
* window.c (window_scrollbar_height):
* window.c (window_left_window_gutter_width):
* window.c (window_right_window_gutter_width):
Add USED_IF_SCROLLBARS. Use it to fix warnings about unused
vars when --with-scrollbars=no.
* config.h.in:
Change comment to explain better why DECLARE_INLINE_HEADER
is needed.
* dialog-msw.c:
* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
* emacs.c (main_1):
* event-msw.c (struct mswin_message_debug):
* event-msw.c (debug_output_mswin_message):
* font-mgr.c:
* font-mgr.c (Ffc_config_filename):
* glyphs-msw.c (struct):
* glyphs-msw.c (bitmap_table):
* glyphs-x.c (update_widget_face):
* intl-win32.c (struct lang_to_string):
* intl-win32.c (lang_to_string_table):
* nas.c:
* objects-xlike-inc.c:
* objects-xlike-inc.c (xft_find_charset_font):
* syswindows.h:
* win32.c (mswindows_output_last_error):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
* lisp.h:
G++ 4.3 needs #include <limits> to avoid errors about min/max.
* lisp.h (disabled_assert_with_message):
Use disabled_assert* whenever asserts are disabled. Rewrite
disabled_assert* to avoid complaints about unused vars by
pretending to use the vars but casting them to (void).
Remove code that defined assert() weirdly if DEBUG_XEMACS but
not USE_ASSERTIONS -- configure sets USE_ASSERTIONS automatically
when DEBUG_XEMACS, and if the user has forced it off, then
so be it.
* lisp.h (SYMBOL_KEYWORD):
Put some of the combined `extern Lisp_Object's back under
the file they are declared in. Cosmetic fix.
* number.h:
Remove `extern Lisp_Object' decls that duplicate lisp.h,
since they have different C vs. C++ linkage.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 24 Jan 2010 22:04:58 -0600 |
| parents | 0d3ccd5a2509 |
| children | 19a72041c5ed |
| rev | line source |
|---|---|
| 3659 | 1 /* Shared object code between X and GTK -- include file. |
| 2 Copyright (C) 1991-5, 1997 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 4 Copyright (C) 1996, 2001, 2002, 2003 Ben Wing. | |
| 5 | |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: Not in FSF. */ | |
| 24 | |
| 25 /* Pango is ready for prime-time now, as far as I understand it. The GTK | |
| 26 people should be using that. Oh well. (Aidan Kehoe, Sat Nov 4 12:41:12 | |
| 27 CET 2006) */ | |
| 28 | |
| 29 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901) | |
| 30 | |
| 31 #ifdef DEBUG_XEMACS | |
| 32 # define DEBUG_OBJECTS(FORMAT, ...) \ | |
| 33 do { if (debug_x_objects) stderr_out(FORMAT, __VA_ARGS__); } while (0) | |
| 34 #else /* DEBUG_XEMACS */ | |
| 35 # define DEBUG_OBJECTS(format, ...) | |
| 36 #endif /* DEBUG_XEMACS */ | |
| 37 | |
| 38 #elif defined(__GNUC__) | |
| 39 | |
| 40 #ifdef DEBUG_XEMACS | |
| 41 # define DEBUG_OBJECTS(format, args...) \ | |
| 42 do { if (debug_x_objects) stderr_out(format, args ); } while (0) | |
| 43 #else /* DEBUG_XEMACS */ | |
| 44 # define DEBUG_OBJECTS(format, args...) | |
| 45 #endif /* DEBUG_XEMACS */ | |
| 46 | |
| 47 #else /* defined(__STDC_VERSION__) [...] */ | |
| 48 # define DEBUG_OBJECTS (void) | |
| 49 #endif | |
| 50 | |
| 51 #ifdef MULE | |
| 52 | |
| 53 /* For some code it's reasonable to have only one copy and conditionalize | |
| 54 at run-time. For other code it isn't. */ | |
| 55 | |
| 56 static int | |
| 57 count_hyphens(const Ibyte *str, Bytecount length, Ibyte **last_hyphen) | |
| 58 { | |
| 59 int hyphen_count = 0; | |
| 60 const Ibyte *hyphening = str; | |
| 61 const Ibyte *new_hyphening; | |
| 62 | |
| 63 for (hyphen_count = 0; | |
| 4124 | 64 NULL != (new_hyphening = (Ibyte *) memchr((const void *)hyphening, '-', length)); |
| 3659 | 65 hyphen_count++) |
| 66 { | |
| 67 ++new_hyphening; | |
| 68 length -= new_hyphening - hyphening; | |
| 69 hyphening = new_hyphening; | |
| 70 } | |
| 71 | |
| 72 if (NULL != last_hyphen) | |
| 73 { | |
| 74 *last_hyphen = (Ibyte *)hyphening; | |
| 75 } | |
| 76 | |
| 77 return hyphen_count; | |
| 78 } | |
| 79 | |
| 80 static int | |
| 81 #ifdef THIS_IS_GTK | |
| 82 gtk_font_spec_matches_charset (struct device * USED_IF_XFT (d), | |
| 83 Lisp_Object charset, | |
| 84 const Ibyte *nonreloc, Lisp_Object reloc, | |
| 85 Bytecount offset, Bytecount length, | |
| 86 enum font_specifier_matchspec_stages stage) | |
| 87 #else | |
| 88 x_font_spec_matches_charset (struct device * USED_IF_XFT (d), | |
| 89 Lisp_Object charset, | |
| 90 const Ibyte *nonreloc, Lisp_Object reloc, | |
| 91 Bytecount offset, Bytecount length, | |
| 92 enum font_specifier_matchspec_stages stage) | |
| 93 #endif | |
| 94 { | |
| 95 Lisp_Object registries = Qnil; | |
| 96 long i, registries_len; | |
| 97 const Ibyte *the_nonreloc; | |
| 98 Bytecount the_length; | |
| 99 | |
| 100 the_nonreloc = nonreloc; | |
| 101 the_length = length; | |
| 102 | |
| 103 if (!the_nonreloc) | |
| 104 the_nonreloc = XSTRING_DATA (reloc); | |
| 105 fixup_internal_substring (nonreloc, reloc, offset, &the_length); | |
| 106 the_nonreloc += offset; | |
| 107 | |
| 108 #ifdef USE_XFT | |
| 109 if (stage) | |
| 110 { | |
| 111 Display *dpy = DEVICE_X_DISPLAY (d); | |
| 112 Extbyte *extname; | |
| 113 XftFont *rf; | |
| 114 const Ibyte *the_nonreloc; | |
| 115 | |
| 116 if (!NILP(reloc)) | |
| 117 { | |
| 118 the_nonreloc = XSTRING_DATA (reloc); | |
| 119 LISP_STRING_TO_EXTERNAL (reloc, extname, Qx_font_name_encoding); | |
| 120 rf = xft_open_font_by_name (dpy, extname); | |
| 121 return 0; /* #### maybe this will compile and run ;) */ | |
| 122 /* Jesus, Stephen, what the fuck? */ | |
| 123 } | |
| 124 } | |
| 125 #endif | |
| 126 | |
| 127 /* Hmm, this smells bad. */ | |
|
4353
4143b78d0df0
Merge an old patch of Ben's, involving font instantiation and charsets.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4124
diff
changeset
|
128 if (NILP (charset)) |
| 3659 | 129 return 1; |
| 130 | |
| 131 /* Hack! Short font names don't have the registry in them, | |
| 132 so we just assume the user knows what they're doing in the | |
| 133 case of ASCII. For other charsets, you gotta give the | |
| 134 long form; sorry buster. | |
| 135 #### FMH: this screws fontconfig/Xft? | |
| 136 STRATEGY: use fontconfig's ability to hack languages and character | |
| 137 sets (lang and charset properties). | |
| 138 #### Maybe we can use the fontconfig model to eliminate the difference | |
| 139 between faces and fonts? No - it looks like that would be an abuse | |
| 140 (fontconfig doesn't know about colors, although Xft does). | |
| 141 */ | |
| 142 if (EQ (charset, Vcharset_ascii) && | |
| 143 (!memchr (the_nonreloc, '*', the_length)) | |
| 144 && (5 > (count_hyphens(the_nonreloc, the_length, NULL)))) | |
| 145 { | |
| 146 return 1; | |
| 147 } | |
| 148 | |
| 149 if (final == stage) | |
| 150 { | |
| 151 registries = Qunicode_registries; | |
| 152 } | |
| 153 else if (initial == stage) | |
| 154 { | |
| 155 registries = XCHARSET_REGISTRIES (charset); | |
| 156 if (NILP(registries)) | |
| 157 { | |
| 158 return 0; | |
| 159 } | |
| 160 } | |
| 161 else assert(0); | |
| 162 | |
| 163 CHECK_VECTOR (registries); | |
| 164 registries_len = XVECTOR_LENGTH(registries); | |
| 165 | |
| 166 for (i = 0; i < registries_len; ++i) | |
| 167 { | |
| 168 if (!(STRINGP(XVECTOR_DATA(registries)[i])) | |
| 169 || (XSTRING_LENGTH(XVECTOR_DATA(registries)[i]) > the_length)) | |
| 170 { | |
| 171 continue; | |
| 172 } | |
| 173 | |
| 174 /* Check if the font spec ends in the registry specified. X11 says | |
| 175 this comparison is case insensitive: XLFD, section 3.11: | |
| 176 | |
| 177 "Alphabetic case distinctions are allowed but are for human | |
| 178 readability concerns only. Conforming X servers will perform | |
| 179 matching on font name query or open requests independent of case." */ | |
| 180 if (0 == qxestrcasecmp(XSTRING_DATA(XVECTOR_DATA(registries)[i]), | |
| 181 the_nonreloc + (the_length - | |
| 182 XSTRING_LENGTH | |
| 183 (XVECTOR_DATA(registries)[i])))) | |
| 184 { | |
| 185 return 1; | |
| 186 } | |
| 187 } | |
| 188 return 0; | |
| 189 } | |
| 190 | |
| 191 static Lisp_Object | |
| 192 xlistfonts_checking_charset (Lisp_Object device, const Extbyte *xlfd, | |
| 193 Lisp_Object charset, | |
| 194 enum font_specifier_matchspec_stages stage) | |
| 195 { | |
| 196 Extbyte **names; | |
| 197 Lisp_Object result = Qnil; | |
| 198 int count = 0, i; | |
| 199 DECLARE_EISTRING(ei_single_result); | |
| 200 | |
| 201 names = XListFonts ( | |
| 202 #ifdef THIS_IS_GTK | |
| 203 GDK_DISPLAY (), | |
| 204 #else | |
| 205 DEVICE_X_DISPLAY (XDEVICE (device)), | |
| 206 #endif | |
| 207 xlfd, MAX_FONT_COUNT, &count); | |
| 208 | |
| 209 for (i = 0; i < count; ++i) | |
| 210 { | |
| 211 eireset(ei_single_result); | |
| 212 eicpy_ext(ei_single_result, names[i], Qx_font_name_encoding); | |
| 213 | |
| 214 if (DEVMETH_OR_GIVEN(XDEVICE (device), font_spec_matches_charset, | |
| 215 (XDEVICE (device), charset, | |
| 216 eidata(ei_single_result), Qnil, 0, | |
| 217 -1, stage), 0)) | |
| 218 { | |
| 219 result = eimake_string(ei_single_result); | |
| 220 DEBUG_OBJECTS ("in xlistfonts_checking_charset, returning %s\n", | |
| 221 eidata(ei_single_result)); | |
| 222 break; | |
| 223 } | |
| 224 } | |
| 225 | |
| 226 if (names) | |
| 227 { | |
| 228 XFreeFontNames (names); | |
| 229 } | |
| 230 | |
| 231 return result; | |
| 232 } | |
| 233 | |
| 234 #ifdef USE_XFT | |
| 235 /* #### debug functions: find a better place for us */ | |
| 236 const char *FcResultToString (FcResult r); | |
| 237 const char * | |
| 238 FcResultToString (FcResult r) | |
| 239 { | |
| 240 static char buffer[256]; | |
| 241 switch (r) | |
| 242 { | |
| 243 case FcResultMatch: | |
| 244 return "FcResultMatch"; | |
| 245 case FcResultNoMatch: | |
| 246 return "FcResultNoMatch"; | |
| 247 case FcResultTypeMismatch: | |
| 248 return "FcResultTypeMismatch"; | |
| 249 case FcResultNoId: | |
| 250 return "FcResultNoId"; | |
| 251 default: | |
| 252 snprintf (buffer, 255, "FcResultUndocumentedValue (%d)", r); | |
| 253 return buffer; | |
| 254 } | |
| 255 } | |
| 256 | |
| 257 const char *FcTypeOfValueToString (FcValue v); | |
| 258 const char * | |
| 259 FcTypeOfValueToString (FcValue v) | |
| 260 { | |
| 261 static char buffer[256]; | |
| 262 switch (v.type) | |
| 263 { | |
| 264 case FcTypeMatrix: | |
| 265 return "FcTypeMatrix"; | |
| 266 case FcTypeString: | |
| 267 return "FcTypeString"; | |
| 268 case FcTypeVoid: | |
| 269 return "FcTypeVoid"; | |
| 270 case FcTypeDouble: | |
| 271 return "FcTypeDouble"; | |
| 272 case FcTypeInteger: | |
| 273 return "FcTypeInteger"; | |
| 274 case FcTypeBool: | |
| 275 return "FcTypeBool"; | |
| 276 case FcTypeCharSet: | |
| 277 return "FcTypeCharSet"; | |
| 278 case FcTypeLangSet: | |
| 279 return "FcTypeLangSet"; | |
| 280 /* #### There is no union member of this type, but there are void* and | |
| 281 FcPattern* members, as of fontconfig.h FC_VERSION 10002 */ | |
| 282 case FcTypeFTFace: | |
| 283 return "FcTypeFTFace"; | |
| 284 default: | |
| 285 snprintf (buffer, 255, "FcTypeUndocumentedType (%d)", v.type); | |
| 286 return buffer; | |
| 287 } | |
| 288 } | |
| 289 | |
| 290 static FcCharSet * | |
| 291 mule_to_fc_charset (Lisp_Object cs) | |
| 292 { | |
| 293 int ucode, i, j; | |
| 294 FcCharSet *fccs; | |
| 295 | |
| 296 CHECK_CHARSET (cs); | |
| 297 fccs = FcCharSetCreate (); | |
| 298 /* #### do we also need to deal with 94 vs. 96 charsets? | |
| 299 ie, how are SP and DEL treated in ASCII? non-graphic should return -1 */ | |
| 300 if (1 == XCHARSET_DIMENSION (cs)) | |
| 301 /* Unicode tables are indexed by offsets from ASCII SP, not by ASCII */ | |
| 302 for (i = 0; i < 96; i++) | |
| 303 { | |
| 304 ucode = ((int *) XCHARSET_TO_UNICODE_TABLE (cs))[i]; | |
| 305 if (ucode >= 0) | |
| 306 /* #### should check for allocation failure */ | |
| 307 FcCharSetAddChar (fccs, (FcChar32) ucode); | |
| 308 } | |
| 309 else if (2 == XCHARSET_DIMENSION (cs)) | |
| 310 /* Unicode tables are indexed by offsets from ASCII SP, not by ASCII */ | |
| 311 for (i = 0; i < 96; i++) | |
| 312 for (j = 0; j < 96; j++) | |
| 313 { | |
| 314 ucode = ((int **) XCHARSET_TO_UNICODE_TABLE (cs))[i][j]; | |
| 315 if (ucode >= 0) | |
| 316 /* #### should check for allocation failure */ | |
| 317 FcCharSetAddChar (fccs, (FcChar32) ucode); | |
| 318 } | |
| 319 else | |
| 320 { | |
| 321 FcCharSetDestroy (fccs); | |
| 322 fccs = NULL; | |
| 323 } | |
| 324 return fccs; | |
| 325 } | |
| 326 | |
| 327 struct charset_reporter { | |
| 328 Lisp_Object *charset; | |
| 329 /* This is a debug facility, require ASCII. */ | |
| 4932 | 330 const Ascbyte *language; /* ASCII, please */ |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
331 /* Technically this is FcChar8, but fsckin' GCC 4 bitches. |
|
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
332 RFC 3066 is a combination of ISO 639 and ISO 3166. */ |
| 4932 | 333 const Ascbyte *rfc3066; /* ASCII, please */ |
| 3659 | 334 }; |
| 335 | |
| 336 static struct charset_reporter charset_table[] = | |
| 337 { | |
| 338 /* #### It's my branch, my favorite charsets get checked first! | |
| 339 That's a joke, Son. | |
| 340 Ie, I don't know what I'm doing, so my charsets first is as good as | |
| 341 any other arbitrary order. If you have a better idea, speak up! */ | |
| 342 { &Vcharset_ascii, "English", "en" }, | |
| 343 { &Vcharset_japanese_jisx0208, "Japanese", "ja" }, | |
| 344 { &Vcharset_japanese_jisx0212, "Japanese", "ja" }, | |
| 345 { &Vcharset_katakana_jisx0201, "Japanese", "ja" }, | |
| 346 { &Vcharset_latin_jisx0201, "Japanese", "ja" }, | |
| 347 { &Vcharset_japanese_jisx0208_1978, "Japanese", "ja" }, | |
| 348 { &Vcharset_greek_iso8859_7, "Greek", "el" }, | |
| 349 /* #### all the Chinese need checking | |
| 350 Damn the blood-sucking ISO anyway. */ | |
|
4756
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
351 { &Vcharset_chinese_gb2312, "simplified Chinese", "zh-cn" }, |
| 3659 | 352 { &Vcharset_korean_ksc5601, "Korean", "ko" }, |
|
4756
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
353 { &Vcharset_chinese_cns11643_1, "traditional Chinese", "zh-tw" }, |
|
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
354 { &Vcharset_chinese_cns11643_2, "traditional Chinese", "zh-tw" }, |
|
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
355 /* #### not obvious how to handle these |
|
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
356 We could (for experimental purposes) make the last element into |
|
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
357 an array of ISO 639 codes, and check for all of them. If a font |
|
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
358 provides some but not others, warn. */ |
| 3659 | 359 { &Vcharset_latin_iso8859_1, NULL, NULL }, |
| 360 { &Vcharset_latin_iso8859_2, NULL, NULL }, | |
| 361 { &Vcharset_latin_iso8859_3, NULL, NULL }, | |
| 362 { &Vcharset_latin_iso8859_4, NULL, NULL }, | |
| 363 { &Vcharset_latin_iso8859_9, NULL, NULL }, | |
| 364 { &Vcharset_latin_iso8859_15, NULL, NULL }, | |
|
4756
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
365 { &Vcharset_thai_tis620, "Thai", "th" }, |
|
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
366 /* We don't have an arabic charset. bidi issues, I guess? */ |
|
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
367 /* { &Vcharset_arabic_iso8859_6, "Arabic", "ar" }, */ |
| 3659 | 368 { &Vcharset_hebrew_iso8859_8, "Hebrew", "he" }, |
|
4756
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
369 /* #### probably close enough for Ukraine? */ |
|
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
370 { &Vcharset_cyrillic_iso8859_5, "Russian", "ru" }, |
| 3659 | 371 /* #### these probably are not quite right */ |
|
4756
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
372 { &Vcharset_chinese_big5_1, "traditional Chinese", "zh-tw" }, |
|
5d67242595a8
Update charset_table used by Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4494
diff
changeset
|
373 { &Vcharset_chinese_big5_2, "traditional Chinese", "zh-tw" }, |
| 3659 | 374 { NULL, NULL, NULL } |
| 375 }; | |
| 376 | |
| 377 /* Choose appropriate font name for debug messages. | |
| 378 Use only in the top half of next function (enforced with #undef). */ | |
| 379 #define DECLARE_DEBUG_FONTNAME(__xemacs_name) \ | |
| 380 Eistring *__xemacs_name; \ | |
| 381 do \ | |
| 382 { \ | |
| 383 __xemacs_name = debug_xft > 2 ? eistr_fullname \ | |
| 384 : debug_xft > 1 ? eistr_longname \ | |
| 385 : eistr_shortname; \ | |
| 386 } while (0) | |
| 387 | |
| 388 static Lisp_Object | |
| 389 xft_find_charset_font (Lisp_Object font, Lisp_Object charset, | |
| 390 enum font_specifier_matchspec_stages stage) | |
| 391 { | |
| 392 const Extbyte *patternext; | |
| 393 Lisp_Object result = Qnil; | |
| 394 | |
| 395 /* #### with Xft need to handle second stage here -- sjt | |
| 396 Hm. Or maybe not. That would be cool. :-) */ | |
| 397 if (stage) | |
| 398 return Qnil; | |
| 399 | |
| 400 /* Fontconfig converts all FreeType names to UTF-8 before passing them | |
| 401 back to callers---see fcfreetype.c (FcFreeTypeQuery). | |
| 402 I don't believe this is documented. */ | |
| 403 | |
| 404 DEBUG_XFT1 (1, "confirming charset for font instance %s\n", | |
| 405 XSTRING_DATA(font)); | |
| 406 | |
| 407 /* #### this looks like a fair amount of work, but the basic design | |
| 408 has never been rethought, and it should be | |
| 409 | |
| 410 what really should happen here is that we use FcFontSort (FcFontList?) | |
| 411 to get a list of matching fonts, then pick the first (best) one that | |
| 412 gives language or repertoire coverage. | |
| 413 */ | |
| 414 | |
| 415 FcInit (); /* No-op if already initialized. | |
| 416 In fontconfig 2.3.2, this cannot return | |
| 417 failure, but that looks like a bug. We | |
| 418 check for it with FcGetCurrentConfig(), | |
| 419 which *can* fail. */ | |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
420 if (!FcConfigGetCurrent()) |
| 3659 | 421 stderr_out ("Failed fontconfig initialization\n"); |
| 422 else | |
| 423 { | |
| 424 FcPattern *fontxft; /* long-lived, freed at end of this block */ | |
| 425 FcResult fcresult; | |
| 426 FcConfig *fcc; | |
| 4932 | 427 const Ascbyte *lang = "en"; |
| 3659 | 428 FcCharSet *fccs = NULL; |
| 429 DECLARE_EISTRING (eistr_shortname); /* user-friendly nickname */ | |
| 430 DECLARE_EISTRING (eistr_longname); /* omit FC_LANG and FC_CHARSET */ | |
| 431 DECLARE_EISTRING (eistr_fullname); /* everything */ | |
| 432 | |
| 433 LISP_STRING_TO_EXTERNAL (font, patternext, Qfc_font_name_encoding); | |
| 434 fcc = FcConfigGetCurrent (); | |
| 435 | |
| 436 /* parse the name, do the substitutions, and match the font */ | |
| 437 | |
| 438 { | |
| 439 FcPattern *p = FcNameParse ((FcChar8 *) patternext); | |
| 440 PRINT_XFT_PATTERN (3, "FcNameParse'ed name is %s\n", p); | |
| 441 /* #### Next two return FcBool, but what does the return mean? */ | |
| 442 /* The order is correct according the fontconfig docs. */ | |
| 443 FcConfigSubstitute (fcc, p, FcMatchPattern); | |
| 444 PRINT_XFT_PATTERN (2, "FcConfigSubstitute'ed name is %s\n", p); | |
| 445 FcDefaultSubstitute (p); | |
| 446 PRINT_XFT_PATTERN (3, "FcDefaultSubstitute'ed name is %s\n", p); | |
| 447 /* #### check fcresult of following match? */ | |
|
4809
0d3ccd5a2509
Initialize the result variable passed to FcFontMatch. See xemacs-patches
Jerry James <james@xemacs.org>
parents:
4758
diff
changeset
|
448 fcresult = FcResultMatch; |
| 3659 | 449 fontxft = FcFontMatch (fcc, p, &fcresult); |
|
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
450 switch (fcresult) |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
451 { |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
452 /* case FcResultOutOfMemory: */ |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
453 case FcResultNoMatch: |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
454 case FcResultTypeMismatch: |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
455 case FcResultNoId: |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
456 break; |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
457 case FcResultMatch: |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
458 /* this prints the long fontconfig name */ |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
459 PRINT_XFT_PATTERN (1, "FcFontMatch'ed name is %s\n", fontxft); |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
460 break; |
|
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
461 } |
| 3659 | 462 FcPatternDestroy (p); |
| 463 } | |
| 464 | |
| 465 /* heuristic to give reasonable-length names for debug reports | |
| 466 | |
| 467 I considered #ifdef SUPPORT_FULL_FONTCONFIG_NAME etc but that's | |
| 468 pointless. We're just going to remove this code once the font/ | |
| 469 face refactoring is done, but until then it could be very useful. | |
| 470 */ | |
| 471 { | |
| 472 FcPattern *p = FcFontRenderPrepare (fcc, fontxft, fontxft); | |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
473 Extbyte *name; |
| 3659 | 474 |
| 475 /* full name, including language coverage and repertoire */ | |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
476 name = (Extbyte *) FcNameUnparse (p); |
|
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
477 eicpy_ext (eistr_fullname, |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
478 (name ? name : "NOT FOUND"), |
|
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
479 Qfc_font_name_encoding); |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
480 if (name) free (name); |
| 3659 | 481 |
| 482 /* long name, omitting coverage and repertoire, plus a number | |
| 483 of rarely useful properties */ | |
| 484 FcPatternDel (p, FC_CHARSET); | |
| 485 FcPatternDel (p, FC_LANG); | |
| 3841 | 486 #ifdef FC_WIDTH |
| 3659 | 487 FcPatternDel (p, FC_WIDTH); |
| 3841 | 488 #endif |
| 3659 | 489 FcPatternDel (p, FC_SPACING); |
| 490 FcPatternDel (p, FC_HINTING); | |
| 491 FcPatternDel (p, FC_VERTICAL_LAYOUT); | |
| 492 FcPatternDel (p, FC_AUTOHINT); | |
| 493 FcPatternDel (p, FC_GLOBAL_ADVANCE); | |
| 494 FcPatternDel (p, FC_INDEX); | |
| 495 FcPatternDel (p, FC_SCALE); | |
| 496 FcPatternDel (p, FC_FONTVERSION); | |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
497 name = (Extbyte *) FcNameUnparse (p); |
|
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
498 eicpy_ext (eistr_longname, |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
499 (name ? name : "NOT FOUND"), |
|
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
500 Qfc_font_name_encoding); |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
501 if (name) free (name); |
| 3659 | 502 |
| 503 /* nickname, just family and size, but | |
| 504 "family" names usually have style, slant, and weight */ | |
| 505 FcPatternDel (p, FC_FOUNDRY); | |
| 506 FcPatternDel (p, FC_STYLE); | |
| 507 FcPatternDel (p, FC_SLANT); | |
| 508 FcPatternDel (p, FC_WEIGHT); | |
| 509 FcPatternDel (p, FC_PIXEL_SIZE); | |
| 510 FcPatternDel (p, FC_OUTLINE); | |
| 511 FcPatternDel (p, FC_SCALABLE); | |
| 512 FcPatternDel (p, FC_DPI); | |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
513 name = (Extbyte *) FcNameUnparse (p); |
|
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
514 eicpy_ext (eistr_shortname, |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
515 (name ? name : "NOT FOUND"), |
|
4757
a23ac8f90a49
Improve warning and error messages from Xft.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4756
diff
changeset
|
516 Qfc_font_name_encoding); |
|
4758
75975fd0b7fc
Implement more of the fontconfig API.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4757
diff
changeset
|
517 if (name) free (name); |
| 3659 | 518 |
| 519 FcPatternDestroy (p); | |
| 520 } | |
| 521 | |
| 522 /* The language approach may better in the long run, but we can't use | |
| 523 it based on Mule charsets; fontconfig doesn't provide a way to test | |
| 524 for unions of languages, etc. That will require support from the | |
| 525 text module. | |
| 526 | |
| 527 Optimization: cache the generated FcCharSet in the Mule charset. | |
| 528 Don't forget to destroy it if the Mule charset gets deallocated. */ | |
| 529 | |
| 530 { | |
| 531 /* This block possibly should be a function, but it generates | |
| 532 multiple values. I find the "pass an address to return the | |
| 533 value in" idiom opaque, so prefer a block. */ | |
| 534 struct charset_reporter *cr; | |
| 535 for (cr = charset_table; | |
| 536 cr->charset && !EQ (*(cr->charset), charset); | |
| 537 cr++) | |
| 538 ; | |
| 539 | |
| 540 if (cr->rfc3066) | |
| 541 { | |
| 542 DECLARE_DEBUG_FONTNAME (name); | |
| 543 CHECKING_LANG (0, eidata(name), cr->language); | |
| 4932 | 544 lang = cr->rfc3066; |
| 3659 | 545 } |
| 546 else if (cr->charset) | |
| 547 { | |
| 548 /* what the hey, build 'em on the fly */ | |
| 549 /* #### in the case of error this could return NULL! */ | |
| 550 fccs = mule_to_fc_charset (charset); | |
| 4932 | 551 /* #### Bad idea here */ |
| 552 lang = (const Ascbyte *) XSTRING_DATA (XSYMBOL (XCHARSET_NAME | |
| 553 (charset))->name); | |
| 3659 | 554 } |
| 555 else | |
| 556 { | |
| 557 /* OK, we fell off the end of the table */ | |
| 558 warn_when_safe_lispobj (intern ("xft"), intern ("alert"), | |
| 559 list2 (build_string ("unchecked charset"), | |
| 560 charset)); | |
| 561 /* default to "en" | |
| 562 #### THIS IS WRONG, WRONG, WRONG!! | |
| 563 It is why we never fall through to XLFD-checking. */ | |
| 564 } | |
| 565 | |
| 4932 | 566 ASSERT_ASCTEXT_ASCII (lang); |
| 3659 | 567 |
| 568 if (fccs) | |
| 569 { | |
| 570 /* check for character set coverage */ | |
| 571 int i = 0; | |
| 572 FcCharSet *v; | |
| 573 FcResult r = FcPatternGetCharSet (fontxft, FC_CHARSET, i, &v); | |
| 574 | |
| 575 if (r == FcResultTypeMismatch) | |
| 576 { | |
| 577 DEBUG_XFT0 (0, "Unexpected type return in charset value\n"); | |
| 578 result = Qnil; | |
| 579 } | |
| 580 else if (r == FcResultMatch && FcCharSetIsSubset (fccs, v)) | |
| 581 { | |
| 582 /* The full pattern with the bitmap coverage is massively | |
| 583 unwieldy, but the shorter names are just *wrong*. We | |
| 584 should have the full thing internally as truename, and | |
| 585 filter stuff the client doesn't want to see on output. | |
| 586 Should we just store it into the truename right here? */ | |
| 587 DECLARE_DEBUG_FONTNAME (name); | |
| 588 DEBUG_XFT2 (0, "Xft font %s supports %s\n", | |
| 589 eidata(name), lang); | |
| 590 #ifdef RETURN_LONG_FONTCONFIG_NAMES | |
| 591 result = eimake_string(eistr_fullname); | |
| 592 #else | |
| 593 result = eimake_string(eistr_longname); | |
| 594 #endif | |
| 595 } | |
| 596 else | |
| 597 { | |
| 598 DECLARE_DEBUG_FONTNAME (name); | |
| 599 DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", | |
| 600 eidata(name), lang); | |
| 601 result = Qnil; | |
| 602 } | |
| 603 | |
| 604 /* clean up */ | |
| 605 FcCharSetDestroy (fccs); | |
| 606 } | |
| 607 else | |
| 608 { | |
| 609 /* check for language coverage */ | |
| 610 int i = 0; | |
| 611 FcValue v; | |
| 612 /* the main event */ | |
| 613 FcResult r = FcPatternGet (fontxft, FC_LANG, i, &v); | |
| 614 | |
| 615 if (r == FcResultMatch) | |
| 616 { | |
| 617 if (v.type != FcTypeLangSet) /* excessive paranoia */ | |
| 618 { | |
| 619 ASSERT_ASCTEXT_ASCII(FcTypeOfValueToString(v)); | |
| 620 /* Urk! Fall back and punt to core font. */ | |
| 621 DEBUG_XFT1 (0, "Unexpected type of lang value (%s)\n", | |
| 622 FcTypeOfValueToString (v)); | |
| 623 result = Qnil; | |
| 624 } | |
| 4932 | 625 else if (FcLangSetHasLang (v.u.l, (FcChar8 *) lang) |
| 626 != FcLangDifferentLang) | |
| 3659 | 627 { |
| 628 DECLARE_DEBUG_FONTNAME (name); | |
| 629 DEBUG_XFT2 (0, "Xft font %s supports %s\n", | |
| 630 eidata(name), lang); | |
| 631 #ifdef RETURN_LONG_FONTCONFIG_NAMES | |
| 632 result = eimake_string(eistr_fullname); | |
| 633 #else | |
| 634 result = eimake_string(eistr_longname); | |
| 635 #endif | |
| 636 } | |
| 637 else | |
| 638 { | |
| 639 DECLARE_DEBUG_FONTNAME (name); | |
| 640 DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", | |
| 641 eidata(name), lang); | |
| 642 result = Qnil; | |
| 643 } | |
| 644 } | |
| 645 else | |
| 646 { | |
| 647 ASSERT_ASCTEXT_ASCII(FcResultToString(r)); | |
| 648 DEBUG_XFT1 (0, "Getting lang: unexpected result=%s\n", | |
| 649 FcResultToString (r)); | |
| 650 result = Qnil; | |
| 651 } | |
| 652 } | |
| 653 | |
| 654 /* clean up and maybe return */ | |
| 655 FcPatternDestroy (fontxft); | |
| 656 if (!UNBOUNDP (result)) | |
| 657 return result; | |
| 658 } | |
| 659 } | |
| 660 return Qnil; | |
| 661 } | |
| 662 #undef DECLARE_DEBUG_FONTNAME | |
| 663 | |
| 664 #endif /* USE_XFT */ | |
| 665 | |
| 666 /* find a font spec that matches font spec FONT and also matches | |
| 667 (the registry of) CHARSET. */ | |
| 668 static Lisp_Object | |
| 669 #ifdef THIS_IS_GTK | |
| 670 gtk_find_charset_font (Lisp_Object device, Lisp_Object font, | |
| 671 Lisp_Object charset, | |
| 672 enum font_specifier_matchspec_stages stage) | |
| 673 #else | |
| 674 x_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset, | |
| 675 enum font_specifier_matchspec_stages stage) | |
| 676 #endif | |
| 677 { | |
| 678 Lisp_Object result = Qnil, registries = Qnil; | |
| 679 int j, hyphen_count, registries_len = 0; | |
| 680 Ibyte *hyphening, *new_hyphening; | |
| 681 Bytecount xlfd_length; | |
| 682 | |
| 683 DECLARE_EISTRING(ei_xlfd_without_registry); | |
| 684 DECLARE_EISTRING(ei_xlfd); | |
| 685 | |
| 686 #ifdef USE_XFT | |
| 687 result = xft_find_charset_font(font, charset, stage); | |
| 688 if (!NILP(result)) | |
| 689 { | |
| 690 return result; | |
| 691 } | |
| 692 #endif | |
| 693 | |
| 694 switch (stage) | |
| 695 { | |
| 696 case initial: | |
| 697 { | |
| 698 if (!(NILP(XCHARSET_REGISTRIES(charset))) | |
| 699 && VECTORP(XCHARSET_REGISTRIES(charset))) | |
| 700 { | |
| 701 registries_len = XVECTOR_LENGTH(XCHARSET_REGISTRIES(charset)); | |
| 702 registries = XCHARSET_REGISTRIES(charset); | |
| 703 } | |
| 704 break; | |
| 705 } | |
| 706 case final: | |
| 707 { | |
| 708 registries_len = 1; | |
| 709 registries = Qunicode_registries; | |
| 710 break; | |
| 711 } | |
| 712 default: | |
| 713 { | |
| 714 assert(0); | |
| 715 break; | |
| 716 } | |
| 717 } | |
| 718 | |
| 719 eicpy_lstr(ei_xlfd, font); | |
| 720 hyphening = eidata(ei_xlfd); | |
| 721 xlfd_length = eilen(ei_xlfd); | |
| 722 | |
| 723 /* Count the hyphens in the string, moving new_hyphening to just after the | |
| 724 last one. */ | |
| 725 hyphen_count = count_hyphens(hyphening, xlfd_length, &new_hyphening); | |
| 726 | |
| 727 if (0 == registries_len || (5 > hyphen_count && | |
| 728 !(1 == xlfd_length && '*' == *hyphening))) | |
| 729 { | |
| 730 /* No proper XLFD specified, or we can't modify the pattern to change | |
| 731 the registry and encoding to match what we want, or we have no | |
| 732 information on the registry needed. */ | |
| 733 eito_external(ei_xlfd, Qx_font_name_encoding); | |
| 734 DEBUG_OBJECTS ("about to xlistfonts_checking_charset, XLFD %s\n", | |
| 735 eidata(ei_xlfd)); | |
| 736 result = xlistfonts_checking_charset (device, eiextdata(ei_xlfd), | |
| 737 charset, stage); | |
| 738 /* No need to loop through the available registries; return | |
| 739 immediately. */ | |
| 740 return result; | |
| 741 } | |
| 742 else if (1 == xlfd_length && '*' == *hyphening) | |
| 743 { | |
| 744 /* It's a single asterisk. We can add the registry directly to the | |
| 745 end. */ | |
| 746 eicpy_ch(ei_xlfd_without_registry, '*'); | |
| 747 } | |
| 748 else | |
| 749 { | |
| 750 /* It's a fully-specified XLFD. Work out where the registry and | |
| 751 encoding are, and initialise ei_xlfd_without_registry to the string | |
| 752 without them. */ | |
| 753 | |
| 754 /* count_hyphens has set new_hyphening to just after the last | |
| 755 hyphen. Move back to just after the hyphen before it. */ | |
| 756 | |
| 757 for (new_hyphening -= 2; new_hyphening > hyphening | |
| 758 && '-' != *new_hyphening; --new_hyphening) | |
| 759 ; | |
| 760 ++new_hyphening; | |
| 761 | |
| 762 eicpy_ei(ei_xlfd_without_registry, ei_xlfd); | |
| 763 | |
| 764 /* Manipulate ei_xlfd_without_registry, using the information about | |
| 765 ei_xlfd, to which it's identical. */ | |
| 766 eidel(ei_xlfd_without_registry, new_hyphening - hyphening, -1, | |
| 767 eilen(ei_xlfd) - (new_hyphening - hyphening), -1); | |
| 768 | |
| 769 } | |
| 770 | |
| 771 /* Now, loop through the registries and encodings defined for this | |
| 772 charset, doing an XListFonts each time with the pattern modified to | |
| 773 specify the regisry and encoding. This avoids huge amounts of IPC and | |
| 774 duplicated searching; now we use the searching the X server was doing | |
| 775 anyway, where before the X server did its search, transferred huge | |
| 776 amounts of data, and then we proceeded to do a regexp search on that | |
| 777 data. */ | |
| 778 for (j = 0; j < registries_len && NILP(result); ++j) | |
| 779 { | |
| 780 eireset(ei_xlfd); | |
| 781 eicpy_ei(ei_xlfd, ei_xlfd_without_registry); | |
| 782 | |
| 783 eicat_lstr(ei_xlfd, XVECTOR_DATA(registries)[j]); | |
| 784 | |
| 785 eito_external(ei_xlfd, Qx_font_name_encoding); | |
| 786 | |
| 787 DEBUG_OBJECTS ("about to xlistfonts_checking_charset, XLFD %s\n", | |
| 788 eidata(ei_xlfd)); | |
| 789 result = xlistfonts_checking_charset (device, eiextdata(ei_xlfd), | |
| 790 charset, stage); | |
| 791 } | |
| 792 | |
| 3676 | 793 /* In the event that the charset is ASCII and we haven't matched |
| 794 anything up to now, even with a pattern of "*", add "iso8859-1" | |
| 795 to the charset's registry and try again. Not returning a result | |
| 796 for ASCII means our frame geometry calculations are | |
| 797 inconsistent, and that we may crash. */ | |
| 798 | |
| 799 if (1 == xlfd_length && EQ(charset, Vcharset_ascii) && NILP(result) | |
| 800 && ('*' == eigetch(ei_xlfd_without_registry, 0))) | |
| 801 | |
| 802 { | |
| 803 int have_latin1 = 0; | |
| 804 | |
| 805 /* Set this to, for example, is08859-1 if you want to see the | |
| 806 error behaviour. */ | |
| 807 | |
| 808 #define FALLBACK_ASCII_REGISTRY "iso8859-1" | |
| 809 | |
| 810 for (j = 0; j < registries_len; ++j) | |
| 811 { | |
| 812 if (0 == qxestrcasecmp(XSTRING_DATA(XVECTOR_DATA(registries)[j]), | |
| 4124 | 813 (Ibyte *) FALLBACK_ASCII_REGISTRY)) |
| 3676 | 814 { |
| 815 have_latin1 = 1; | |
| 816 break; | |
| 817 } | |
| 818 } | |
| 819 | |
| 820 if (!have_latin1) | |
| 821 { | |
| 822 Lisp_Object new_registries = make_vector(registries_len + 1, Qnil); | |
| 823 | |
| 824 XVECTOR_DATA(new_registries)[0] | |
| 825 = build_string(FALLBACK_ASCII_REGISTRY); | |
| 826 | |
| 827 memcpy(XVECTOR_DATA(new_registries) + 1, | |
| 828 XVECTOR_DATA(registries), | |
| 829 sizeof XVECTOR_DATA(registries)[0] * | |
| 830 XVECTOR_LENGTH(registries)); | |
| 831 | |
| 832 /* Calling set_charset_registries instead of overwriting the | |
| 833 value directly, to allow the charset font caches to be | |
| 834 invalidated and a change to the default face to be | |
| 835 noted. */ | |
| 836 set_charset_registries(charset, new_registries); | |
| 837 | |
| 3680 | 838 warn_when_safe (Qface, Qwarning, |
| 839 "Your ASCII charset registries contain nothing " | |
| 840 "sensible. Adding `" FALLBACK_ASCII_REGISTRY "'."); | |
| 841 | |
| 3676 | 842 /* And recurse. */ |
| 843 result = | |
| 844 DEVMETH_OR_GIVEN (XDEVICE (device), find_charset_font, | |
| 845 (device, font, charset, stage), | |
| 846 result); | |
| 847 } | |
| 848 else | |
| 849 { | |
| 850 DECLARE_EISTRING (ei_connection_name); | |
| 851 | |
| 852 /* We preserve a copy of the connection name for the error message | |
| 853 after the device is deleted. */ | |
| 854 eicpy_lstr (ei_connection_name, | |
| 855 DEVICE_CONNECTION (XDEVICE(device))); | |
| 856 | |
| 857 stderr_out ("Cannot find a font for ASCII, deleting device on %s\n", | |
| 858 eidata (ei_connection_name)); | |
| 859 | |
| 860 io_error_delete_device (device); | |
| 861 | |
| 862 /* Do a normal warning in the event that we have other, non-X | |
| 863 frames available. (If we don't, io_error_delete_device will | |
| 864 have exited.) */ | |
| 865 warn_when_safe | |
| 866 (Qface, Qerror, | |
| 867 "Cannot find a font for ASCII, deleting device on %s.\n" | |
| 868 "\n" | |
| 869 "Your X server fonts appear to be inconsistent; fix them, or\n" | |
| 870 "the next frame you create on that DISPLAY will crash this\n" | |
| 871 "XEmacs. At a minimum, provide one font with an XLFD ending\n" | |
| 872 "in `" FALLBACK_ASCII_REGISTRY "', so we can work out what size\n" | |
| 873 "a frame should be. ", | |
| 874 eidata (ei_connection_name)); | |
| 875 } | |
| 876 | |
| 877 } | |
| 878 | |
| 3659 | 879 /* This function used to return the font spec, in the case where a font |
| 880 didn't exist on the X server but it did match the charset. We're not | |
| 881 doing that any more, because none of the other platform code does, and | |
| 882 the old behaviour was badly-judged in other respects, so I don't trust | |
| 883 the original author to have had a good reason for it. */ | |
| 884 | |
| 885 return result; | |
| 886 } | |
| 887 | |
| 888 #endif /* MULE */ |