Mercurial > hg > xemacs-beta

comparison src/faces.c @ 4969:cbe181529c34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 21:46:21 -0600
parents e813cf16c015 a6c778975d7d
children ae48681c47fa
comparison
equal deleted inserted replaced
4968:4d35e52790f8 4969:cbe181529c34
2270 Lisp_Object device_symbol = Qgtk; 2270 Lisp_Object device_symbol = Qgtk;
2271 #else 2271 #else
2272 Lisp_Object device_symbol = Qx; 2272 Lisp_Object device_symbol = Qx;
2273 #endif 2273 #endif
2274 2274
2275 #if defined (USE_XFT) || defined (MULE) 2275 #if defined (HAVE_XFT) || defined (MULE)
2276 const Ascbyte **fontptr; 2276 const Ascbyte **fontptr;
2277 2277
2278 const Ascbyte *fonts[] = 2278 const Ascbyte *fonts[] =
2279 { 2279 {
2280 #ifdef USE_XFT 2280 #ifdef HAVE_XFT
2281 /************** Xft fonts *************/ 2281 /************** Xft fonts *************/
2282 2282
2283 /* Note that fontconfig can search for several font families in one 2283 /* Note that fontconfig can search for several font families in one
2284 call. We should use this facility. */ 2284 call. We should use this facility. */
2285 "Monospace-12", 2285 "Monospace-12",
2300 corresponding to one of them fails!) */ 2300 corresponding to one of them fails!) */
2301 "-*-*-medium-r-*-*-*-160-*-*-c-*-*-*", 2301 "-*-*-medium-r-*-*-*-160-*-*-c-*-*-*",
2302 "-*-*-medium-r-*-*-*-170-*-*-c-*-*-*", 2302 "-*-*-medium-r-*-*-*-170-*-*-c-*-*-*",
2303 #endif 2303 #endif
2304 }; 2304 };
2305 #endif /* defined (USE_XFT) || defined (MULE) */ 2305 #endif /* defined (HAVE_XFT) || defined (MULE) */
2306 2306
2307 #ifdef MULE 2307 #ifdef MULE
2308 2308
2309 /* Define some specifier tags for classes of character sets. Combining 2309 /* Define some specifier tags for classes of character sets. Combining
2310 these allows for distinct fallback fonts for distinct dimensions of 2310 these allows for distinct fallback fonts for distinct dimensions of
2331 when the default face is determined from X resources at startup. */ 2331 when the default face is determined from X resources at startup. */
2332 define_specifier_tag (Qx_coverage_instantiator, Qnil, Qnil); 2332 define_specifier_tag (Qx_coverage_instantiator, Qnil, Qnil);
2333 2333
2334 #endif /* MULE */ 2334 #endif /* MULE */
2335 2335
2336 #ifdef USE_XFT 2336 #ifdef HAVE_XFT
2337 for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--) 2337 for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
2338 inst_list = Fcons (Fcons (list1 (device_symbol), 2338 inst_list = Fcons (Fcons (list1 (device_symbol),
2339 build_cistring (*fontptr)), 2339 build_cistring (*fontptr)),
2340 inst_list); 2340 inst_list);
2341 2341
2342 #else /* !USE_XFT */ 2342 #else /* !HAVE_XFT */
2343 inst_list = 2343 inst_list =
2344 Fcons 2344 Fcons
2345 (Fcons 2345 (Fcons
2346 (list1 (device_symbol), 2346 (list1 (device_symbol),
2347 /* grrr. This really does need to be "*", not an XLFD. 2347 /* grrr. This really does need to be "*", not an XLFD.
2418 (Fcons 2418 (Fcons
2419 (list1 (device_symbol), 2419 (list1 (device_symbol),
2420 build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), 2420 build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
2421 inst_list); 2421 inst_list);
2422 2422
2423 #endif /* !USE_XFT */ 2423 #endif /* !HAVE_XFT */
2424 2424
2425 #endif /* HAVE_X_WINDOWS || HAVE_GTK */ 2425 #endif /* HAVE_X_WINDOWS || HAVE_GTK */
2426 2426
2427 #ifdef HAVE_TTY 2427 #ifdef HAVE_TTY
2428 inst_list = Fcons (Fcons (list1 (Qtty), build_ascstring ("normal")), 2428 inst_list = Fcons (Fcons (list1 (Qtty), build_ascstring ("normal")),