Mercurial > hg > xemacs-beta

comparison src/frame.c @ 422:95016f13131a r21-2-19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-19
author cvs
date Mon, 13 Aug 2007 11:25:01 +0200
parents 41dbb7a9d5f2
children 11054d720c21
comparison
equal deleted inserted replaced
421:fff06e11db74 422:95016f13131a
32 #include "events.h" 32 #include "events.h"
33 #include "extents.h" 33 #include "extents.h"
34 #include "faces.h" 34 #include "faces.h"
35 #include "frame.h" 35 #include "frame.h"
36 #include "glyphs.h" 36 #include "glyphs.h"
37 #include "gutter.h"
37 #include "menubar.h" 38 #include "menubar.h"
38 #include "redisplay.h" 39 #include "redisplay.h"
39 #include "scrollbar.h" 40 #include "scrollbar.h"
40 #include "window.h" 41 #include "window.h"
41 42
458 #endif 459 #endif
459 reset_face_cachels (XWINDOW (FRAME_SELECTED_WINDOW (f))); 460 reset_face_cachels (XWINDOW (FRAME_SELECTED_WINDOW (f)));
460 reset_glyph_cachels (XWINDOW (FRAME_SELECTED_WINDOW (f))); 461 reset_glyph_cachels (XWINDOW (FRAME_SELECTED_WINDOW (f)));
461 reset_subwindow_cachels (f); 462 reset_subwindow_cachels (f);
462 change_frame_size (f, f->height, f->width, 0); 463 change_frame_size (f, f->height, f->width, 0);
464
463 } 465 }
464 466
465 MAYBE_FRAMEMETH (f, init_frame_2, (f, props)); 467 MAYBE_FRAMEMETH (f, init_frame_2, (f, props));
466 Fset_frame_properties (frame, props); 468 Fset_frame_properties (frame, props);
467 MAYBE_FRAMEMETH (f, init_frame_3, (f)); 469 MAYBE_FRAMEMETH (f, init_frame_3, (f));
470
471 /* now initialise the gutters, this won't change the frame size
472 so is ok here. */
473 if (!DEVICE_STREAM_P (d))
474 init_frame_gutters (f);
468 475
469 /* Hallelujah, praise the lord. */ 476 /* Hallelujah, praise the lord. */
470 f->init_finished = 1; 477 f->init_finished = 1;
471 478
472 /* If this is the first frame on the device, make it the selected one. */ 479 /* If this is the first frame on the device, make it the selected one. */
891 f->selected_window = window; 898 f->selected_window = window;
892 if (!MINI_WINDOW_P (XWINDOW (window)) || FRAME_MINIBUF_ONLY_P (f)) 899 if (!MINI_WINDOW_P (XWINDOW (window)) || FRAME_MINIBUF_ONLY_P (f))
893 { 900 {
894 #ifdef HAVE_TOOLBARS 901 #ifdef HAVE_TOOLBARS
895 if (!EQ (f->last_nonminibuf_window, window)) 902 if (!EQ (f->last_nonminibuf_window, window))
896 MARK_TOOLBAR_CHANGED; 903 {
904 MARK_TOOLBAR_CHANGED;
905 MARK_GUTTER_CHANGED;
906 }
897 #endif 907 #endif
898 f->last_nonminibuf_window = window; 908 f->last_nonminibuf_window = window;
899 } 909 }
900 } 910 }
901 911
1524 free_frame_scrollbars (f); 1534 free_frame_scrollbars (f);
1525 #endif 1535 #endif
1526 #ifdef HAVE_TOOLBARS 1536 #ifdef HAVE_TOOLBARS
1527 free_frame_toolbars (f); 1537 free_frame_toolbars (f);
1528 #endif 1538 #endif
1539 free_frame_gutters (f);
1529 1540
1530 /* This must be done before the window and window_mirror structures 1541 /* This must be done before the window and window_mirror structures
1531 are freed. The scrollbar information is attached to them. */ 1542 are freed. The scrollbar information is attached to them. */
1532 MAYBE_FRAMEMETH (f, delete_frame, (f)); 1543 MAYBE_FRAMEMETH (f, delete_frame, (f));
1533 1544