Mercurial > emacs
changeset 25191:3a5376feb9aa
(x_display_and_set_cursor): If cursor_in_echo_area,
show hollow box cursor for windows other than echo_area_window,
show normal cursor for echo_area_window.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 06 Aug 1999 15:05:34 +0000 |
| parents | a14edd4a5f4a |
| children | 03f530e858df |
| files | src/xterm.c |
| diffstat | 1 files changed, 22 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Fri Aug 06 15:05:27 1999 +0000 +++ b/src/xterm.c Fri Aug 06 15:05:34 1999 +0000 @@ -10039,18 +10039,30 @@ the cursor type given by the frame parameter. If explicitly marked off, draw no cursor. In all other cases, we want a hollow box cursor. */ - if (w != XWINDOW (selected_window) - || f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame) - { - if (MINI_WINDOW_P (w)) + if (cursor_in_echo_area + && FRAME_HAS_MINIBUF_P (f) + && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) + { + if (w == XWINDOW (echo_area_window)) + new_cursor_type = FRAME_DESIRED_CURSOR (f); + else + new_cursor_type = HOLLOW_BOX_CURSOR; + } + else + { + if (w != XWINDOW (selected_window) + || f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame) + { + if (MINI_WINDOW_P (w)) + new_cursor_type = NO_CURSOR; + else + new_cursor_type = HOLLOW_BOX_CURSOR; + } + else if (w->cursor_off_p) new_cursor_type = NO_CURSOR; else - new_cursor_type = HOLLOW_BOX_CURSOR; - } - else if (w->cursor_off_p) - new_cursor_type = NO_CURSOR; - else - new_cursor_type = FRAME_DESIRED_CURSOR (f); + new_cursor_type = FRAME_DESIRED_CURSOR (f); + } /* If cursor is currently being shown and we don't want it to be or it is in the wrong place, or the cursor type is not what we want,