Mercurial > hg > xemacs-beta

comparison src/frame-x.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 bc4f2511bbea
children cbe181529c34
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
2604 2604
2605 #ifdef HAVE_CDE 2605 #ifdef HAVE_CDE
2606 DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f)); 2606 DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f));
2607 #endif /* HAVE_CDE */ 2607 #endif /* HAVE_CDE */
2608 2608
2609 #ifdef USE_XFT 2609 #ifdef HAVE_XFT
2610 /* If we have an XftDraw structure, we need to free it here. 2610 /* If we have an XftDraw structure, we need to free it here.
2611 We can't ever have an XftDraw without a Display, so we are safe 2611 We can't ever have an XftDraw without a Display, so we are safe
2612 to free it in here, and we avoid too much playing around with the 2612 to free it in here, and we avoid too much playing around with the
2613 malloc checking hooks this way. */ 2613 malloc checking hooks this way. */
2614 if (FRAME_X_XFTDRAW (f)) 2614 if (FRAME_X_XFTDRAW (f))
2711 What does XtSetValues() do if that resource isn't present? */ 2711 What does XtSetValues() do if that resource isn't present? */
2712 if (!EQ (font, Vthe_null_font_instance)) 2712 if (!EQ (font, Vthe_null_font_instance))
2713 { 2713 {
2714 if (0) 2714 if (0)
2715 ; 2715 ;
2716 #ifdef USE_XFT 2716 #ifdef HAVE_XFT
2717 else if (FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font))) 2717 else if (FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font)))
2718 { 2718 {
2719 Xt_SET_ARG (al[ac], XtNxftFont, 2719 Xt_SET_ARG (al[ac], XtNxftFont,
2720 (void *) FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font))); 2720 (void *) FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font)));
2721 ac++; 2721 ac++;