Mercurial > hg > xemacs-beta

comparison src/redisplay-xlike-inc.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 0d4c9d0f6a8d
children 8af6a32b170d
comparison
equal deleted inserted replaced
5046:d4f666cda5e6 5047:07dcc7000bbf
2054 if (NILP (w->text_cursor_visible_p)) 2054 if (NILP (w->text_cursor_visible_p))
2055 return; 2055 return;
2056 2056
2057 gc = XLIKE_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil); 2057 gc = XLIKE_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil);
2058 2058
2059 default_face_font_info (window, &defascent, 0, &defheight, 0, 0); 2059 default_face_font_info (window, &defascent, 0, 0, &defheight, 0);
2060 2060
2061 /* make sure the cursor is entirely contained between y and y+height */ 2061 /* make sure the cursor is entirely contained between y and y+height */
2062 cursor_height = min (defheight, height); 2062 cursor_height = min (defheight, height);
2063 cursor_y = max (y, min (y + height - cursor_height, 2063 cursor_y = max (y, min (y + height - cursor_height,
2064 dl->ypos - defascent)); 2064 dl->ypos - defascent));
2186 XLIKE_SET_GC_PIXEL (gcv.foreground, tmp_fcolor ^ tmp_bcolor); 2186 XLIKE_SET_GC_PIXEL (gcv.foreground, tmp_fcolor ^ tmp_bcolor);
2187 gcv.function = XLIKE_GX_XOR; 2187 gcv.function = XLIKE_GX_XOR;
2188 gcv.graphics_exposures = XLIKE_FALSE; 2188 gcv.graphics_exposures = XLIKE_FALSE;
2189 gc = gc_cache_lookup (DEVICE_XLIKE_GC_CACHE (XDEVICE (f->device)), &gcv, 2189 gc = gc_cache_lookup (DEVICE_XLIKE_GC_CACHE (XDEVICE (f->device)), &gcv,
2190 XLIKE_GC_FOREGROUND | XLIKE_GC_FUNCTION | XLIKE_GC_EXPOSURES); 2190 XLIKE_GC_FOREGROUND | XLIKE_GC_FUNCTION | XLIKE_GC_EXPOSURES);
2191 default_face_height_and_width (frame, &flash_height, 0); 2191 default_face_width_and_height (frame, 0, &flash_height);
2192 2192
2193 /* If window is tall, flash top and bottom line. */ 2193 /* If window is tall, flash top and bottom line. */
2194 if (EQ (Vvisible_bell, Qtop_bottom) && w->pixel_height > 3 * flash_height) 2194 if (EQ (Vvisible_bell, Qtop_bottom) && w->pixel_height > 3 * flash_height)
2195 { 2195 {
2196 XLIKE_FILL_RECTANGLE (dpy, win, gc, w->pixel_left, w->pixel_top, 2196 XLIKE_FILL_RECTANGLE (dpy, win, gc, w->pixel_left, w->pixel_top,