# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1100248137 0
# Node ID 9351060ba5467222603cb03b5811ffcc502df716
# Parent  e0ba1fe44b88e2a9b045a23d4b3ea8a1446193a4
* XMenu.h (XMenuActivateSetWaitFunction): New function.

* Activate.c (XMenuActivateSetWaitFunction): New function.
(XMenuActivate): Call wait_func if set, before XNextEvent.

diff -r e0ba1fe44b88 -r 9351060ba546 oldXMenu/Activate.c
--- a/oldXMenu/Activate.c	Fri Nov 12 04:06:13 2004 +0000
+++ b/oldXMenu/Activate.c	Fri Nov 12 08:28:57 2004 +0000
@@ -85,6 +85,20 @@
 /* For debug, set this to 0 to not grab the keyboard on menu popup */
 int x_menu_grab_keyboard = 1;
 
+typedef void (*Wait_func)();
+
+static Wait_func wait_func;
+static void* wait_data;
+
+void
+XMenuActivateSetWaitFunction (func, data)
+     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)
@@ -266,6 +280,7 @@
      * 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:
@@ -557,6 +572,8 @@
 	free((char *)feq_tmp);
     }
 
+    wait_func = 0;
+
     /*
      * Return successfully.
      */
diff -r e0ba1fe44b88 -r 9351060ba546 oldXMenu/ChangeLog
--- a/oldXMenu/ChangeLog	Fri Nov 12 04:06:13 2004 +0000
+++ b/oldXMenu/ChangeLog	Fri Nov 12 08:28:57 2004 +0000
@@ -1,3 +1,10 @@
+2004-11-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* XMenu.h (XMenuActivateSetWaitFunction): New function.
+
+	* Activate.c (XMenuActivateSetWaitFunction): New function.
+	(XMenuActivate): Call wait_func if set, before XNextEvent.
+
 2002-04-22  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* Activate.c: Add calls to GrabKeyboard to remove strange
diff -r e0ba1fe44b88 -r 9351060ba546 oldXMenu/XMenu.h
--- a/oldXMenu/XMenu.h	Fri Nov 12 04:06:13 2004 +0000
+++ b/oldXMenu/XMenu.h	Fri Nov 12 08:28:57 2004 +0000
@@ -251,6 +251,7 @@
 int XMenuEventHandler();	/* No value actually returned. */
 int XMenuLocate();
 int XMenuSetFreeze();		/* No value actually returned. */
+void XMenuActivateSetWaitFunction();
 int XMenuActivate();
 char *XMenuPost();
 int XMenuDeletePane();