comparison lwlib/lwlib-fonts.h @ 4918:c914214b788d

Automatic merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 02:56:21 -0600
parents a6c778975d7d
children 308d34e9f07d
comparison
equal deleted inserted replaced
4915:bedf3747a6d7 4918:c914214b788d
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_ */