procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* xdisp.c (erase_phys_cursor): Fix confusion between window-relative and text area-relative x-coordinates. [Backport]

Browse source
This commit is contained in:
YAMAMOTO Mitsuharu 2014-10-22 10:39:48 +09:00
parent 2498362599
commit 1a7aa3ce7f
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -2,6 +2,8 @@
* xdisp.c (draw_glyphs): Set clipping to highlight boundaries.
[Backport]
(erase_phys_cursor): Fix confusion between window-relative and
text area-relative x-coordinates. [Backport]
2014-10-20 Glenn Morris <rgm@gnu.org>

12
src/xdisp.c
View file

@ -27467,7 +27467,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;
@ -27476,13 +27476,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);