Mercurial > emacs

changeset 44752:17275bfd5698

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add calls to GrabKeyboard to remove strange interactions with window managers that steal keypresses.
author Jan Djärv <jan.h.d@swipnet.se>
date Mon, 22 Apr 2002 18:27:03 +0000
parents 81dd6129b727
children 55f9c8874c01
files oldXMenu/Activate.c
diffstat 1 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/oldXMenu/Activate.c	Mon Apr 22 18:25:55 2002 +0000
+++ b/oldXMenu/Activate.c	Mon Apr 22 18:27:03 2002 +0000
@@ -1,4 +1,4 @@
-/* $Header: /gd/gnu/cvsroot/emacs/oldXMenu/Activate.c,v 1.2 2000/01/27 15:31:20 gerd Exp $ */
+/* $Header: /cvsroot/emacs//emacs/oldXMenu/Activate.c,v 1.3 2000/07/21 14:36:24 gerd Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 
 #include "copyright.h"
@@ -83,6 +83,9 @@
 #include <config.h>
 #include "XMenuInt.h"
 
+/* For debug, set this to 0 to not grab the keyboard on menu popup */
+int x_menu_grab_keyboard = 1;
+
 int
 XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
 	      help_callback)
@@ -225,6 +228,18 @@
 			  menu->mouse_cursor,
 			  CurrentTime
 			  );
+    if (status == Success && x_menu_grab_keyboard)
+      {
+        status = XGrabKeyboard (display,
+                                menu->parent,
+                                False,
+                                GrabModeAsync,
+                                GrabModeAsync,
+                                CurrentTime);
+        if (status != Success)
+          XUngrabPointer(display, CurrentTime);
+      }
+    
     if (status == _X_FAILURE) {
 	_XMErrorCode = XME_GRAB_MOUSE;
 	return(XM_FAILURE);
@@ -465,6 +480,7 @@
      * Ungrab the mouse.
      */
     XUngrabPointer(display, CurrentTime);
+    XUngrabKeyboard(display, CurrentTime);
 
     /* 
      * Restore bits under where the menu was if we managed