brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter: Assume XGE is available at build time

Browse Source 
Almost a decade old, lets just assume it's there. This makes the button
on cally-atktext-example work again when building with meson, and
probably other things too.
This commit is contained in:
Jonas Ådahl 2018-11-08 18:53:45 +01:00 committed by Georges Basile Stavracas Neto
parent 15732851bc
commit 80d5f326e8
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter/x11/clutter-event-x11.c
View File

@ -167,11 +167,9 @@ clutter_x11_handle_event (XEvent *xevent)
ClutterBackend *backend; ClutterBackend *backend;
ClutterEvent *event; ClutterEvent *event;
gint spin = 1; gint spin = 1;
#ifdef HAVE_XGE
ClutterBackendX11 *backend_x11; ClutterBackendX11 *backend_x11;
Display *xdisplay; Display *xdisplay;
gboolean allocated_event; gboolean allocated_event;
#endif
/* The return values here are someone approximate; we return /* The return values here are someone approximate; we return
* CLUTTER_X11_FILTER_REMOVE if a clutter event is * CLUTTER_X11_FILTER_REMOVE if a clutter event is
@ -190,12 +188,10 @@ clutter_x11_handle_event (XEvent *xevent)
event = clutter_event_new (CLUTTER_NOTHING); event = clutter_event_new (CLUTTER_NOTHING);
#ifdef HAVE_XGE
backend_x11 = CLUTTER_BACKEND_X11 (backend); backend_x11 = CLUTTER_BACKEND_X11 (backend);
xdisplay = backend_x11->xdpy; xdisplay = backend_x11->xdpy;
allocated_event = XGetEventData (xdisplay, &xevent->xcookie); allocated_event = XGetEventData (xdisplay, &xevent->xcookie);
#endif
if (_clutter_backend_translate_event (backend, xevent, event)) if (_clutter_backend_translate_event (backend, xevent, event))
{ {
@ -226,10 +222,8 @@ clutter_x11_handle_event (XEvent *xevent)
} }
out: out:
#ifdef HAVE_XGE
if (allocated_event) if (allocated_event)
XFreeEventData (xdisplay, &xevent->xcookie); XFreeEventData (xdisplay, &xevent->xcookie);
#endif
_clutter_threads_release_lock (); _clutter_threads_release_lock ();
@ -286,18 +280,14 @@ events_queue (ClutterBackendX11 *backend_x11)
event = clutter_event_new (CLUTTER_NOTHING); event = clutter_event_new (CLUTTER_NOTHING);
#ifdef HAVE_XGE
XGetEventData (xdisplay, &xevent.xcookie); XGetEventData (xdisplay, &xevent.xcookie);
#endif
if (_clutter_backend_translate_event (backend, &xevent, event)) if (_clutter_backend_translate_event (backend, &xevent, event))
_clutter_event_push (event, FALSE); _clutter_event_push (event, FALSE);
else else
clutter_event_free (event); clutter_event_free (event);
#ifdef HAVE_XGE
XFreeEventData (xdisplay, &xevent.xcookie); XFreeEventData (xdisplay, &xevent.xcookie);
#endif
} }
} }

8
clutter/configure.ac
View File

@ -320,14 +320,6 @@ AS_IF([test "x$SUPPORT_X11" = "x1"],
clutter_save_LIBS="$LIBS" clutter_save_LIBS="$LIBS"
LIBS="$LIBS $X11_LIBS" LIBS="$LIBS $X11_LIBS"
have_xge=no
AC_CHECK_FUNC([XGetEventData],
[
AC_DEFINE([HAVE_XGE], [1], [Define to 1 if X Generic Extensions is available])
have_xge=yes
X11_EXTS="$X11_EXTS xge"
])
CPPFLAGS="$clutter_save_CPPFLAGS" CPPFLAGS="$clutter_save_CPPFLAGS"
LIBS="$clutter_save_LIBS" LIBS="$clutter_save_LIBS"