Merge changes from emacs-23 branch

[gnu-emacs] / oldXMenu / Activate.c

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index c4816142bbc9723a9fc7dc163855ede3e228fefa..55bfca510b95ed1f629a12bb611bac5cf656b2d6 100644 (file)
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -1,8 +1,24 @@
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/Activate.c,v 1.6 2003/09/01 15:45:47 miles Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985  */
 
 #include "copyright.h"
 
+/*
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
 /*
  * XMenu:      MIT Project Athena, X Window system menu package
  *
@@ -82,22 +98,32 @@
 
 #include <config.h>
 #include "XMenuInt.h"
+#include <X11/keysym.h>
 
 /* For debug, set this to 0 to not grab the keyboard on menu popup */
 int x_menu_grab_keyboard = 1;
 
+static Wait_func wait_func;
+static void* wait_data;
+
+void
+XMenuActivateSetWaitFunction (Wait_func func, void *data)
+{
+  wait_func = func;
+  wait_data = data;
+}
+
 int
-XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
-             help_callback)
-    register Display *display;         /* Display to put menu on. */
-    register XMenu *menu;              /* Menu to activate. */
-    int *p_num;                                /* Pane number selected. */
-    int *s_num;                                /* Selection number selected. */
-    int x_pos;                         /* X coordinate of menu position. */
-    int y_pos;                         /* Y coordinate of menu position. */
-    unsigned int event_mask;           /* Mouse button event mask. */
-    char **data;                       /* Pointer to return data value. */
-    void (* help_callback) ();         /* Help callback.  */
+XMenuActivate(
+    register Display *display,         /* Display to put menu on. */
+    register XMenu *menu,              /* Menu to activate. */
+    int *p_num,                                /* Pane number selected. */
+    int *s_num,                                /* Selection number selected. */
+    int x_pos,                         /* X coordinate of menu position. */
+    int y_pos,                         /* Y coordinate of menu position. */
+    unsigned int event_mask,           /* Mouse button event mask. */
+    char **data,                       /* Pointer to return data value. */
+    void (* help_callback) (char *, int, int)) /* Help callback.  */
 {
     int status;                                /* X routine call status. */
     int orig_x;                                /* Upper left menu origin X coord. */
@@ -118,6 +144,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
     Window root, child;
     int root_x, root_y, win_x, win_y;
     unsigned int mask;
+    KeySym keysym;
 
     /*
      * Define and allocate a foreign event queue to hold events
@@ -267,6 +294,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
      * Begin event processing loop.
      */
     while (1) {
+        if (wait_func) (*wait_func) (wait_data);
        XNextEvent(display, &event);    /* Get next event. */
        switch (event.type) {           /* Dispatch on the event type. */
     case Expose:
@@ -444,6 +472,18 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
                }
                selection = True;
                break;
+        case KeyPress:
+        case KeyRelease:
+                keysym = XLookupKeysym (&event.xkey, 0);
+
+                /* Pop down on C-g and Escape.  */
+                if ((keysym == XK_g && (event.xkey.state & ControlMask) != 0)
+                    || keysym == XK_Escape) /* Any escape, ignore modifiers.  */
+                  {
+                    ret_val = XM_NO_SELECT;
+                    selection = True;
+                  }
+               break;
            default:
                /*
                 * If AEQ mode is enabled then queue the event.
@@ -558,6 +598,8 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
        free((char *)feq_tmp);
     }
 
+    wait_func = 0;
+
     /*
      * Return successfully.
      */