martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(xmenu_show): Use FRAME_X_SCREEN_NUMBER.

Browse Source
This commit is contained in:
Gerd Moellmann
2001-04-06 17:00:26 +00:00
parent 9d5361248c
commit 63685b9d09
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@@ -1,3 +1,13 @@
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

6
src/xmenu.c
View File

@@ -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);