mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-16 08:10:43 -08:00
Code Issues Projects Releases Wiki Activity

Restore help-echo for menu items, ifdef away unneeded MSDOS code.

Browse source
This commit is contained in:
Eli Zaretskii 2013-09-22 14:07:12 +03:00
parent 474163ac51
commit 824682ea45
1 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/term.c
View file

@ -3361,7 +3361,12 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx,
if (input_status)
{
if (input_status == -1)
result = TTYM_NO_SELECT;
{
/* Remove the last help-echo, so that it doesn't
re-appear after "Quit". */
show_help_echo (Qnil, Qnil, Qnil, Qnil);
result = TTYM_NO_SELECT;
}
leave = 1;
}
else if (sf->mouse_moved)
@ -3420,20 +3425,22 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx,
state[statecount - 1].pane,
faces, 1);
}
else
/* Display the help-echo message for the currently-selected menu
item. */
if ((menu_help_message || prev_menu_help_message)
&& menu_help_message != prev_menu_help_message)
{
if ((menu_help_message || prev_menu_help_message)
&& menu_help_message != prev_menu_help_message)
{
help_callback (menu_help_message,
menu_help_paneno, menu_help_itemno);
tty_hide_cursor (tty);
prev_menu_help_message = menu_help_message;
}
/* We are busy-waiting for the mouse to move, so let's be nice
to other Windows applications by releasing our time slice. */
Sleep (20); /* FIXME */
help_callback (menu_help_message,
menu_help_paneno, menu_help_itemno);
tty_hide_cursor (tty);
prev_menu_help_message = menu_help_message;
}
#if 0
/* We are busy-waiting for the mouse to move, so let's be nice
to other Windows applications by releasing our time slice. */
Sleep (20); /* FIXME */
for (b = 0; b < mouse_button_count && !leave; b++)
{
/* Only leave if user both pressed and released the mouse, and in
@ -3447,6 +3454,7 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx,
}
(void) mouse_released (b, &x, &y);
}
#endif
}
mouse_off (); /* FIXME */