+2001-04-06 Gerd Moellmann <gerd@gnu.org>
+
+ * xfns.c (compute_tip_xy): Add parameters WIDTH and HEIGHT.
+ Make sure the tooltip is completely visible.
+ (x_make_gc): Use FRAME_X_SCREEN_NUMBER.
+
+ * xterm.h (FRAME_X_SCREEN_NUMBER): New macro.
+
+ * xmenu.c (xmenu_show): Use FRAME_X_SCREEN_NUMBER.
+
2001-04-06 Dave Love <fx@gnu.org>
* composite.c (update_compositions) <check_mask & CHECK_HEAD>: Fix
/* All set and ready to fly. */
XMenuRecompute (FRAME_X_DISPLAY (f), menu);
- dispwidth = DisplayWidth (FRAME_X_DISPLAY (f),
- XScreenNumberOfScreen (FRAME_X_SCREEN (f)));
- dispheight = DisplayHeight (FRAME_X_DISPLAY (f),
- XScreenNumberOfScreen (FRAME_X_SCREEN (f)));
+ dispwidth = DisplayWidth (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
+ dispheight = DisplayHeight (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
x = min (x, dispwidth);
y = min (y, dispheight);
x = max (x, 1);