diff options
| author | Gerd Moellmann | 2002-04-23 15:44:46 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2002-04-23 15:44:46 +0000 |
| commit | 516074a15e810d88c96500f0f99bf549f2b8ce73 (patch) | |
| tree | a5a5096a73442811f03635420b2c4b43fad41cda /src | |
| parent | 262748c5747f8d99de45ebeec9833f6945e103fd (diff) | |
| download | emacs-516074a15e810d88c96500f0f99bf549f2b8ce73.tar.gz emacs-516074a15e810d88c96500f0f99bf549f2b8ce73.zip | |
(notice_overwritten_cursor): Handle the special case
of the cursor being in the first blank non-text line at the
end of a window.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xterm.c | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 54ee39a2314..8a8b1ad7b3a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2002-04-23 Gerd Moellmann <gerd@gnu.org> | 1 | 2002-04-23 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * xterm.c (notice_overwritten_cursor): Handle the special case | ||
| 4 | of the cursor being in the first blank non-text line at the | ||
| 5 | end of a window. | ||
| 6 | |||
| 3 | * xterm.c (x_draw_hollow_cursor, x_draw_bar_cursor) | 7 | * xterm.c (x_draw_hollow_cursor, x_draw_bar_cursor) |
| 4 | (x_draw_phys_cursor_glyph): Set phys_cursor_width here. | 8 | (x_draw_phys_cursor_glyph): Set phys_cursor_width here. |
| 5 | (x_display_and_set_cursor): Don't set phys_cursor_width here, for | 9 | (x_display_and_set_cursor): Don't set phys_cursor_width here, for |
diff --git a/src/xterm.c b/src/xterm.c index 9088d7a0e80..d0a521d6e3c 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -11243,9 +11243,14 @@ notice_overwritten_cursor (w, area, x0, x1, y0, y1) | |||
| 11243 | actually scrolling, so we don't come here. When not | 11243 | actually scrolling, so we don't come here. When not |
| 11244 | scrolling, the rows above the old cursor row must have | 11244 | scrolling, the rows above the old cursor row must have |
| 11245 | changed, and in this case these rows must have written | 11245 | changed, and in this case these rows must have written |
| 11246 | over the cursor image. Likewise if part of the cursor is | 11246 | over the cursor image. |
| 11247 | below y1. */ | 11247 | |
| 11248 | if ((y0 >= cy0 && y0 < cy1) || (y1 >= cy0 && y1 < cy1)) | 11248 | Likewise if part of the cursor is below y1, with the |
| 11249 | exception of the cursor being in the first blank row at | ||
| 11250 | the buffer and window end because update_text_area | ||
| 11251 | doesn't draw that row. */ | ||
| 11252 | if (((y0 >= cy0 && y0 < cy1) || (y1 >= cy0 && y1 < cy1)) | ||
| 11253 | && w->current_matrix->rows[w->phys_cursor.vpos].displays_text_p) | ||
| 11249 | w->phys_cursor_on_p = 0; | 11254 | w->phys_cursor_on_p = 0; |
| 11250 | } | 11255 | } |
| 11251 | } | 11256 | } |