mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 20:32:16 +00:00
afbb13e1a4
This adds compiler symbol deprecation declarations for old Cogl APIs so that users can easily see via compiler warning when they are using these symbols, and also see a hint for what the apis should be replaced with. So that users of Cogl can manage when to show these warnings this introduces a scheme borrowed from glib whereby you can declare what version of the Cogl api you are using: COGL_VERSION_MIN_REQUIRED can be defined to indicate the oldest Cogl api that the application wants to use. Cogl will only warn about deprecations for symbols that were deprecated earlier than this required version. If this is left undefined then by default Cogl will warn about all deprecations. COGL_VERSION_MAX_ALLOWED can be defined to indicate the newest api that the application uses. If the application uses symbols newer than this then Cogl will give a warning about that. This patch removes the need to maintain the COGL_DISABLE_DEPRECATED guards around deprecated symbols. This patch fixes a few uses of deprecated symbols in the examples/ Reviewed-by: Neil Roberts <neil@linux.intel.com>
95 lines
2.8 KiB
C
95 lines
2.8 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>
|
|
#include <cogl/cogl-macros.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
|
|
* Deprecated: 1.16: Use cogl_xlib_renderer_get_display() instead
|
|
*/
|
|
Display *
|
|
cogl_xlib_get_display (void)
|
|
COGL_DEPRECATED_IN_1_16_FOR (cogl_xlib_renderer_get_display);
|
|
|
|
/*
|
|
* 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
|
|
* Deprecated: 1.16: Use cogl_xlib_renderer_set_foreign_display()
|
|
* instead
|
|
*/
|
|
void
|
|
cogl_xlib_set_display (Display *display)
|
|
COGL_DEPRECATED_IN_1_16_FOR (cogl_xlib_renderer_set_foreign_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
|
|
* Deprecated: 1.16: Use cogl_xlib_renderer_handle_event() instead
|
|
*/
|
|
CoglFilterReturn
|
|
cogl_xlib_handle_event (XEvent *xevent)
|
|
COGL_DEPRECATED_IN_1_16_FOR (cogl_xlib_renderer_handle_event);
|
|
|
|
COGL_END_DECLS
|
|
|
|
#undef __COGL_XLIB_H_INSIDE__
|
|
|
|
#endif /* __COGL_XLIB_H__ */
|