From 63685b9d09862e4e964d2dc7a4e856742fe69420 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Fri, 6 Apr 2001 17:00:26 +0000 Subject: [PATCH] (xmenu_show): Use FRAME_X_SCREEN_NUMBER. --- src/ChangeLog | 10 ++++++++++ src/xmenu.c | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8ef90b8cfdc..ed4535c28d9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2001-04-06 Gerd Moellmann + + * 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 * composite.c (update_compositions) : Fix diff --git a/src/xmenu.c b/src/xmenu.c index b4a1a87d4d9..6317c126286 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -2710,10 +2710,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) /* 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); -- 2.39.5