Mercurial > hg > xemacs-beta

comparison src/objects-x-impl.h @ 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 87175eb65ff4
children
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
27 #ifndef INCLUDED_objects_x_impl_h_ 27 #ifndef INCLUDED_objects_x_impl_h_
28 #define INCLUDED_objects_x_impl_h_ 28 #define INCLUDED_objects_x_impl_h_
29 29
30 #include "objects-impl.h" 30 #include "objects-impl.h"
31 #include "objects-x.h" 31 #include "objects-x.h"
32 #ifdef USE_XFT 32 #ifdef HAVE_XFT
33 /* for resource name definitions, etc */ 33 /* for resource name definitions, etc */
34 #include "../lwlib/lwlib-fonts.h" 34 #include "../lwlib/lwlib-fonts.h"
35 #endif 35 #endif
36 36
37 #ifdef HAVE_X_WINDOWS 37 #ifdef HAVE_X_WINDOWS
43 struct x_color_instance_data 43 struct x_color_instance_data
44 { 44 {
45 XColor color; 45 XColor color;
46 /* Yes, it looks crazy to have both the XColor and the XftColor, but 46 /* Yes, it looks crazy to have both the XColor and the XftColor, but
47 pragmatically both are used. */ 47 pragmatically both are used. */
48 #ifdef USE_XFT 48 #ifdef HAVE_XFT
49 XftColor xftColor; 49 XftColor xftColor;
50 #endif 50 #endif
51 char dealloc_on_gc; 51 char dealloc_on_gc;
52 }; 52 };
53 53
54 #define X_COLOR_INSTANCE_DATA(c) ((struct x_color_instance_data *) (c)->data) 54 #define X_COLOR_INSTANCE_DATA(c) ((struct x_color_instance_data *) (c)->data)
55 #define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color) 55 #define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color)
56 #define XCOLOR_INSTANCE_X_COLOR(c) COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (c)) 56 #define XCOLOR_INSTANCE_X_COLOR(c) COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (c))
57 #ifdef USE_XFT 57 #ifdef HAVE_XFT
58 #define COLOR_INSTANCE_X_XFTCOLOR(c) (X_COLOR_INSTANCE_DATA (c)->xftColor) 58 #define COLOR_INSTANCE_X_XFTCOLOR(c) (X_COLOR_INSTANCE_DATA (c)->xftColor)
59 #endif 59 #endif
60 #define COLOR_INSTANCE_X_DEALLOC(c) (X_COLOR_INSTANCE_DATA (c)->dealloc_on_gc) 60 #define COLOR_INSTANCE_X_DEALLOC(c) (X_COLOR_INSTANCE_DATA (c)->dealloc_on_gc)
61 61
62 /***************************************************************************** 62 /*****************************************************************************
68 /* X-specific information */ 68 /* X-specific information */
69 /* Yes, it looks crazy to have both the XFontStruct and the XftFont, but 69 /* Yes, it looks crazy to have both the XFontStruct and the XftFont, but
70 pragmatically both are used (lwlib delegates labels to the widget sets, 70 pragmatically both are used (lwlib delegates labels to the widget sets,
71 which internally use XFontStructs). */ 71 which internally use XFontStructs). */
72 XFontStruct * font; 72 XFontStruct * font;
73 #ifdef USE_XFT 73 #ifdef HAVE_XFT
74 XftFont *xftFont; 74 XftFont *xftFont;
75 #endif 75 #endif
76 76
77 }; 77 };
78 78
79 #define X_FONT_INSTANCE_DATA(f) ((struct x_font_instance_data *) (f)->data) 79 #define X_FONT_INSTANCE_DATA(f) ((struct x_font_instance_data *) (f)->data)
80 #define FONT_INSTANCE_X_FONT(f) (X_FONT_INSTANCE_DATA (f)->font) 80 #define FONT_INSTANCE_X_FONT(f) (X_FONT_INSTANCE_DATA (f)->font)
81 #define XFONT_INSTANCE_X_FONT(c) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (c)) 81 #define XFONT_INSTANCE_X_FONT(c) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (c))
82 #ifdef USE_XFT 82 #ifdef HAVE_XFT
83 #define FONT_INSTANCE_X_XFTFONT(f) (X_FONT_INSTANCE_DATA (f)->xftFont) 83 #define FONT_INSTANCE_X_XFTFONT(f) (X_FONT_INSTANCE_DATA (f)->xftFont)
84 #endif 84 #endif
85 85
86 #endif /* HAVE_X_WINDOWS */ 86 #endif /* HAVE_X_WINDOWS */
87 87