comparison src/xmenu.c @ 9619:1c985426ad84

(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.

9618:9fe4987e4896

   TITLE is the specified menu title.
   ERROR is a place to store an error message string in case of failure.
   (We return nil on failure, but the value doesn't actually matter.)  */

#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.  */
LWLIB_ID widget_id_tick;

#ifdef HAVE_X_WINDOWS
  /* State that no mouse buttons are now held.
     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;
#endif

  /* Unread any events that we got but did not handle.  */
  while (queue != NULL) 
    {

    }

  /* All set and ready to fly.  */
  XMenuRecompute (FRAME_X_DISPLAY (f), menu);
  dispwidth = DisplayWidth (FRAME_X_DISPLAY (f),
			    XDefaultScreen (FRAME_X_DISPLAY (f)));
  dispheight = DisplayHeight (FRAME_X_DISPLAY (f),
			      XDefaultScreen (FRAME_X_DISPLAY (f)));
  x = min (x, dispwidth);
  y = min (y, dispheight);
  x = max (x, 1);
  y = max (y, 1);
  XMenuLocate (FRAME_X_DISPLAY (f), menu, 0, 0, x, y,

#ifdef HAVE_X_WINDOWS
  /* State that no mouse buttons are now held.
     (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;
#endif

  return entry;
}

9619:1c985426ad84

   TITLE is the specified menu title.
   ERROR is a place to store an error message string in case of failure.
   (We return nil on failure, but the value doesn't actually matter.)  */

#ifdef USE_X_TOOLKIT

/* 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.  */
LWLIB_ID widget_id_tick;

#ifdef HAVE_X_WINDOWS
  /* State that no mouse buttons are now held.
     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.  */
  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
#endif

  /* Unread any events that we got but did not handle.  */
  while (queue != NULL) 
    {

    }

  /* All set and ready to fly.  */
  XMenuRecompute (FRAME_X_DISPLAY (f), menu);
  dispwidth = DisplayWidth (FRAME_X_DISPLAY (f),
			    FRAME_X_DISPLAY_INFO (f)->screen);
  dispheight = DisplayHeight (FRAME_X_DISPLAY (f),
			      FRAME_X_DISPLAY_INFO (f)->screen);
  x = min (x, dispwidth);
  y = min (y, dispheight);
  x = max (x, 1);
  y = max (y, 1);
  XMenuLocate (FRAME_X_DISPLAY (f), menu, 0, 0, x, y,

#ifdef HAVE_X_WINDOWS
  /* State that no mouse buttons are now held.
     (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.  */
  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
#endif

  return entry;
}