bug#26905: [PATCH] Show tooltip on correct screen (bug#26905)

["Charles A. Roelli" <charles@aurox.ch>]

Works fine for me too! Thanks for coming up with this fix.


> On 16 May 2017, at 23:56, Alan Third <alan@idiocy.org> wrote:
> 
> * src/nsfns.m (compute_tip_xy): Find the correct screen for the
> tooltip and constrain it to that screen.
> ---
> src/nsfns.m | 27 ++++++++++++++++++++-------
> 1 file changed, 20 insertions(+), 7 deletions(-)
> 
> diff --git a/src/nsfns.m b/src/nsfns.m
> index cbe0ffb858..04565a99bb 100644
> --- a/src/nsfns.m
> +++ b/src/nsfns.m
> @@ -2760,6 +2760,7 @@ and GNUstep implementations ("distributor-specific release
>   EmacsView *view = FRAME_NS_VIEW (f);
>   struct ns_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
>   NSPoint pt;
> +  NSScreen *screen;
> 
>   /* Start with user-specified or mouse position.  */
>   left = Fcdr (Fassq (Qleft, parms));
> @@ -2794,13 +2795,25 @@ and GNUstep implementations ("distributor-specific release
>          - height);
>     }
> 
> +  /* Find the screen that pt is on. */
> +  for (screen in [NSScreen screens])
> +#ifdef NS_IMPL_COCOA
> +    if (CGRectContainsPoint ([screen frame], pt))
> +#else
> +    if (pt.x >= screen.frame.origin.x
> +        && pt.x < screen.frame.origin.x + screen.frame.size.width
> +        && pt.y >= screen.frame.origin.y
> +        && pt.y < screen.frame.origin.y + screen.frame.size.height)
> +#endif
> +      break;
> +
>   /* Ensure in bounds.  (Note, screen origin = lower left.) */
>   if (INTEGERP (left) || INTEGERP (right))
>     *root_x = pt.x;
> -  else if (pt.x + XINT (dx) <= 0)
> -    *root_x = 0; /* Can happen for negative dx */
> +  else if (pt.x + XINT (dx) <= screen.frame.origin.x)
> +    *root_x = screen.frame.origin.x; /* Can happen for negative dx */
>   else if (pt.x + XINT (dx) + width
> -       <= x_display_pixel_width (FRAME_DISPLAY_INFO (f)))
> +       <= screen.frame.origin.x + screen.frame.size.width)
>     /* It fits to the right of the pointer.  */
>     *root_x = pt.x + XINT (dx);
>   else if (width + XINT (dx) <= pt.x)
> @@ -2808,20 +2821,20 @@ and GNUstep implementations ("distributor-specific release
>     *root_x = pt.x - width - XINT (dx);
>   else
>     /* Put it left justified on the screen -- it ought to fit that way.  */
> -    *root_x = 0;
> +    *root_x = screen.frame.origin.x;
> 
>   if (INTEGERP (top) || INTEGERP (bottom))
>     *root_y = pt.y;
> -  else if (pt.y - XINT (dy) - height >= 0)
> +  else if (pt.y - XINT (dy) - height >= screen.frame.origin.y)
>     /* It fits below the pointer.  */
>     *root_y = pt.y - height - XINT (dy);
>   else if (pt.y + XINT (dy) + height
> -       <= x_display_pixel_height (FRAME_DISPLAY_INFO (f)))
> +       <= screen.frame.origin.y + screen.frame.size.height)
>     /* It fits above the pointer */
>       *root_y = pt.y + XINT (dy);
>   else
>     /* Put it on the top.  */
> -    *root_y = x_display_pixel_height (FRAME_DISPLAY_INFO (f)) - height;
> +    *root_y = screen.frame.origin.y + screen.frame.size.height - height;
> }
> 
> 
> -- 
> 
> Here’s my go at this. It seems to work OK on single and multi‐monitor
> setups in macOS, and in GNUstep in single monitor (I can’t test it
> multi‐monitor).
> 
> -- 
> Alan Third