* xfns.c (compute_tip_xy): Handle negative dx and dy.

* w32fns.c (compute_tip_xy): Ditto

* macfns.c (compute_tip_xy): Ditto

diff --git a/src/ChangeLog b/src/ChangeLog
index b26416b7839b32e51380faa71db8516018572151..369846e302d6e8ddccd60b9342b06e77db244898 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-14  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xfns.c (compute_tip_xy): Handle negative dx and dy.
+
+       * w32fns.c (compute_tip_xy): Ditto
+
+       * macfns.c (compute_tip_xy): Ditto
+
 2005-12-14  Chong Yidong  <cyd@stupidchicken.com>
 
        * print.c (print_preprocess): Go to a deeper print_depth to avoid

diff --git a/src/macfns.c b/src/macfns.c
index de6a055fce62171408cd32eb20f9f5f85d77c2e8..99abc64304356949870d679940ceecea72ad210a 100644 (file)
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -3840,9 +3840,11 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
 
   if (INTEGERP (top))
     *root_y = XINT (top);
+  else if (*root_y + XINT (dy) <= 0)
+    *root_y = 0; /* Can happen for negative dy */
   else if (*root_y + XINT (dy) + height <= FRAME_MAC_DISPLAY_INFO (f)->height)
     /* It fits below the pointer */
-      *root_y += XINT (dy);
+    *root_y += XINT (dy);
   else if (height + XINT (dy) <= *root_y)
     /* It fits above the pointer.  */
     *root_y -= height + XINT (dy);
@@ -3852,6 +3854,8 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
 
   if (INTEGERP (left))
     *root_x = XINT (left);
+  else if (*root_x + XINT (dx) <= 0)
+    *root_x = 0; /* Can happen for negative dx */
   else if (*root_x + XINT (dx) + width <= FRAME_MAC_DISPLAY_INFO (f)->width)
     /* It fits to the right of the pointer.  */
     *root_x += XINT (dx);

diff --git a/src/w32fns.c b/src/w32fns.c
index 647267972dc27d931d0b2cfd67cfa552ff6106f0..b82814bca72b8d992e9b76dde66f3f07e6c17e33 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7411,6 +7411,8 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
 
   if (INTEGERP (top))
     *root_y = XINT (top);
+  else if (*root_y + XINT (dy) <= 0)
+    *root_y = 0; /* Can happen for negative dy */
   else if (*root_y + XINT (dy) + height <= FRAME_W32_DISPLAY_INFO (f)->height)
     /* It fits below the pointer */
       *root_y += XINT (dy);
@@ -7423,6 +7425,8 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
 
   if (INTEGERP (left))
     *root_x = XINT (left);
+  else if (*root_x + XINT (dx) <= 0)
+    *root_x = 0; /* Can happen for negative dx */
   else if (*root_x + XINT (dx) + width <= FRAME_W32_DISPLAY_INFO (f)->width)
     /* It fits to the right of the pointer.  */
     *root_x += XINT (dx);

diff --git a/src/xfns.c b/src/xfns.c
index 667b1411d1c70f61785606fa479a1eeb68f491d6..ead4d76c710921fc46e4a04e7ee355dac67fef05 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4940,6 +4940,8 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
 
   if (INTEGERP (top))
     *root_y = XINT (top);
+  else if (*root_y + XINT (dy) <= 0)
+    *root_y = 0; /* Can happen for negative dy */
   else if (*root_y + XINT (dy) + height <= FRAME_X_DISPLAY_INFO (f)->height)
     /* It fits below the pointer */
       *root_y += XINT (dy);
@@ -4952,6 +4954,8 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
 
   if (INTEGERP (left))
     *root_x = XINT (left);
+  else if (*root_x + XINT (dx) <= 0)
+    *root_x = 0; /* Can happen for negative dx */
   else if (*root_x + XINT (dx) + width <= FRAME_X_DISPLAY_INFO (f)->width)
     /* It fits to the right of the pointer.  */
     *root_x += XINT (dx);