a0441778ad
Since the Cogl 1.18 branch is actively maintained in parallel with the
master branch; this is a counter part to commit 1b83ef938fc16b which
re-licensed the master branch to use the MIT license.
This re-licensing is a follow up to the proposal that was sent to the
Cogl mailing list:
http://lists.freedesktop.org/archives/cogl/2013-December/001465.html
Note: there was a copyright assignment policy in place for Clutter (and
therefore Cogl which was part of Clutter at the time) until the 11th of
June 2010 and so we only checked the details after that point (commit
0bbf50f905)
For each file, authors were identified via this Git command:
$ git blame -p -C -C -C20 -M -M10 0bbf50f905..HEAD
We received blanket approvals for re-licensing all Red Hat and Collabora
contributions which reduced how many people needed to be contacted
individually:
- http://lists.freedesktop.org/archives/cogl/2013-December/001470.html
- http://lists.freedesktop.org/archives/cogl/2014-January/001536.html
Individual approval requests were sent to all the other identified authors
who all confirmed the re-license on the Cogl mailinglist:
http://lists.freedesktop.org/archives/cogl/2014-January
As well as updating the copyright header in all sources files, the
COPYING file has been updated to reflect the license change and also
document the other licenses used in Cogl such as the SGI Free Software
License B, version 2.0 and the 3-clause BSD license.
This patch was not simply cherry-picked from master; but the same
methodology was used to check the source files.
102 lines
3.3 KiB
C
102 lines
3.3 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* A Low Level GPU Graphics and Utilities API
|
|
*
|
|
* Copyright (C) 2011 Intel Corporation.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use, copy,
|
|
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
* of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifndef __COGL_RENDERER_XLIB_PRIVATE_H
|
|
#define __COGL_RENDERER_XLIB_PRIVATE_H
|
|
|
|
#include "cogl-object-private.h"
|
|
#include "cogl-xlib-private.h"
|
|
#include "cogl-x11-renderer-private.h"
|
|
#include "cogl-context.h"
|
|
#include "cogl-output.h"
|
|
|
|
typedef struct _CoglXlibRenderer
|
|
{
|
|
CoglX11Renderer _parent;
|
|
|
|
Display *xdpy;
|
|
|
|
/* Current top of the XError trap state stack. The actual memory for
|
|
these is expected to be allocated on the stack by the caller */
|
|
CoglXlibTrapState *trap_state;
|
|
|
|
unsigned long outputs_update_serial;
|
|
} CoglXlibRenderer;
|
|
|
|
CoglBool
|
|
_cogl_xlib_renderer_connect (CoglRenderer *renderer, CoglError **error);
|
|
|
|
void
|
|
_cogl_xlib_renderer_disconnect (CoglRenderer *renderer);
|
|
|
|
/*
|
|
* cogl_xlib_renderer_trap_errors:
|
|
* @state: A temporary place to store data for the trap.
|
|
*
|
|
* Traps every X error until _cogl_xlib_renderer_untrap_errors()
|
|
* called. You should allocate an uninitialised CoglXlibTrapState
|
|
* struct on the stack to pass to this function. The same pointer
|
|
* should later be passed to _cogl_xlib_renderer_untrap_errors().
|
|
*
|
|
* Calls to _cogl_xlib_renderer_trap_errors() can be nested as long as
|
|
* _cogl_xlib_renderer_untrap_errors() is called with the
|
|
* corresponding state pointers in reverse order.
|
|
*/
|
|
void
|
|
_cogl_xlib_renderer_trap_errors (CoglRenderer *renderer,
|
|
CoglXlibTrapState *state);
|
|
|
|
/*
|
|
* cogl_xlib_renderer_untrap_errors:
|
|
* @state: The state that was passed to _cogl_xlib_renderer_trap_errors().
|
|
*
|
|
* Removes the X error trap and returns the current status.
|
|
*
|
|
* Return value: the trapped error code, or 0 for success
|
|
*/
|
|
int
|
|
_cogl_xlib_renderer_untrap_errors (CoglRenderer *renderer,
|
|
CoglXlibTrapState *state);
|
|
|
|
CoglXlibRenderer *
|
|
_cogl_xlib_renderer_get_data (CoglRenderer *renderer);
|
|
|
|
int64_t
|
|
_cogl_xlib_renderer_get_dispatch_timeout (CoglRenderer *renderer);
|
|
|
|
CoglOutput *
|
|
_cogl_xlib_renderer_output_for_rectangle (CoglRenderer *renderer,
|
|
int x,
|
|
int y,
|
|
int width,
|
|
int height);
|
|
|
|
#endif /* __COGL_RENDERER_XLIB_PRIVATE_H */
|