Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* xdisp.c (erase_phys_cursor): Fix confusion between window-relative

Browse source 
and text area-relative x-coordinates.
This commit is contained in:
YAMAMOTO Mitsuharu 2014-08-19 09:51:33 +09:00
parent 2e7d4343e9
commit 8de8f9b5cc
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-08-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* xdisp.c (erase_phys_cursor): Fix confusion between window-relative
and text area-relative x-coordinates.
2014-08-17 Eli Zaretskii <eliz@gnu.org>
Avoid overwriting the reversed_p flags in the glyph matrices when

12
src/xdisp.c
View file

@ -27370,7 +27370,7 @@ erase_phys_cursor (struct window *w)
/* Maybe clear the display under the cursor. */
if (w->phys_cursor_type == HOLLOW_BOX_CURSOR)
{
int x, y, left_x;
int x, y;
int header_line_height = WINDOW_HEADER_LINE_HEIGHT (w);
int width;
@ -27379,13 +27379,15 @@ erase_phys_cursor (struct window *w)
goto mark_cursor_off;
width = cursor_glyph->pixel_width;
left_x = window_box_left_offset (w, TEXT_AREA);
x = w->phys_cursor.x;
if (x < left_x)
width -= left_x - x;
if (x < 0)
{
width += x;
x = 0;
}
width = min (width, window_box_width (w, TEXT_AREA) - x);
y = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, cursor_row->y));
x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, max (x, left_x));
x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, x);
if (width > 0)
FRAME_RIF (f)->clear_frame_area (f, x, y, width, cursor_row->visible_height);