Mercurial > emacs
comparison src/macterm.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 | ac4ceed3bbaf |
| children | 77df00035231 |
comparison
equal
deleted
inserted
replaced
| 47992:3762c0399817 | 47993:5dcac67745dc |
|---|---|
| 9296 int on, hpos, vpos, x, y; | 9296 int on, hpos, vpos, x, y; |
| 9297 { | 9297 { |
| 9298 struct frame *f = XFRAME (w->frame); | 9298 struct frame *f = XFRAME (w->frame); |
| 9299 int new_cursor_type; | 9299 int new_cursor_type; |
| 9300 int new_cursor_width; | 9300 int new_cursor_width; |
| 9301 int active_cursor; | |
| 9301 struct glyph_matrix *current_glyphs; | 9302 struct glyph_matrix *current_glyphs; |
| 9302 struct glyph_row *glyph_row; | 9303 struct glyph_row *glyph_row; |
| 9303 struct glyph *glyph; | 9304 struct glyph *glyph; |
| 9304 | 9305 |
| 9305 /* This is pointless on invisible frames, and dangerous on garbaged | 9306 /* This is pointless on invisible frames, and dangerous on garbaged |
| 9329 } | 9330 } |
| 9330 | 9331 |
| 9331 xassert (interrupt_input_blocked); | 9332 xassert (interrupt_input_blocked); |
| 9332 | 9333 |
| 9333 /* Set new_cursor_type to the cursor we want to be displayed. */ | 9334 /* Set new_cursor_type to the cursor we want to be displayed. */ |
| 9334 new_cursor_type = get_window_cursor_type (w, &new_cursor_width); | 9335 new_cursor_type = get_window_cursor_type (w, &new_cursor_width, &active_cursor); |
| 9335 | 9336 |
| 9336 | 9337 |
| 9337 /* If cursor is currently being shown and we don't want it to be or | 9338 /* If cursor is currently being shown and we don't want it to be or |
| 9338 it is in the wrong place, or the cursor type is not what we want, | 9339 it is in the wrong place, or the cursor type is not what we want, |
| 9339 erase it. */ | 9340 erase it. */ |