master a03d7630f1: Fix flicker when moving tooltips between frames during mouse drag-and-drop

[Po Lu]

branch: master
commit a03d7630f133d08b457a6d08b9ce2050566800ff
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Fix flicker when moving tooltips between frames during mouse drag-and-drop
    
    * src/haikufns.c (Fx_show_tip):
    * src/nsfns.m (Fx_show_tip): Allow sharing existing tooltip
    frames between any two frames.
    * src/xfns.c (Fx_show_tip): Allow that but only between frames
    on the same X display.
---
 src/haikufns.c | 1 -
 src/nsfns.m    | 1 -
 src/xfns.c     | 3 ++-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/haikufns.c b/src/haikufns.c
index 67f79a3166..f3667ac2f9 100644
--- a/src/haikufns.c
+++ b/src/haikufns.c
@@ -2405,7 +2405,6 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
   if (!NILP (tip_frame) && FRAME_LIVE_P (XFRAME (tip_frame)))
     {
       if (FRAME_VISIBLE_P (XFRAME (tip_frame))
-         && EQ (frame, tip_last_frame)
          && !NILP (Fequal_including_properties (tip_last_string, string))
          && !NILP (Fequal (tip_last_parms, parms)))
        {
diff --git a/src/nsfns.m b/src/nsfns.m
index b0b779bd41..433df05961 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -3292,7 +3292,6 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
       if (!NILP (tip_frame) && FRAME_LIVE_P (XFRAME (tip_frame)))
        {
          if (FRAME_VISIBLE_P (XFRAME (tip_frame))
-             && EQ (frame, tip_last_frame)
              && !NILP (Fequal_including_properties (tip_last_string, string))
              && !NILP (Fequal (tip_last_parms, parms)))
            {
diff --git a/src/xfns.c b/src/xfns.c
index ce867c1619..076cd97875 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -8681,7 +8681,8 @@ Text larger than the specified size is clipped.  */)
   if (!NILP (tip_frame) && FRAME_LIVE_P (XFRAME (tip_frame)))
     {
       if (FRAME_VISIBLE_P (XFRAME (tip_frame))
-         && BASE_EQ (frame, tip_last_frame)
+         && (FRAME_X_DISPLAY (XFRAME (frame))
+             == FRAME_X_DISPLAY (XFRAME (tip_last_frame)))
          && !NILP (Fequal_including_properties (tip_last_string, string))
          && !NILP (Fequal (tip_last_parms, parms)))
        {