Mercurial > emacs
comparison src/xdisp.c @ 87453:cdd30283527d
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-966
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 28 Dec 2007 22:26:14 +0000 |
parents | ec0ef12211d9 f92febffffdd |
children | 107ccd98fa12 56a72e2bd635 |
comparison
equal
deleted
inserted
replaced
87452:8e0e0bc0c5ab | 87453:cdd30283527d |
---|---|
23532 struct window *w; | 23532 struct window *w; |
23533 XRectangle *r; | 23533 XRectangle *r; |
23534 { | 23534 { |
23535 XRectangle cr, result; | 23535 XRectangle cr, result; |
23536 struct glyph *cursor_glyph; | 23536 struct glyph *cursor_glyph; |
23537 struct glyph_row *row; | |
23538 | |
23539 if (w->phys_cursor.vpos >= 0 | |
23540 && w->phys_cursor.vpos < w->current_matrix->nrows | |
23541 && (row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos), | |
23542 row->enabled_p) | |
23543 && row->cursor_in_fringe_p) | |
23544 { | |
23545 /* Cursor is in the fringe. */ | |
23546 cr.x = window_box_right_offset (w, | |
23547 (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) | |
23548 ? RIGHT_MARGIN_AREA | |
23549 : TEXT_AREA)); | |
23550 cr.y = row->y; | |
23551 cr.width = WINDOW_RIGHT_FRINGE_WIDTH (w); | |
23552 cr.height = row->height; | |
23553 return x_intersect_rectangles (&cr, r, &result); | |
23554 } | |
23537 | 23555 |
23538 cursor_glyph = get_phys_cursor_glyph (w); | 23556 cursor_glyph = get_phys_cursor_glyph (w); |
23539 if (cursor_glyph) | 23557 if (cursor_glyph) |
23540 { | 23558 { |
23541 /* r is relative to W's box, but w->phys_cursor.x is relative | 23559 /* r is relative to W's box, but w->phys_cursor.x is relative |