Mercurial > emacs
comparison src/xterm.c @ 47993:5dcac67745dc
(get_window_cursor_type): New arg ACTIVE_CURSOR.
Callers changed (supply dummy arg).
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Thu, 24 Oct 2002 19:59:14 +0000 |
| parents | 080b4586492b |
| children | 77df00035231 |
comparison
equal
deleted
inserted
replaced
| 47992:3762c0399817 | 47993:5dcac67745dc |
|---|---|
| 11800 int on, hpos, vpos, x, y; | 11800 int on, hpos, vpos, x, y; |
| 11801 { | 11801 { |
| 11802 struct frame *f = XFRAME (w->frame); | 11802 struct frame *f = XFRAME (w->frame); |
| 11803 int new_cursor_type; | 11803 int new_cursor_type; |
| 11804 int new_cursor_width; | 11804 int new_cursor_width; |
| 11805 int active_cursor; | |
| 11805 struct glyph_matrix *current_glyphs; | 11806 struct glyph_matrix *current_glyphs; |
| 11806 struct glyph_row *glyph_row; | 11807 struct glyph_row *glyph_row; |
| 11807 struct glyph *glyph; | 11808 struct glyph *glyph; |
| 11808 | 11809 |
| 11809 /* This is pointless on invisible frames, and dangerous on garbaged | 11810 /* This is pointless on invisible frames, and dangerous on garbaged |
| 11833 } | 11834 } |
| 11834 | 11835 |
| 11835 xassert (interrupt_input_blocked); | 11836 xassert (interrupt_input_blocked); |
| 11836 | 11837 |
| 11837 /* Set new_cursor_type to the cursor we want to be displayed. */ | 11838 /* Set new_cursor_type to the cursor we want to be displayed. */ |
| 11838 new_cursor_type = get_window_cursor_type (w, &new_cursor_width); | 11839 new_cursor_type = get_window_cursor_type (w, &new_cursor_width, &active_cursor); |
| 11839 | 11840 |
| 11840 /* If cursor is currently being shown and we don't want it to be or | 11841 /* If cursor is currently being shown and we don't want it to be or |
| 11841 it is in the wrong place, or the cursor type is not what we want, | 11842 it is in the wrong place, or the cursor type is not what we want, |
| 11842 erase it. */ | 11843 erase it. */ |
| 11843 if (w->phys_cursor_on_p | 11844 if (w->phys_cursor_on_p |