4f6fe6f0e2
This fixes some problems which were stopping --disable-glib from working properly: • A lot of the public headers were including glib.h. This shouldn't be necessary because the API doesn't expose any glib types. Otherwise any apps would require glib in order to get the header. • The public headers were using G_BEGIN_DECLS. There is now a replacement macro called COGL_BEGIN_DECLS which is defined in cogl-types.h. • A similar fix has been done for G_GNUC_NULL_TERMINATED and G_GNUC_DEPRECATED. • The CFLAGS were not including $(builddir)/deps/glib which was preventing it finding the generated glibconfig.h when building out of tree. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 4138b3141c2f39cddaea3d72bfc04342ed5092d0)
85 lines
2.3 KiB
C
85 lines
2.3 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2011 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef __COGL_XLIB_H__
|
|
#define __COGL_XLIB_H__
|
|
|
|
#include <X11/Xlib.h>
|
|
|
|
#define __COGL_XLIB_H_INSIDE__
|
|
#define __COGL_H_INSIDE__
|
|
|
|
#include <cogl/cogl-types.h>
|
|
#include <cogl/cogl-clutter-xlib.h>
|
|
#include <cogl/cogl-xlib-renderer.h>
|
|
|
|
COGL_BEGIN_DECLS
|
|
|
|
/*
|
|
* cogl_xlib_get_display:
|
|
*
|
|
* Return value: the Xlib display that will be used by the Xlib winsys
|
|
* backend. The display needs to be set with _cogl_xlib_set_display()
|
|
* before this function is called.
|
|
*
|
|
* Stability: Unstable
|
|
*/
|
|
Display *
|
|
cogl_xlib_get_display (void);
|
|
|
|
/*
|
|
* cogl_xlib_set_display:
|
|
*
|
|
* Sets the Xlib display that Cogl will use for the Xlib winsys
|
|
* backend. This function should eventually go away when Cogl gains a
|
|
* more complete winsys abstraction.
|
|
*
|
|
* Stability: Unstable
|
|
*/
|
|
void
|
|
cogl_xlib_set_display (Display *display);
|
|
|
|
/*
|
|
* cogl_xlib_handle_event:
|
|
* @xevent: pointer to XEvent structure
|
|
*
|
|
* This function processes a single X event; it can be used to hook
|
|
* into external X event retrieval (for example that done by Clutter
|
|
* or GDK).
|
|
*
|
|
* Return value: #CoglXlibFilterReturn. %COGL_XLIB_FILTER_REMOVE
|
|
* indicates that Cogl has internally handled the event and the
|
|
* caller should do no further processing. %COGL_XLIB_FILTER_CONTINUE
|
|
* indicates that Cogl is either not interested in the event,
|
|
* or has used the event to update internal state without taking
|
|
* any exclusive action.
|
|
*
|
|
* Stability: Unstable
|
|
*/
|
|
CoglFilterReturn
|
|
cogl_xlib_handle_event (XEvent *xevent);
|
|
|
|
#undef __COGL_XLIB_H_INSIDE__
|
|
|
|
#endif /* __COGL_XLIB_H__ */
|