[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/oldXMenu/Activate.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/oldXMenu/Activate.c [emacs-unicode-2] |
Date: |
Fri, 19 Nov 2004 02:16:20 -0500 |
Index: emacs/oldXMenu/Activate.c
diff -c emacs/oldXMenu/Activate.c:1.5.6.1 emacs/oldXMenu/Activate.c:1.5.6.2
*** emacs/oldXMenu/Activate.c:1.5.6.1 Fri Apr 16 12:50:43 2004
--- emacs/oldXMenu/Activate.c Fri Nov 19 06:55:07 2004
***************
*** 85,90 ****
--- 85,104 ----
/* 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,271 ****
--- 280,286 ----
* 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,562 ****
--- 572,579 ----
free((char *)feq_tmp);
}
+ wait_func = 0;
+
/*
* Return successfully.
*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/oldXMenu/Activate.c [emacs-unicode-2],
Miles Bader <=