Mercurial > hg > xemacs-beta

comparison src/faces.c @ 4916:a6c778975d7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
split USE_XFT into HAVE_XFT/USE_XFT -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * configure: * configure.ac (TAB): USE_XFT* -> HAVE_XFT*. lwlib/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * lwlib-colors.c: * lwlib-colors.h: * lwlib-fonts.c: * lwlib-fonts.h: * xlwmenu.c: * xlwmenu.c (xlwMenuResources): * xlwmenu.c (x_xft_text_width): * xlwmenu.c (label_button_draw): * xlwmenu.c (push_button_size): * xlwmenu.c (push_button_draw): * xlwmenu.c (make_drawing_gcs): * xlwmenu.c (extract_font_extents): * xlwmenu.c (default_font_of_font_list): * xlwmenu.c (XlwMenuInitialize): * xlwmenu.c (XlwMenuDestroy): * xlwmenu.c (XlwMenuSetValues): * xlwmenuP.h: * xlwmenuP.h (_XlwMenu_part): * xlwtabs.c: * xlwtabs.c (TabsInit): * xlwtabs.c (TabsDestroy): * xlwtabs.c (TabsSetValues): * xlwtabs.c (DrawTab): * xlwtabs.c (TabWidth): * xlwtabs.c (TabsAllocFgGC): * xlwtabs.c (TabsAllocGreyGC): * xlwtabsP.h: USE_XFT* -> HAVE_XFT*. src/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * Makefile.in.in: * compiler.h: * config.h.in: * console-x-impl.h: * console-x-impl.h (struct x_frame): * console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P): * console-x.h: * console-xlike-inc.h: * emacs.c (main_1): * faces.c (complex_vars_of_faces): * font-mgr.h: * frame-x.c (x_delete_frame): * frame-x.c (x_update_frame_external_traits): * glyphs-x.c (update_widget_face): * inline.c: * objects-x-impl.h: * objects-x-impl.h (struct x_color_instance_data): * objects-x-impl.h (struct x_font_instance_data): * objects-x.c: * objects-x.c (x_initialize_color_instance): * objects-x.c (x_initialize_font_instance): * objects-x.c (x_print_font_instance): * objects-x.c (x_finalize_font_instance): * objects-x.c (x_font_instance_truename): * objects-x.c (vars_of_objects_x): * objects-x.h: USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and redisplay-xlike-inc.c, continue to use USE_XFT, and define it appropriately in console-xlike-inc.h when both HAVE_XFT and THIS_IS_X -- even if HAVE_XFT, we don't want to enable XFT code when included in a *-gtk.c file.
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 22:00:29 -0600
parents 6ef8256a020a
children cbe181529c34
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
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_string (*fontptr)), 2339 build_string (*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_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), 2420 build_string ("-*-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_string ("normal")), 2428 inst_list = Fcons (Fcons (list1 (Qtty), build_string ("normal")),