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.

diff --git a/src/haikufns.c b/src/haikufns.c
index 67f79a31669cbbc27caed5f80fe7365b5d857a0a..f3667ac2f9db025df112285f88ff81b1a85f20af 100644 (file)
--- 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 b0b779bd41c3b996858004b50c651e117cb055d8..433df0596101a08fa1b6e1ef86df22404df82d1c 100644 (file)
--- 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 ce867c1619cfd2a432ed09a017a1f952eb960761..076cd97875af98f127c19f907f08d9f7618e1b09 100644 (file)
--- 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)))
        {