comparison src/console-x.h @ 16:0293115a14e9 r19-15b91

Import from CVS: tag r19-15b91
author cvs
date Mon, 13 Aug 2007 08:49:20 +0200
parents 376386a54a3c
children 131b0175ea99
comparison
equal deleted inserted replaced
15:ad457d5f7d04 16:0293115a14e9
257 int *desired_psheets; 257 int *desired_psheets;
258 int current_psheet_count; 258 int current_psheet_count;
259 int desired_psheet_count; 259 int desired_psheet_count;
260 Lisp_Object current_psheet_buffer; 260 Lisp_Object current_psheet_buffer;
261 Lisp_Object desired_psheet_buffer; 261 Lisp_Object desired_psheet_buffer;
262 #endif 262 #endif /* ENERGIZE */
263 263
264 /*************************** Miscellaneous **************************/ 264 /*************************** Miscellaneous **************************/
265 265
266 /* The icon pixmaps; these are Lisp_Image_Instance objects, or Qnil. */ 266 /* The icon pixmaps; these are Lisp_Image_Instance objects, or Qnil. */
267 Lisp_Object icon_pixmap; 267 Lisp_Object icon_pixmap;
276 GC toolbar_pixmap_background_gc; 276 GC toolbar_pixmap_background_gc;
277 277
278 /* geometry string that ought to be freed. */ 278 /* geometry string that ought to be freed. */
279 char *geom_free_me_please; 279 char *geom_free_me_please;
280 280
281
281 int old_toolbar_size[4]; 282 int old_toolbar_size[4];
282 283
283 /* 1 if the frame is completely visible on the display, 0 otherwise. 284 /* 1 if the frame is completely visible on the display, 0 otherwise.
284 if 0 the frame may have been iconified or may be totally 285 if 0 the frame may have been iconified or may be totally
285 or partially hidden by another X window */ 286 or partially hidden by another X window */
286 int totally_visible_p :1; 287 unsigned int totally_visible_p :1;
287 288
288 /* NB: Both of the following flags are derivable from the 'shell' 289 /* NB: Both of the following flags are derivable from the 'shell'
289 field above, but it's easier if we also have them separately here. */ 290 field above, but it's easier if we also have them separately here. */
290 291
291 /* Are we a top-level frame? This means that our shell is a 292 /* Are we a top-level frame? This means that our shell is a
292 TopLevelShell, and we should do certain things to interact with 293 TopLevelShell, and we should do certain things to interact with
293 the window manager. */ 294 the window manager. */
294 int top_level_frame_p :1; 295 unsigned int top_level_frame_p :1;
295 296
296 #ifdef EXTERNAL_WIDGET 297 #ifdef EXTERNAL_WIDGET
297 /* Are we using somebody else's window for our shell window? This 298 /* Are we using somebody else's window for our shell window? This
298 means that our shell is an ExternalShell. If this flag is set, then 299 means that our shell is an ExternalShell. If this flag is set, then
299 `top_level_frame_p' will never be set. */ 300 `top_level_frame_p' will never be set. */
300 int external_window_p :1; 301 unsigned int external_window_p :1;
301 #endif /* EXTERNAL_WIDGET */ 302 #endif /* EXTERNAL_WIDGET */
302 }; 303 };
303 304
304 #define FRAME_X_DATA(f) FRAME_TYPE_DATA (f, x) 305 #define FRAME_X_DATA(f) FRAME_TYPE_DATA (f, x)
305 306