comparison src/dispextern.h @ 13407:5ebb99bc06bb

[HAVE_NTGUI]: Include win32.h. HAVE_NTGUI] (struct frame_glyphs): Include pixel fields. Use HAVE_WINDOW_SYSTEM instead of testing for specific window systems.
author Geoff Voelker <voelker@cs.washington.edu>
date Tue, 07 Nov 1995 07:13:46 +0000
parents b36d5e88cccc
children ee40177f6c68
comparison
equal deleted inserted replaced
13406:5aaab914fc6b 13407:5ebb99bc06bb
28 #include <X11/Xlib.h> 28 #include <X11/Xlib.h>
29 #endif 29 #endif
30 30
31 #ifdef MSDOS 31 #ifdef MSDOS
32 #include "msdos.h" 32 #include "msdos.h"
33 #endif
34
35 #ifdef HAVE_NTGUI
36 #include "win32.h"
33 #endif 37 #endif
34 38
35 #ifdef HAVE_FACES 39 #ifdef HAVE_FACES
36 struct face 40 struct face
37 { 41 {
125 /* Buffer offset of this line's first char. 129 /* Buffer offset of this line's first char.
126 This is not really implemented, and cannot be, 130 This is not really implemented, and cannot be,
127 and should be deleted. */ 131 and should be deleted. */
128 int *bufp; 132 int *bufp;
129 133
130 #ifdef HAVE_X_WINDOWS 134 #ifdef HAVE_WINDOW_SYSTEM
131 /* Pixel position of top left corner of line. */ 135 /* Pixel position of top left corner of line. */
132 short *top_left_x; 136 short *top_left_x;
133 short *top_left_y; 137 short *top_left_y;
134 138
135 /* Pixel width of line. */ 139 /* Pixel width of line. */
138 /* Pixel height of line. */ 142 /* Pixel height of line. */
139 short *pix_height; 143 short *pix_height;
140 144
141 /* Largest font ascent on this line. */ 145 /* Largest font ascent on this line. */
142 short *max_ascent; 146 short *max_ascent;
143 #endif /* HAVE_X_WINDOWS */ 147 #endif /* HAVE_WINDOW_SYSTEM */
144 148
145 /* Mapping of coordinate pairs to buffer positions. 149 /* Mapping of coordinate pairs to buffer positions.
146 This field holds a vector indexed by row number. 150 This field holds a vector indexed by row number.
147 Its elements are vectors indexed by column number. 151 Its elements are vectors indexed by column number.
148 Each element of these vectors is a buffer position, 0, or -1. 152 Each element of these vectors is a buffer position, 0, or -1.