# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 782635140 0
# Node ID 1c985426ad84fa249df5d064b8ba41f91f697d67
# Parent  9fe4987e4896fd3ec8bff063a7bd857b51f645d7
(xdialog_show, xmenu_show): Use grabbed field instead of x_mouse_grabbed.

(xmenu_show): Use the screen in FRAME_X_DISPLAY_INFO,
not the display's default screen.

diff -r 9fe4987e4896 -r 1c985426ad84 src/xmenu.c
--- a/src/xmenu.c	Thu Oct 20 05:33:22 1994 +0000
+++ b/src/xmenu.c	Thu Oct 20 06:39:00 1994 +0000
@@ -1507,8 +1507,6 @@
 
 #ifdef USE_X_TOOLKIT
 
-extern unsigned int x_mouse_grabbed;
-
 /* We need a unique id for each widget handled by the Lucid Widget
    library.  This includes the frame main windows, popup menu and
    dialog box.  */
@@ -1988,7 +1986,7 @@
      That is not necessarily true, but the fiction leads to reasonable
      results, and it is a pain to ask which are actually held now
      or track this in the loop above.  */
-  x_mouse_grabbed = 0;
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 #endif
 
   /* Unread any events that we got but did not handle.  */
@@ -2224,9 +2222,9 @@
   /* All set and ready to fly.  */
   XMenuRecompute (FRAME_X_DISPLAY (f), menu);
   dispwidth = DisplayWidth (FRAME_X_DISPLAY (f),
-			    XDefaultScreen (FRAME_X_DISPLAY (f)));
+			    FRAME_X_DISPLAY_INFO (f)->screen);
   dispheight = DisplayHeight (FRAME_X_DISPLAY (f),
-			      XDefaultScreen (FRAME_X_DISPLAY (f)));
+			      FRAME_X_DISPLAY_INFO (f)->screen);
   x = min (x, dispwidth);
   y = min (y, dispheight);
   x = max (x, 1);
@@ -2308,7 +2306,7 @@
      (The oldXMenu code doesn't track this info for us.)
      That is not necessarily true, but the fiction leads to reasonable
      results, and it is a pain to ask which are actually held now.  */
-  x_mouse_grabbed = 0;
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 #endif
 
   return entry;