Mercurial > hg > xemacs-beta

comparison lwlib/lwlib-fonts.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 6aa26bef0527
children 308d34e9f07d
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
27 #ifndef INCLUDED_lwlib_fonts_h_ 27 #ifndef INCLUDED_lwlib_fonts_h_
28 #define INCLUDED_lwlib_fonts_h_ 28 #define INCLUDED_lwlib_fonts_h_
29 29
30 /* get headers */ 30 /* get headers */
31 31
32 #ifdef USE_XFT 32 #ifdef HAVE_XFT
33 #define _XFT_NO_COMPAT_ 33 #define _XFT_NO_COMPAT_
34 /* shut up GCC */ 34 /* shut up GCC */
35 #define face_index face_index_arg 35 #define face_index face_index_arg
36 #define glyph_index glyph_index_arg 36 #define glyph_index glyph_index_arg
37 #include <X11/Xft/Xft.h> 37 #include <X11/Xft/Xft.h>
39 #undef face_index 39 #undef face_index
40 40
41 #if XFT_MAJOR < 2 41 #if XFT_MAJOR < 2
42 #error Xft versions < 2 not supported 42 #error Xft versions < 2 not supported
43 #endif 43 #endif
44 #endif /* USE_XFT */ 44 #endif /* HAVE_XFT */
45 45
46 /* Xt name macros */ 46 /* Xt name macros */
47 47
48 #ifdef USE_XFT 48 #ifdef HAVE_XFT
49 #ifndef XtNxftFont 49 #ifndef XtNxftFont
50 #define XtNxftFont "xftFont" 50 #define XtNxftFont "xftFont"
51 #define XtCXftFont "XftFont" 51 #define XtCXftFont "XftFont"
52 #endif 52 #endif
53 #ifndef XtNfcFont 53 #ifndef XtNfcFont
54 #define XtNfcFontName "fcFontName" 54 #define XtNfcFontName "fcFontName"
55 #define XtCFcFontName "FcFontName" 55 #define XtCFcFontName "FcFontName"
56 #endif 56 #endif
57 #endif /* USE_XFT */ 57 #endif /* HAVE_XFT */
58 58
59 /* code 'n' stuff */ 59 /* code 'n' stuff */
60 60
61 #ifdef USE_XFT 61 #ifdef HAVE_XFT
62 #define FCSTRLEN 512 62 #define FCSTRLEN 512
63 63
64 /* non-Lisp prototypes */ 64 /* non-Lisp prototypes */
65 /* #### change this back to _open_name */ 65 /* #### change this back to _open_name */
66 XftFont *xft_open_font_by_name (Display *dpy, char *name); 66 XftFont *xft_open_font_by_name (Display *dpy, char *name);
67 #endif /* USE_XFT */ 67 #endif /* HAVE_XFT */
68 68
69 #endif /* INCLUDED_lwlib_fonts_h_ */ 69 #endif /* INCLUDED_lwlib_fonts_h_ */