1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Do not grab keyboard if installation-directory is

non-nil (not installed Emacs).  To simplify debugging.
This commit is contained in:
Jan Djärv 2002-04-28 19:54:30 +00:00
parent 8a42a102ef
commit 005e0d57fc
2 changed files with 11 additions and 4 deletions

View file

@ -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,Bm(Bk <Pavel@Janik.cz>
* Makefile.in: Remove OpenLook file dependencies.

View file

@ -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)
{