Mercurial > hg > xemacs-beta

comparison src/emacs.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 d8d92ad084b8
children fce43cb76a1c
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
1639 #ifdef XIM_XLIB 1639 #ifdef XIM_XLIB
1640 syms_of_input_method_xlib (); 1640 syms_of_input_method_xlib ();
1641 #endif 1641 #endif
1642 #endif /* HAVE_XIM */ 1642 #endif /* HAVE_XIM */
1643 1643
1644 #ifdef USE_XFT 1644 #ifdef HAVE_XFT
1645 syms_of_font_mgr(); 1645 syms_of_font_mgr();
1646 #endif 1646 #endif
1647 1647
1648 #endif /* HAVE_X_WINDOWS */ 1648 #endif /* HAVE_X_WINDOWS */
1649 1649
2222 #endif 2222 #endif
2223 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) 2223 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
2224 vars_of_gui_x (); 2224 vars_of_gui_x ();
2225 #endif 2225 #endif
2226 2226
2227 #ifdef USE_XFT 2227 #ifdef HAVE_XFT
2228 vars_of_font_mgr (); 2228 vars_of_font_mgr ();
2229 #endif 2229 #endif
2230 2230
2231 #endif /* HAVE_X_WINDOWS */ 2231 #endif /* HAVE_X_WINDOWS */
2232 2232
2352 #endif 2352 #endif
2353 reinit_vars_of_select_x (); 2353 reinit_vars_of_select_x ();
2354 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS) 2354 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
2355 reinit_vars_of_gui_x (); 2355 reinit_vars_of_gui_x ();
2356 #endif 2356 #endif
2357 #ifdef USE_XFT 2357 #ifdef HAVE_XFT
2358 reinit_vars_of_font_mgr (); 2358 reinit_vars_of_font_mgr ();
2359 #endif 2359 #endif
2360 #endif /* HAVE_X_WINDOWS */ 2360 #endif /* HAVE_X_WINDOWS */
2361 2361
2362 #ifdef MULE 2362 #ifdef MULE
2425 objects and we have defined the basic coding systems (in the 2425 objects and we have defined the basic coding systems (in the
2426 just-previous complex-vars calls). We will in fact do conversion 2426 just-previous complex-vars calls). We will in fact do conversion
2427 quite soon, e.g. in complex_vars_of_glyphs_x(). */ 2427 quite soon, e.g. in complex_vars_of_glyphs_x(). */
2428 inhibit_non_essential_conversion_operations = 0; 2428 inhibit_non_essential_conversion_operations = 0;
2429 2429
2430 #ifdef USE_XFT 2430 #ifdef HAVE_XFT
2431 /* This uses coding systems. Must be done before faces are init'ed. */ 2431 /* This uses coding systems. Must be done before faces are init'ed. */
2432 /* not in xft reloaded #3 */ 2432 /* not in xft reloaded #3 */
2433 complex_vars_of_font_mgr (); 2433 complex_vars_of_font_mgr ();
2434 #endif 2434 #endif
2435 2435