comparison src/frame.h @ 269:b2472a1930f2 r20-5b33

Import from CVS: tag r20-5b33
author cvs
date Mon, 13 Aug 2007 10:27:19 +0200
parents 966663fcf606
children c5d627a313b1
comparison
equal deleted inserted replaced
268:6ced69ccd85f 269:b2472a1930f2
167 unsigned int buffers_changed :1; 167 unsigned int buffers_changed :1;
168 unsigned int clip_changed :1; 168 unsigned int clip_changed :1;
169 unsigned int extents_changed :1; 169 unsigned int extents_changed :1;
170 unsigned int faces_changed :1; 170 unsigned int faces_changed :1;
171 unsigned int frame_changed :1; 171 unsigned int frame_changed :1;
172 unsigned int glyphs_changed :1;
172 unsigned int icon_changed :1; 173 unsigned int icon_changed :1;
173 unsigned int menubar_changed :1; 174 unsigned int menubar_changed :1;
174 unsigned int modeline_changed :1; 175 unsigned int modeline_changed :1;
175 unsigned int point_changed :1; 176 unsigned int point_changed :1;
176 unsigned int size_changed :1; 177 unsigned int size_changed :1;
273 (f)->modiff++; \ 274 (f)->modiff++; \
274 if (!NILP ((f)->device)) \ 275 if (!NILP ((f)->device)) \
275 MARK_DEVICE_FACES_CHANGED (XDEVICE ((f)->device)); \ 276 MARK_DEVICE_FACES_CHANGED (XDEVICE ((f)->device)); \
276 else \ 277 else \
277 faces_changed = 1; } while (0) 278 faces_changed = 1; } while (0)
279
280 #define MARK_FRAME_GLYPHS_CHANGED(f) do { \
281 (f)->glyphs_changed = 1; \
282 (f)->modiff++; \
283 if (!NILP ((f)->device)) \
284 MARK_DEVICE_GLYPHS_CHANGED (XDEVICE ((f)->device)); \
285 else \
286 glyphs_changed = 1; } while (0)
278 287
279 #define MARK_FRAME_TOOLBARS_CHANGED(f) do { \ 288 #define MARK_FRAME_TOOLBARS_CHANGED(f) do { \
280 (f)->toolbar_changed = 1; \ 289 (f)->toolbar_changed = 1; \
281 (f)->modiff++; \ 290 (f)->modiff++; \
282 if (!NILP ((f)->device)) \ 291 if (!NILP ((f)->device)) \
403 412
404 #ifdef HAVE_TOOLBARS 413 #ifdef HAVE_TOOLBARS
405 #define FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE(f, pos) \ 414 #define FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE(f, pos) \
406 (!NILP((f)->toolbar_data[pos]) && !NILP ((f)->toolbar_visible_p[pos])) 415 (!NILP((f)->toolbar_data[pos]) && !NILP ((f)->toolbar_visible_p[pos]))
407 #define FRAME_RAW_THEORETICAL_TOOLBAR_SIZE(f, pos) \ 416 #define FRAME_RAW_THEORETICAL_TOOLBAR_SIZE(f, pos) \
408 (!NILP ((f)->toolbar_data[pos]) ? \ 417 (!NILP ((f)->toolbar_data[pos]) && INTP((f)->toolbar_size[pos]) ? \
409 (XINT ((f)->toolbar_size[pos])) : 0) 418 (XINT ((f)->toolbar_size[pos])) : 0)
410 #define FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) \ 419 #define FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) \
411 (!NILP ((f)->toolbar_data[pos]) ? \ 420 (!NILP ((f)->toolbar_data[pos]) && INTP((f)->toolbar_border_width[pos]) ? \
412 (XINT ((f)->toolbar_border_width[pos])) : 0) 421 (XINT ((f)->toolbar_border_width[pos])) : 0)
413 #else 422 #else
414 #define FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE(f, pos) 0 423 #define FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE(f, pos) 0
415 #define FRAME_RAW_THEORETICAL_TOOLBAR_SIZE(f, pos) 0 424 #define FRAME_RAW_THEORETICAL_TOOLBAR_SIZE(f, pos) 0
416 #define FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) 0 425 #define FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) 0
451 #ifdef HAVE_TOOLBARS 460 #ifdef HAVE_TOOLBARS
452 #define FRAME_RAW_REAL_TOOLBAR_VISIBLE(f, pos) \ 461 #define FRAME_RAW_REAL_TOOLBAR_VISIBLE(f, pos) \
453 (HAS_DEVMETH_P (XDEVICE (FRAME_DEVICE (f)), initialize_frame_toolbars) \ 462 (HAS_DEVMETH_P (XDEVICE (FRAME_DEVICE (f)), initialize_frame_toolbars) \
454 && !NILP (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_visible_p[pos])) 463 && !NILP (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_visible_p[pos]))
455 #define FRAME_RAW_REAL_TOOLBAR_BORDER_WIDTH(f, pos) \ 464 #define FRAME_RAW_REAL_TOOLBAR_BORDER_WIDTH(f, pos) \
456 (XINT (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_border_width[pos])) 465 ((INTP (XWINDOW \
466 (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_border_width[pos])) ? \
467 (XINT (XWINDOW \
468 (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_border_width[pos])) \
469 : 0)
457 #define FRAME_RAW_REAL_TOOLBAR_SIZE(f, pos) \ 470 #define FRAME_RAW_REAL_TOOLBAR_SIZE(f, pos) \
458 (XINT (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_size[pos])) 471 ((INTP (XWINDOW \
472 (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_size[pos])) ? \
473 (XINT (XWINDOW \
474 (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar_size[pos])) : 0)
459 #define FRAME_REAL_TOOLBAR(f, pos) \ 475 #define FRAME_REAL_TOOLBAR(f, pos) \
460 (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar[pos]) 476 (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->toolbar[pos])
461 #else 477 #else
462 #define FRAME_RAW_REAL_TOOLBAR_VISIBLE(f, pos) 0 478 #define FRAME_RAW_REAL_TOOLBAR_VISIBLE(f, pos) 0
463 #define FRAME_RAW_REAL_TOOLBAR_BORDER_WIDTH(f, pos) 0 479 #define FRAME_RAW_REAL_TOOLBAR_BORDER_WIDTH(f, pos) 0
584 int *char_width, int *char_height); 600 int *char_width, int *char_height);
585 void char_to_pixel_size (struct frame *f, int char_width, int char_height, 601 void char_to_pixel_size (struct frame *f, int char_width, int char_height,
586 int *pixel_width, int *pixel_height); 602 int *pixel_width, int *pixel_height);
587 void round_size_to_char (struct frame *f, int in_width, int in_height, 603 void round_size_to_char (struct frame *f, int in_width, int in_height,
588 int *out_width, int *out_height); 604 int *out_width, int *out_height);
605 void pixel_to_real_char_size (struct frame *f, int pixel_width, int pixel_height,
606 int *char_width, int *char_height);
607 void char_to_real_pixel_size (struct frame *f, int char_width, int char_height,
608 int *pixel_width, int *pixel_height);
609 void round_size_to_real_char (struct frame *f, int in_width, int in_height,
610 int *out_width, int *out_height);
589 void change_frame_size (struct frame *frame, 611 void change_frame_size (struct frame *frame,
590 int newlength, int newwidth, 612 int newlength, int newwidth,
591 int delay); 613 int delay);
592 void hold_frame_size_changes (void); 614 void hold_frame_size_changes (void);
593 void unhold_one_frame_size_changes (struct frame *f); 615 void unhold_one_frame_size_changes (struct frame *f);