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

Fix the pixel coordinates returned by pos-visible-in-window-p. (Bug#19473)

Browse source 
src/xdisp.c (pos_visible_p): Fix up the X coordinate for
 right-to-left screen lines.
This commit is contained in:
Eli Zaretskii 2014-12-30 19:29:24 +02:00
parent d2612290f9
commit aa472a3771
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-12-30 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (pos_visible_p): Fix up the X coordinate for
right-to-left screen lines. (Bug#19473)
2014-12-28 Eli Zaretskii <eliz@gnu.org> 2014-12-28 Eli Zaretskii <eliz@gnu.org>
* w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458) * w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458)

23
src/xdisp.c
View file

@ -1403,6 +1403,7 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
struct text_pos top; struct text_pos top;
int visible_p = 0; int visible_p = 0;
struct buffer *old_buffer = NULL; struct buffer *old_buffer = NULL;
bool r2l = false;
if (FRAME_INITIAL_P (XFRAME (WINDOW_FRAME (w)))) if (FRAME_INITIAL_P (XFRAME (WINDOW_FRAME (w))))
return visible_p; return visible_p;
@ -1688,6 +1689,8 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
*rowh = max (0, (min (bottom_y, it.last_visible_y) *rowh = max (0, (min (bottom_y, it.last_visible_y)
- max (top_y, window_top_y))); - max (top_y, window_top_y)));
*vpos = it.vpos; *vpos = it.vpos;
if (it.bidi_it.paragraph_dir == R2L)
r2l = true;
} }
} }
else else
@ -1717,6 +1720,8 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
- max (it2.current_y, - max (it2.current_y,
WINDOW_HEADER_LINE_HEIGHT (w)))); WINDOW_HEADER_LINE_HEIGHT (w))));
*vpos = it2.vpos; *vpos = it2.vpos;
if (it2.bidi_it.paragraph_dir == R2L)
r2l = true;
} }
else else
bidi_unshelve_cache (it2data, 1); bidi_unshelve_cache (it2data, 1);
@ -1726,10 +1731,20 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
if (old_buffer) if (old_buffer)
set_buffer_internal_1 (old_buffer); set_buffer_internal_1 (old_buffer);
if (visible_p && w->hscroll > 0) if (visible_p)
*x -= {
window_hscroll_limited (w, WINDOW_XFRAME (w)) if (w->hscroll > 0)
* WINDOW_FRAME_COLUMN_WIDTH (w); *x -=
window_hscroll_limited (w, WINDOW_XFRAME (w))
* WINDOW_FRAME_COLUMN_WIDTH (w);
/* For lines in an R2L paragraph, we need to mirror the X pixel
coordinate wrt the text area. For the reasons, see the
commentary in buffer_posn_from_coords and the explanation of
the geometry used by the move_it_* functions at the end of
the large commentart near the beginning of this file. */
if (r2l)
*x = window_box_width (w, TEXT_AREA) - *x - 1;
}
#if 0 #if 0
/* Debugging code. */ /* Debugging code. */