Mercurial > emacs
changeset 66075:1f435e64880f
(pos_visible_p): Convert w->hscroll to pixels before use.
(remember_mouse_glyph): Clear RECT if mouse is over an image glyph.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Thu, 13 Oct 2005 22:41:40 +0000 |
| parents | 870f6c72cfc4 |
| children | 33c8db02dc18 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Thu Oct 13 22:41:21 2005 +0000 +++ b/src/xdisp.c Thu Oct 13 22:41:40 2005 +0000 @@ -1348,7 +1348,7 @@ current_header_line_height = current_mode_line_height = -1; if (visible_p && XFASTINT (w->hscroll) > 0) - *x -= XFASTINT (w->hscroll); + *x -= XFASTINT (w->hscroll) * WINDOW_FRAME_COLUMN_WIDTH (w); return visible_p; } @@ -2112,7 +2112,16 @@ break; if (g < end) - width = g->pixel_width; + { + if (g->type == IMAGE_GLYPH) + { + /* Don't remember when mouse is over image, as + image may have hot-spots. */ + STORE_NATIVE_RECT (*rect, 0, 0, 0, 0); + return; + } + width = g->pixel_width; + } else { /* Use nominal char spacing at end of line. */