callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: Check for XGetEventData()

Browse Source 
This is a call only available in recent libX11, only the XI2 code
depends on this within GDK, but XI2 implies having GenericEvents
available too.
This commit is contained in:
Carlos Garnacho
2011-05-20 22:21:59 +02:00
parent 3285605c54
commit e89d6b8741
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1096,6 +1096,10 @@ if test "x$enable_x11_backend" = xyes; then
fi fi
fi fi
# Check for XGetEventData for GenericEvents
AC_CHECK_FUNC(XGetEventData,
AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
# set up things for XInput # set up things for XInput
if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
have_xinput=yes have_xinput=yes

6
gdk/x11/gdkeventsource.c
View File

@ -177,11 +177,13 @@ gdk_event_source_translate_event (GdkEventSource *event_source,
dpy = GDK_DISPLAY_XDISPLAY (event_source->display); dpy = GDK_DISPLAY_XDISPLAY (event_source->display);
#ifdef HAVE_XGENERICEVENTS
/* Get cookie data here so it's available /* Get cookie data here so it's available
* to every event translator and event filter. * to every event translator and event filter.
*/ */
if (xevent->type == GenericEvent) if (xevent->type == GenericEvent)
XGetEventData (dpy, &xevent->xcookie); XGetEventData (dpy, &xevent->xcookie);
#endif
filter_window = gdk_event_source_get_filter_window (event_source, xevent, filter_window = gdk_event_source_get_filter_window (event_source, xevent,
&event_translator); &event_translator);
@ -204,8 +206,10 @@ gdk_event_source_translate_event (GdkEventSource *event_source,
if (result != GDK_FILTER_CONTINUE) if (result != GDK_FILTER_CONTINUE)
{ {
#ifdef HAVE_XGENERICEVENTS
if (xevent->type == GenericEvent) if (xevent->type == GenericEvent)
XFreeEventData (dpy, &xevent->xcookie); XFreeEventData (dpy, &xevent->xcookie);
#endif
if (result == GDK_FILTER_REMOVE) if (result == GDK_FILTER_REMOVE)
{ {
@ -250,8 +254,10 @@ gdk_event_source_translate_event (GdkEventSource *event_source,
handle_focus_change (&event->crossing); handle_focus_change (&event->crossing);
} }
#ifdef HAVE_XGENERICEVENTS
if (xevent->type == GenericEvent) if (xevent->type == GenericEvent)
XFreeEventData (dpy, &xevent->xcookie); XFreeEventData (dpy, &xevent->xcookie);
#endif
return event; return event;
} }