mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-06 06:20:55 -08:00
Fix delivery of window manager ping events during menu
* oldXMenu/Activate.c (XMenuActivateSetExposeFunction) (XMenuActivate): * oldXMenu/XMenu.h: Remove expose functions. * src/msdos.h (XMenuSetAEQ): Remove no longer used function. * src/xmenu.c (x_menu_expose_event): Delete function. (x_menu_dispatch_event): New function. (x_menu_show): Set it as the XMenu event handler.
This commit is contained in:
parent
4b40b790ae
commit
ea70e545c9
4 changed files with 9 additions and 18 deletions
|
|
@ -122,7 +122,6 @@ int x_menu_grab_keyboard = 1;
|
|||
static Wait_func wait_func;
|
||||
static void* wait_data;
|
||||
static Translate_func translate_func = NULL;
|
||||
static Expose_func expose_func = NULL;
|
||||
|
||||
void
|
||||
XMenuActivateSetWaitFunction (Wait_func func, void *data)
|
||||
|
|
@ -137,12 +136,6 @@ XMenuActivateSetTranslateFunction (Translate_func func)
|
|||
translate_func = func;
|
||||
}
|
||||
|
||||
void
|
||||
XMenuActivateSetExposeFunction (Expose_func func)
|
||||
{
|
||||
expose_func = func;
|
||||
}
|
||||
|
||||
int
|
||||
XMenuActivate(
|
||||
register Display *display, /* Display to put menu on. */
|
||||
|
|
@ -346,9 +339,6 @@ XMenuActivate(
|
|||
feq = feq_tmp;
|
||||
}
|
||||
else if (_XMEventHandler) (*_XMEventHandler)(&event);
|
||||
|
||||
if (expose_func)
|
||||
expose_func (&event);
|
||||
break;
|
||||
}
|
||||
if (event_xmp->activated) {
|
||||
|
|
|
|||
|
|
@ -259,7 +259,6 @@ typedef void (*Wait_func)(void*);
|
|||
XPutBackEvent on an equivalent artificial core event on any
|
||||
function it wants to translate. */
|
||||
typedef void (*Translate_func)(XEvent *);
|
||||
typedef void (*Expose_func)(XEvent *);
|
||||
|
||||
/*
|
||||
* XMenu library routine declarations.
|
||||
|
|
@ -281,7 +280,6 @@ int XMenuLocate(Display *display, XMenu *menu, int p_num, int s_num, int x_pos,
|
|||
void XMenuSetFreeze(XMenu *menu, int freeze);
|
||||
void XMenuActivateSetWaitFunction(Wait_func func, void *data);
|
||||
void XMenuActivateSetTranslateFunction(Translate_func func);
|
||||
void XMenuActivateSetExposeFunction(Expose_func func);
|
||||
int XMenuActivate(Display *display, XMenu *menu, int *p_num, int *s_num, int x_pos, int y_pos, unsigned int event_mask, char **data, void (*help_callback) (char const *, int, int));
|
||||
char *XMenuPost(Display *display, XMenu *menu, int *p_num, int *s_num, int x_pos, int y_pos, int event_mask);
|
||||
int XMenuDeletePane(Display *display, XMenu *menu, int p_num);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue