From 2f46f78b306df5d1d60e738699af0dcac69dfebd Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 12 Nov 2001 22:53:49 +0000 Subject: [PATCH] (XTread_socket): Don't update focus for EnterNotify or LeaveNotify events. Only FocusIn and FocusOut do that now. (x_display_and_set_cursor): Do display hollow cursors in active minibuffer windows when they are not selected. --- src/xterm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 6040a23ebce..4cbbcd5ebb3 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10654,6 +10654,7 @@ XTread_socket (sd, bufp, numchars, expected) { f = x_any_window_to_frame (dpyinfo, event.xcrossing.window); +#if 0 if (event.xcrossing.focus) { /* Avoid nasty pop/raise loops. */ @@ -10667,7 +10668,8 @@ XTread_socket (sd, bufp, numchars, expected) } else if (f == dpyinfo->x_focus_frame) x_new_focus_frame (dpyinfo, 0); - +#endif + /* EnterNotify counts as mouse movement, so update things that depend on mouse position. */ if (f && !f->output_data.x->hourglass_p) @@ -10731,6 +10733,7 @@ XTread_socket (sd, bufp, numchars, expected) bufp += n, count += n, numchars -= n; } +#if 0 if (event.xcrossing.focus) x_mouse_leave (dpyinfo); else @@ -10740,6 +10743,7 @@ XTread_socket (sd, bufp, numchars, expected) if (f == dpyinfo->x_focus_frame) x_new_focus_frame (dpyinfo, 0); } +#endif } goto OTHER; @@ -11501,7 +11505,7 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y) { extern int cursor_in_non_selected_windows; - if (MINI_WINDOW_P (w) + if ((MINI_WINDOW_P (w) && minibuf_level == 0) || !cursor_in_non_selected_windows || NILP (XBUFFER (w->buffer)->cursor_type)) new_cursor_type = NO_CURSOR; -- 2.39.2