comparison src/dispextern.h @ 17028:118cff7e4bca

(struct face): New members `non_ascii_gc' and `fontset'. [HAVE_FACES]: New macros FACE_NON_ASCII_GC and FACE_FONTSET.
author Karl Heuer <kwzh@gnu.org>
date Thu, 20 Feb 1997 06:47:37 +0000
parents dd6cbc8b53e8
children fb4c986db0e2
comparison
equal deleted inserted replaced
17027:b1c4fbf1aee1 17028:118cff7e4bca
39 39
40 #ifdef HAVE_FACES 40 #ifdef HAVE_FACES
41 struct face 41 struct face
42 { 42 {
43 /* If this is non-zero, it is a GC we can use without modification 43 /* If this is non-zero, it is a GC we can use without modification
44 to represent this face. */ 44 to represent this face. Used only for ASCII characters. */
45 GC gc; 45 GC gc;
46 46
47 /* GC used for non-ASCII characters. */
48 GC non_ascii_gc;
49
47 /* Pixel value for foreground color. */ 50 /* Pixel value for foreground color. */
48 EMACS_UINT foreground; 51 EMACS_UINT foreground;
49 52
50 /* Pixel value for background color. */ 53 /* Pixel value for background color. */
51 EMACS_UINT background; 54 EMACS_UINT background;
52 55
53 /* Font used for this face. */ 56 /* Font used for this face. If any fontset is set for this face,
57 this points to a `font' slot of the struct `font_info' for an
58 ASCII font of the fontset. In that case, we should not call
59 XFreeFont on it because the font may still be used somewhere
60 else. */
54 XFontStruct *font; 61 XFontStruct *font;
62
63 /* Fontset ID if any fontset is set for this face, else -1. */
64 int fontset;
55 65
56 /* Background stipple or bitmap used for this face. */ 66 /* Background stipple or bitmap used for this face. */
57 Pixmap stipple; 67 Pixmap stipple;
58 68
59 /* Pixmap_depth. */ 69 /* Pixmap_depth. */
68 78
69 #define NORMAL_FACE ((struct face *) 0) 79 #define NORMAL_FACE ((struct face *) 0)
70 80
71 #define FACE_HAS_GC(f) ((f)->gc) 81 #define FACE_HAS_GC(f) ((f)->gc)
72 #define FACE_GC(f) ((f)->gc) 82 #define FACE_GC(f) ((f)->gc)
83 #define FACE_NON_ASCII_GC(f) ((f)->non_ascii_gc)
73 #define FACE_FOREGROUND(f) ((f)->foreground) 84 #define FACE_FOREGROUND(f) ((f)->foreground)
74 #define FACE_BACKGROUND(f) ((f)->background) 85 #define FACE_BACKGROUND(f) ((f)->background)
75 #define FACE_FONT(f) ((f)->font) 86 #define FACE_FONT(f) ((f)->font)
87 #define FACE_FONTSET(f) ((f)->fontset)
76 #define FACE_STIPPLE(f) ((f)->stipple) 88 #define FACE_STIPPLE(f) ((f)->stipple)
77 #define FACE_UNDERLINE_P(f) ((f)->underline) 89 #define FACE_UNDERLINE_P(f) ((f)->underline)
78 90
79 #else /* not HAVE_FACES */ 91 #else /* not HAVE_FACES */
80 92