comparison src/frame.h @ 404:2f8bb876ab1d r21-2-32

Import from CVS: tag r21-2-32
author cvs
date Mon, 13 Aug 2007 11:16:07 +0200
parents 74fd4e045ea6
children 501cfd01ee6d
comparison
equal deleted inserted replaced
403:9f011ab08d48 404:2f8bb876ab1d
114 whether to re-layout windows by a call to change_frame_size early 114 whether to re-layout windows by a call to change_frame_size early
115 in redisplay_frame. */ 115 in redisplay_frame. */
116 unsigned int current_toolbar_size[4]; 116 unsigned int current_toolbar_size[4];
117 #endif 117 #endif
118 118
119 /* Dynamic array of display lines for gutters */ 119 /* Size of gutters as seen by redisplay. This is used to determine
120 display_line_dynarr *current_display_lines; 120 whether to re-layout windows by a call to change_frame_size early
121 display_line_dynarr *desired_display_lines; 121 in redisplay_frame. */
122 unsigned int current_gutter_bounds[4];
123
124 /* Dynamic arrays of display lines for gutters */
125 display_line_dynarr *current_display_lines[4];
126 display_line_dynarr *desired_display_lines[4];
122 127
123 /* A structure of auxiliary data specific to the device type. 128 /* A structure of auxiliary data specific to the device type.
124 struct x_frame is used for X window frames; defined in console-x.h */ 129 struct x_frame is used for X window frames; defined in console-x.h */
125 void *frame_data; 130 void *frame_data;
126 131
256 } while (0) 261 } while (0)
257 262
258 #define FRAME_TYPE_P(f, type) EQ (FRAME_TYPE (f), Q##type) 263 #define FRAME_TYPE_P(f, type) EQ (FRAME_TYPE (f), Q##type)
259 264
260 #ifdef ERROR_CHECK_TYPECHECK 265 #ifdef ERROR_CHECK_TYPECHECK
261 INLINE struct frame * 266 INLINE_HEADER struct frame *
262 error_check_frame_type (struct frame * f, Lisp_Object sym); 267 error_check_frame_type (struct frame * f, Lisp_Object sym);
263 INLINE struct frame * 268 INLINE_HEADER struct frame *
264 error_check_frame_type (struct frame * f, Lisp_Object sym) 269 error_check_frame_type (struct frame * f, Lisp_Object sym)
265 { 270 {
266 assert (EQ (FRAME_TYPE (f), sym)); 271 assert (EQ (FRAME_TYPE (f), sym));
267 return f; 272 return f;
268 } 273 }