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.

3 files changed, 7 insertions, 8 deletions

diff --git a/src/androidterm.c b/src/androidterm.c
index 96f595f3bdf..beab3406fdd 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -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;
 
diff --git a/src/haikuterm.c b/src/haikuterm.c
index 5c0863d3509..75c82ebdf31 100644
--- a/src/haikuterm.c
+++ b/src/haikuterm.c
@@ -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;
 
diff --git a/src/xterm.c b/src/xterm.c
index 03064acbe6c..0ff7804112f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -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)