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.

(cherry picked from commit b97b3b057ca8128cb479f8d3893816d146cfef59)

diff --git a/src/androidterm.c b/src/androidterm.c
index 96f595f3bdfcf1ed8fa4037e4dd6000672e0f257..beab3406fddaff6e13c3ce1df2a3f8d26716e112 100644 (file)
--- 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 5c0863d350979e7534e6754f320306649133c7f3..75c82ebdf31508ddf6b27dc4ae55eb17fc28fb55 100644 (file)
--- 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 03064acbe6cdfbd049605834e777f19875b05cfb..0ff7804112f6c463d46e67f0f9e7cadd2a2f60b9 100644 (file)
--- 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)