Synchronize Android and Haiku terminal frontends with X

* src/androidterm.c (handle_one_android_event):

* src/haikuterm.c (haiku_read_socket): Port recent changes to
handle_one_xevent.
This commit is contained in:
Po Lu 2025-05-05 08:51:42 +08:00
parent 815dea7b59
commit b97b3b057c
3 changed files with 7 additions and 8 deletions

View file

@ -957,9 +957,9 @@ handle_one_android_event (struct android_display_info *dpyinfo,
/* If mouse-highlight is an integer, input clears out
mouse highlighting. */
if (!hlinfo->mouse_face_hidden && FIXNUMP (Vmouse_highlight)
&& (any == 0
|| !EQ (any->tool_bar_window, hlinfo->mouse_face_window)
|| !EQ (any->tab_bar_window, hlinfo->mouse_face_window)))
&& (any == NULL
|| (!EQ (any->tool_bar_window, hlinfo->mouse_face_window)
&& !EQ (any->tab_bar_window, hlinfo->mouse_face_window))))
{
mouse_frame = hlinfo->mouse_face_mouse_frame;

View file

@ -3352,9 +3352,9 @@ haiku_read_socket (struct terminal *terminal, struct input_event *hold_quit)
/* If mouse-highlight is an integer, input clears out
mouse highlighting. */
if (!hlinfo->mouse_face_hidden && FIXNUMP (Vmouse_highlight)
&& (f == 0
|| !EQ (f->tool_bar_window, hlinfo->mouse_face_window)
|| !EQ (f->tab_bar_window, hlinfo->mouse_face_window)))
&& (f == NULL
|| (!EQ (f->tool_bar_window, hlinfo->mouse_face_window)
&& !EQ (f->tab_bar_window, hlinfo->mouse_face_window))))
{
mouse_frame = hlinfo->mouse_face_mouse_frame;

View file

@ -20201,8 +20201,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
/* If mouse-highlight is an integer, input clears out
mouse highlighting. */
if (!hlinfo->mouse_face_hidden
&& FIXNUMP (Vmouse_highlight)
if (!hlinfo->mouse_face_hidden && FIXNUMP (Vmouse_highlight)
&& (f == NULL
|| (!EQ (f->tab_bar_window, hlinfo->mouse_face_window)
#if ! defined (USE_GTK)