# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 782797872 0
# Node ID 910da93766c859768ac8786b5f0d5e3bb57d1c20
# Parent  14b1481b7c6d12764041cbce025f5a9ce61d627c
(xmenu_show): Get the screen number for DisplayHeight
and DisplayWidth.  Use root_window slot in the x_display_info.

diff -r 14b1481b7c6d -r 910da93766c8 src/xmenu.c
--- a/src/xmenu.c	Sat Oct 22 03:27:46 1994 +0000
+++ b/src/xmenu.c	Sat Oct 22 03:51:12 1994 +0000
@@ -2093,7 +2093,7 @@
 
     /* 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 @@
   /* 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);