[Emacs-diffs] Changes to emacs/lwlib/xlwmenu.c

[Jan Djärv]

Index: emacs/lwlib/xlwmenu.c
diff -c emacs/lwlib/xlwmenu.c:1.49 emacs/lwlib/xlwmenu.c:1.50
*** emacs/lwlib/xlwmenu.c:1.49  Mon Apr 22 14:21:06 2002
--- emacs/lwlib/xlwmenu.c       Sun Apr 28 15:54:01 2002
***************
*** 257,264 ****
  
  int submenu_destroyed;
  
! /* For debug, set this to 0 to not grab the keyboard on menu popup */
! int x_menu_grab_keyboard = 1;
  
  static int next_release_must_exit;
  
--- 257,266 ----
  
  int submenu_destroyed;
  
! /* For debug, if installation-directory is non-nil this is not an installed
!    Emacs.   In that case we do not grab the keyboard to make it easier to
!    debug. */
! #define GRAB_KEYBOARD  (EQ (Vinstallation_directory, Qnil))
  
  static int next_release_must_exit;
  
***************
*** 271,277 ****
       Time ungrabtime;
  {
    XtUngrabPointer (w, ungrabtime);
!   if (x_menu_grab_keyboard) XtUngrabKeyboard (w, ungrabtime);
  }
  
  /* Like abort, but remove grabs from widget W before.  */
--- 273,279 ----
       Time ungrabtime;
  {
    XtUngrabPointer (w, ungrabtime);
!   if (GRAB_KEYBOARD) XtUngrabKeyboard (w, ungrabtime);
  }
  
  /* Like abort, but remove grabs from widget W before.  */
***************
*** 2334,2340 ****
                       mw->menu.cursor_shape,
                       event->time) == Success)
      {
!       if (! x_menu_grab_keyboard
            || XtGrabKeyboard ((Widget)mw, False, GrabModeAsync,
                               GrabModeAsync, event->time) == Success)
          {
--- 2336,2342 ----
                       mw->menu.cursor_shape,
                       event->time) == Success)
      {
!       if (! GRAB_KEYBOARD
            || XtGrabKeyboard ((Widget)mw, False, GrabModeAsync,
                               GrabModeAsync, event->time) == Success)
          {