Mercurial > hg > xemacs-beta

comparison src/frame.c @ 5047:07dcc7000bbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
put width before height consistently, fix a real bug found in the process -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * EmacsFrame.c (EmacsFrameRecomputeCellSize): * faces.c (default_face_font_info): * faces.c (default_face_width_and_height): * faces.c (Fface_list): * faces.h: * frame-gtk.c (gtk_set_initial_frame_size): * frame-gtk.c (gtk_set_frame_size): * frame-gtk.c (gtk_recompute_cell_sizes): * frame.c: * frame.c (frame_conversion_internal_1): * frame.c (change_frame_size_1): * frame.c (change_frame_size): * glyphs-msw.c (mswindows_combo_box_instantiate): * glyphs-widget.c (widget_instantiate): * glyphs-widget.c (tree_view_query_geometry): * glyphs-widget.c (Fwidget_logical_to_character_width): * glyphs-widget.c (Fwidget_logical_to_character_height): * indent.c (vmotion_pixels): * redisplay-output.c (get_cursor_size_and_location): * redisplay-xlike-inc.c (XLIKE_output_eol_cursor): * redisplay-xlike-inc.c (XLIKE_flash): * redisplay.c (calculate_baseline): * redisplay.c (start_with_point_on_display_line): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * window.c (margin_width_internal): * window.c (frame_size_valid_p): * window.c (frame_pixsize_valid_p): * window.c (check_frame_size): * window.c (set_window_pixsize): * window.c (window_pixel_height_to_char_height): * window.c (window_char_height_to_pixel_height): * window.c (window_displayed_height): * window.c (window_pixel_width_to_char_width): * window.c (window_char_width_to_pixel_width): * window.c (change_window_height): * window.c (window_scroll): * window.h: IMPORTANT: Aidan and Carbon Repo, please pay attention and fix appropriately! Rename: default_face_height_and_width -> default_face_width_and_height and reverse width/height arguments. Reverse width/height arguments to the following functions: -- default_face_font_info -- default_face_height_and_width (see above) -- check_frame_size -- frame_size_valid_p (made into a static function) Fix a redisplay bug where args to default_face_height_and_width were in the wrong order.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 18:56:01 -0600
parents d4f666cda5e6
children 92dc90c0bb40
comparison
equal deleted inserted replaced
5046:d4f666cda5e6 5047:07dcc7000bbf
3293 3293
3294 3294
3295 /* Frame size conversion functions moved here from EmacsFrame.c 3295 /* Frame size conversion functions moved here from EmacsFrame.c
3296 because they're generic and really don't belong in that file. 3296 because they're generic and really don't belong in that file.
3297 Function get_default_char_pixel_size() removed because it's 3297 Function get_default_char_pixel_size() removed because it's
3298 exactly the same as default_face_height_and_width(). 3298 exactly the same as default_face_width_and_height().
3299 3299
3300 Convert between total pixel size, displayable pixel size and 3300 Convert between total pixel size, displayable pixel size and
3301 character-cell size. Variables are either "in" or "out" 3301 character-cell size. Variables are either "in" or "out"
3302 depending on the value of PIXEL_TO_CHAR. 3302 depending on the value of PIXEL_TO_CHAR.
3303 */ 3303 */
3312 int egw; 3312 int egw;
3313 int obw, obh, bdr; 3313 int obw, obh, bdr;
3314 Lisp_Object frame, window; 3314 Lisp_Object frame, window;
3315 3315
3316 frame = wrap_frame (f); 3316 frame = wrap_frame (f);
3317 default_face_height_and_width (frame, &cph, &cpw); 3317 default_face_width_and_height (frame, &cpw, &cph);
3318 3318
3319 window = FRAME_SELECTED_WINDOW (f); 3319 window = FRAME_SELECTED_WINDOW (f);
3320 3320
3321 /* #### It really seems like we should also be subtracting out the 3321 /* #### It really seems like we should also be subtracting out the
3322 theoretical gutter width and height, just like we do for toolbars. 3322 theoretical gutter width and height, just like we do for toolbars.
3581 ABORT (); 3581 ABORT ();
3582 3582
3583 /* We no longer allow bogus values passed in. */ 3583 /* We no longer allow bogus values passed in. */
3584 assert (newheight && newwidth); 3584 assert (newheight && newwidth);
3585 3585
3586 default_face_height_and_width (wrap_frame (f), &real_font_height, 3586 default_face_width_and_height (wrap_frame (f), &real_font_width,
3587 &real_font_width); 3587 &real_font_height);
3588 3588
3589 frame_conversion_internal (f, SIZE_FRAME_UNIT, newwidth, newheight, 3589 frame_conversion_internal (f, SIZE_FRAME_UNIT, newwidth, newheight,
3590 SIZE_TOTAL_PIXEL, &new_pixwidth, 3590 SIZE_TOTAL_PIXEL, &new_pixwidth,
3591 &new_pixheight); 3591 &new_pixheight);
3592 3592
3686 change_frame_size (struct frame *f, int newwidth, int newheight, int delay) 3686 change_frame_size (struct frame *f, int newwidth, int newheight, int delay)
3687 { 3687 {
3688 /* sometimes we get passed a size that's too small (esp. when a 3688 /* sometimes we get passed a size that's too small (esp. when a
3689 client widget gets resized, since we have no control over this). 3689 client widget gets resized, since we have no control over this).
3690 So deal. */ 3690 So deal. */
3691 check_frame_size (f, &newheight, &newwidth); 3691 check_frame_size (f, &newwidth, &newheight);
3692 3692
3693 /* Unconditionally mark that the frame has changed size. This is 3693 /* Unconditionally mark that the frame has changed size. This is
3694 because many things need to know after the 3694 because many things need to know after the
3695 fact. f->size_change_pending will get reset below. The most that 3695 fact. f->size_change_pending will get reset below. The most that
3696 can happen is that we will cycle through redisplay once more 3696 can happen is that we will cycle through redisplay once more