Do not grab keyboard if installation-directory is

non-nil (not installed Emacs).  To simplify debugging.

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 28626ddc255f3029a286b653d2fd3c3f1d98179f..3ead711d7971d920271e1ad83e45cbb6f7b3382f 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-28  Jan D.  <jan.h.d@swipnet.se>
+
+       * xlwmenu.c: Do not grab keyboard if installation-directory is
+       non-nil (not installed Emacs).  To simplify debugging.
+
 2002-04-28  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * Makefile.in: Remove OpenLook file dependencies.

diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 53dc7022857e99f360d9e812ac18d4ddb69a1f68..d98ce469f9f87a4aa333bd35110422823f0b6e50 100644 (file)
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -257,8 +257,10 @@ WidgetClass xlwMenuWidgetClass = (WidgetClass) &xlwMenuClassRec;
 
 int submenu_destroyed;
 
-/* For debug, set this to 0 to not grab the keyboard on menu popup */
-int x_menu_grab_keyboard = 1;
+/* 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,7 +273,7 @@ ungrab_all (w, ungrabtime)
      Time ungrabtime;
 {
   XtUngrabPointer (w, ungrabtime);
-  if (x_menu_grab_keyboard) XtUngrabKeyboard (w, ungrabtime);
+  if (GRAB_KEYBOARD) XtUngrabKeyboard (w, ungrabtime);
 }
 
 /* Like abort, but remove grabs from widget W before.  */
@@ -2334,7 +2336,7 @@ pop_up_menu (mw, event)
                      mw->menu.cursor_shape,
                      event->time) == Success)
     {
-      if (! x_menu_grab_keyboard
+      if (! GRAB_KEYBOARD
           || XtGrabKeyboard ((Widget)mw, False, GrabModeAsync,
                              GrabModeAsync, event->time) == Success)
         {