comparison src/faces.h @ 5047:07dcc7000bbf

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 d0c14ea98592
children 5502045ec510 2a462149bd6a
comparison
equal deleted inserted replaced
5046:d4f666cda5e6 5047:07dcc7000bbf
297 struct extent_fragment *ef); 297 struct extent_fragment *ef);
298 void update_frame_face_values (struct frame *f); 298 void update_frame_face_values (struct frame *f);
299 void face_property_was_changed (Lisp_Object face, Lisp_Object property, 299 void face_property_was_changed (Lisp_Object face, Lisp_Object property,
300 Lisp_Object locale); 300 Lisp_Object locale);
301 void default_face_font_info (Lisp_Object domain, int *ascent, 301 void default_face_font_info (Lisp_Object domain, int *ascent,
302 int *descent, int *height, int *width, 302 int *descent, int *width, int *height,
303 int *proportional_p); 303 int *proportional_p);
304 void default_face_height_and_width (Lisp_Object domain, 304 void default_face_width_and_height (Lisp_Object domain, int *width,
305 int *height, int *width); 305 int *height);
306 306
307 #define FACE_CACHEL_FONT(cachel, charset) \ 307 #define FACE_CACHEL_FONT(cachel, charset) \
308 (cachel->font[XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE]) 308 (cachel->font[XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE])
309 309
310 #define FACE_CACHEL_FONT_UPDATED(x) \ 310 #define FACE_CACHEL_FONT_UPDATED(x) \