Commit 63685b9d authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(xmenu_show): Use FRAME_X_SCREEN_NUMBER.

parent 9d536124
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> 2001-04-06 Dave Love <fx@gnu.org>
* composite.c (update_compositions) <check_mask & CHECK_HEAD>: Fix * composite.c (update_compositions) <check_mask & CHECK_HEAD>: Fix
......
...@@ -2710,10 +2710,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) ...@@ -2710,10 +2710,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
/* All set and ready to fly. */ /* All set and ready to fly. */
XMenuRecompute (FRAME_X_DISPLAY (f), menu); XMenuRecompute (FRAME_X_DISPLAY (f), menu);
dispwidth = DisplayWidth (FRAME_X_DISPLAY (f), dispwidth = DisplayWidth (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
XScreenNumberOfScreen (FRAME_X_SCREEN (f))); dispheight = DisplayHeight (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
dispheight = DisplayHeight (FRAME_X_DISPLAY (f),
XScreenNumberOfScreen (FRAME_X_SCREEN (f)));
x = min (x, dispwidth); x = min (x, dispwidth);
y = min (y, dispheight); y = min (y, dispheight);
x = max (x, 1); x = max (x, 1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment