From c4aeb92ab4ffdc943f330c9cce22d65eaba743af Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 26 May 2012 14:58:19 +0300 Subject: [PATCH 1/1] Support help-echo and tooltip messages on w32 text-mode terminals. src/w32inevt.c (do_mouse_event): If help_echo changed, call gen_help_event to produce help-echo message in the echo area. --- src/ChangeLog | 2 ++ src/w32inevt.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 934d7f5f78..aeab5c9d11 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,8 @@ 2012-05-26 Eli Zaretskii * w32inevt.c (do_mouse_event): Support mouse-autoselect-window. + If help_echo changed, call gen_help_event to produce help-echo + message in the echo area. 2012-05-26 Eli Zaretskii diff --git a/src/w32inevt.c b/src/w32inevt.c index 5f6856413e..a85fdbbe43 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -621,8 +621,6 @@ do_mouse_event (MOUSE_EVENT_RECORD *event, clear_mouse_face (hlinfo); } - note_mouse_highlight (f, mx, my); - /* Generate SELECT_WINDOW_EVENTs when needed. */ if (!NILP (Vmouse_autoselect_window)) { @@ -649,6 +647,16 @@ do_mouse_event (MOUSE_EVENT_RECORD *event, } else last_mouse_window = Qnil; + + previous_help_echo_string = help_echo_string; + help_echo_string = help_echo_object = help_echo_window = Qnil; + help_echo_pos = -1; + note_mouse_highlight (f, mx, my); + /* If the contents of the global variable help_echo has + changed (inside note_mouse_highlight), generate a HELP_EVENT. */ + if (!NILP (help_echo_string) || !NILP (previous_help_echo_string)) + gen_help_event (help_echo_string, selected_frame, help_echo_window, + help_echo_object, help_echo_pos); } return 0; } -- 2.39.2