Commit 005e0d57 authored by Jan Djärv's avatar Jan Djärv

Do not grab keyboard if installation-directory is

non-nil (not installed Emacs).  To simplify debugging.
parent 8a42a102
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> 2002-04-28 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
* Makefile.in: Remove OpenLook file dependencies. * Makefile.in: Remove OpenLook file dependencies.
......
...@@ -257,8 +257,10 @@ WidgetClass xlwMenuWidgetClass = (WidgetClass) &xlwMenuClassRec; ...@@ -257,8 +257,10 @@ WidgetClass xlwMenuWidgetClass = (WidgetClass) &xlwMenuClassRec;
int submenu_destroyed; int submenu_destroyed;
/* For debug, set this to 0 to not grab the keyboard on menu popup */ /* For debug, if installation-directory is non-nil this is not an installed
int x_menu_grab_keyboard = 1; 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; static int next_release_must_exit;
...@@ -271,7 +273,7 @@ ungrab_all (w, ungrabtime) ...@@ -271,7 +273,7 @@ ungrab_all (w, ungrabtime)
Time ungrabtime; Time ungrabtime;
{ {
XtUngrabPointer (w, 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. */ /* Like abort, but remove grabs from widget W before. */
...@@ -2334,7 +2336,7 @@ pop_up_menu (mw, event) ...@@ -2334,7 +2336,7 @@ pop_up_menu (mw, event)
mw->menu.cursor_shape, mw->menu.cursor_shape,
event->time) == Success) event->time) == Success)
{ {
if (! x_menu_grab_keyboard if (! GRAB_KEYBOARD
|| XtGrabKeyboard ((Widget)mw, False, GrabModeAsync, || XtGrabKeyboard ((Widget)mw, False, GrabModeAsync,
GrabModeAsync, event->time) == Success) GrabModeAsync, event->time) == Success)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment