From f1847de368bd4c9ec757371679ae1ac65d7e5e93 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 22 Oct 1994 03:51:12 +0000 Subject: [PATCH] (xmenu_show): Get the screen number for DisplayHeight and DisplayWidth. Use root_window slot in the x_display_info. --- src/xmenu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xmenu.c b/src/xmenu.c index e1ace610f9c..138f0484aa3 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -2093,7 +2093,7 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error) /* Find the position of the outside upper-left corner of the inner window, with respect to the outer window. */ - if (f->display.x->parent_desc != ROOT_WINDOW) + if (f->display.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window) { BLOCK_INPUT; XTranslateCoordinates (FRAME_X_DISPLAY (f), @@ -2222,9 +2222,9 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error) /* All set and ready to fly. */ XMenuRecompute (FRAME_X_DISPLAY (f), menu); dispwidth = DisplayWidth (FRAME_X_DISPLAY (f), - FRAME_X_DISPLAY_INFO (f)->screen); + XScreenNumberOfScreen (FRAME_X_SCREEN (f))); dispheight = DisplayHeight (FRAME_X_DISPLAY (f), - FRAME_X_DISPLAY_INFO (f)->screen); + XScreenNumberOfScreen (FRAME_X_SCREEN (f))); x = min (x, dispwidth); y = min (y, dispheight); x = max (x, 1); -- 2.39.5