DirectFB: headers diff between 1.7.4 and 1.7.5 versions

	Types++.h	Types++.h

	skipping to change at line 38	skipping to change at line 38
	Boston, MA 02111-1307, USA.	Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __DIRECT__TYPESPP_H__	#ifndef __DIRECT__TYPESPP_H__
	#define __DIRECT__TYPESPP_H__	#define __DIRECT__TYPESPP_H__

	extern "C" {	extern "C" {
	#include <direct/types.h>	#include <direct/types.h>
	}	}


		#include <map>

	namespace Direct {	namespace Direct {
	// NOTE: if build fails here we most likely have the above error due t o nested extern "C"	// NOTE: if build fails here we most likely have the above error due t o nested extern "C"
	template <typename _Item> class List;	template <typename _Item> class List;
	template <typename _Item> class ListLocked;	template <typename _Item> class ListLocked;
	template <typename _Item> class ListSimple;	template <typename _Item> class ListSimple;

	template <typename _CharT> class StringBase;	template <typename _CharT> class StringBase;
	template <typename _CharT> class StringsBase;	template <typename _CharT> class StringsBase;

	typedef StringBase<char> String;	typedef StringBase<char> String;

End of changes. 1 change blocks.
	0 lines changed or deleted	2 lines changed or added

	build.h	build.h
	/*	/*

	(c) Copyright 2001-2011 The world wide DirectFB Open Source Community (	(c) Copyright 2000-2002 convergence integrated media GmbH.
	directfb.org)	(c) Copyright 2002-2004 convergence GmbH.
	(c) Copyright 2000-2004 Convergence (integrated media) GmbH

	All rights reserved.	All rights reserved.

	Written by Denis Oliver Kropp <dok@directfb.org>,	Written by Denis Oliver Kropp <dok@directfb.org>,
	Andreas Hundt <andi@fischlustig.de>,	Andreas Hundt <andi@fischlustig.de>,

	Sven Neumann <neo@directfb.org>,	Sven Neumann <neo@directfb.org> and
	Ville SyrjÃ¤lÃ¤ <syrjala@sci.fi> and	Ville Syrjälä <syrjala@sci.fi>.
	Claudio Ciccani <klan@users.sf.net>.

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Lesser General Public	modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either	License as published by the Free Software Foundation; either
	version 2 of the License, or (at your option) any later version.	version 2 of the License, or (at your option) any later version.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Lesser General Public License for more details.	Lesser General Public License for more details.

	You should have received a copy of the GNU Lesser General Public	You should have received a copy of the GNU Lesser General Public
	License along with this library; if not, write to the	License along with this library; if not, write to the
	Free Software Foundation, Inc., 59 Temple Place - Suite 330,	Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	Boston, MA 02111-1307, USA.	Boston, MA 02111-1307, USA.
	*/	*/


	#ifndef __DIRECT__BUILD_H__	#ifndef __FUSION__BUILD_H__
	#define __DIRECT__BUILD_H__	#define __FUSION__BUILD_H__


	#define DIRECT_OS_LINUX_GNU_LIBC (0)	#define FUSION_BUILD_MULTI (0)
	#define DIRECT_OS_LINUX_KERNEL (1)	#define FUSION_BUILD_KERNEL (1)
	#define DIRECT_OS_PSP (2)	#define FUSION_MESSAGE_SIZE (16384)
	#define DIRECT_OS_WIN32 (3)
	#define DIRECT_OS_FAMOS (4)

	#define DIRECT_BUILD_DEBUG (0)
	#define DIRECT_BUILD_DEBUGS (1)
	#define DIRECT_BUILD_TRACE (0)
	#define DIRECT_BUILD_TEXT (1)
	#define DIRECT_BUILD_GETTID (1)
	#define DIRECT_BUILD_NETWORK (1)
	#define DIRECT_BUILD_STDBOOL (1)
	#define DIRECT_BUILD_DYNLOAD (1)
	#define DIRECT_BUILD_MULTICORE (1)
	#define DIRECT_BUILD_OSTYPE (DIRECT_OS_LINUX_GNU_LIBC)
	#define DIRECT_BUILD_GCC_ATOMICS (0)

	#if !DIRECT_BUILD_DEBUGS
	#if defined(DIRECT_ENABLE_DEBUG) \|\| defined(DIRECT_FORCE_DEBUG)
	#define DIRECT_MINI_DEBUG
	#endif
	#undef DIRECT_ENABLE_DEBUG
	#ifdef DIRECT_FORCE_DEBUG
	#warning DIRECT_FORCE_DEBUG used with 'pure release' library headers.
	#undef DIRECT_FORCE_DEBUG
	#endif
	#endif

	#endif	#endif

End of changes. 4 change blocks.
	36 lines changed or deleted	9 lines changed or added

	conf.h	conf.h

	skipping to change at line 31	skipping to change at line 31
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Lesser General Public License for more details.	Lesser General Public License for more details.

	You should have received a copy of the GNU Lesser General Public	You should have received a copy of the GNU Lesser General Public
	License along with this library; if not, write to the	License along with this library; if not, write to the
	Free Software Foundation, Inc., 59 Temple Place - Suite 330,	Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	Boston, MA 02111-1307, USA.	Boston, MA 02111-1307, USA.
	*/	*/


	#ifndef __FUSION__CONF_H__	#ifndef __DIRECT__CONF_H__
	#define __FUSION__CONF_H__	#define __DIRECT__CONF_H__


	#include <fusion/types.h>	#include <direct/log_domain.h>


	struct __Fusion_FusionConfig {	typedef enum {
	char tmpfs; / location of shm file */	DCFL_NONE, /* None is fatal. */
		DCFL_ASSERT, /* ASSERT is fatal. */
		DCFL_ASSUME /* ASSERT and ASSUME are fatal. */
		} DirectConfigFatalLevel;


	bool debugshm;	typedef enum {
	bool madv_remove;	DCTS_OTHER,
	bool madv_remove_force;	DCTS_FIFO,
	bool force_slave;	DCTS_RR
		} DirectConfigThreadScheduler;


	gid_t shmfile_gid; /* group that owns shm file */	typedef enum {
		DMT_NONE = 0x00000000, /* No message type. */


	bool secure_fusion;	DMT_BANNER = 0x00000001, /* Startup banner. */
		DMT_INFO = 0x00000002, /* Info messages. */
		DMT_WARNING = 0x00000004, /* Warnings. */
		DMT_ERROR = 0x00000008, /* Error messages: regular, with DFBR
		esult, bugs,
		system call errors, dlopen errors
		*/
		DMT_UNIMPLEMENTED = 0x00000010, /* Messages notifying unimplemented f
		unctionality. */
		DMT_ONCE = 0x00000020, /* One-shot messages .*/
		DMT_UNTESTED = 0x00000040, /* Messages notifying unimplemented f
		unctionality. */
		DMT_BUG = 0x00000080, /* A bug occurred. */


	bool defer_destructors;	DMT_ALL = 0x000000FF /* All types. */
		} DirectMessageType;


	int trace_ref;	struct __D_DirectConfig {
		DirectMessageType quiet;


	bool fork_handler;	DirectLogLevel log_level;
		bool log_all;
		bool log_none;


	unsigned int call_bin_max_num;	bool trace;
	unsigned int call_bin_max_data;
	pid_t skirmish_warn_on_thread;	char memcpy; / Don't probe for me
		mcpy routines to save a lot of
		startup time. Use
		this one instead if it's set. */

		char *disable_module; / Never load these m
		odules. */
		char module_dir; / module dir overrid
		e */

		bool sighandler;
		sigset_t dont_catch; /* don't catch these
		signals */

		DirectLog *log;

		DirectConfigFatalLevel fatal;

		// @deprecated / FIXME: maybe adapt?
		bool debug;

		bool debugmem;

		bool thread_block_signals;

		bool fatal_break; /* Should D_BREAK()
		cause a trap? */

		int thread_priority;
		DirectConfigThreadScheduler thread_scheduler;
		int thread_stack_size;
		int thread_priority_scale;

		char **default_interface_implementation_types;
		char **default_interface_implementation_names;

		unsigned int perf_dump_interval;
		int log_delay_rand_loops;
		int log_delay_rand_us;
		int log_delay_min_loops;
		int log_delay_min_us;

		DirectMessageType fatal_messages;

		bool nm_for_trace;

		int delay_trap_ms;

		bool sighandler_thread;
	};	};


	extern FusionConfig FUSION_API *fusion_config;	extern DirectConfig DIRECT_API *direct_config;

		extern const char DIRECT_API *direct_config_usage;

		DirectResult DIRECT_API direct_config_set( const char *name, const
		char *value );

		/* Retrieve all values set on option 'name'. */
		/* Pass an array of char* pointers and number of pointers in 'num'. */
		/* The actual returned number of values gets returned in 'ret_num' */
		/* The returned option/values respect directfbrc, cmdline options and DFBAR
		GS envvar. */
		/* The returned pointers are not extra allocated so do not free them! */
		DirectResult DIRECT_API direct_config_get( const char name, char
		values, const int values_len, int ret_num );


	extern const char FUSION_API *fusion_config_usage;	/* Return the integer value for the last occurrance of the passed option's
		setting. */
		/* Note that 0 is also retuned in case the passed option was not found ot s
		et. */
		long long DIRECT_API direct_config_get_int_value( const char *na
		me );


	DirectResult FUSION_API fusion_config_set( const char *name, const	long long DIRECT_API direct_config_get_int_value_with_default( c
	char *value );	onst char *name,
		l
		ong long def );


	void __Fusion_conf_init( void );	void __D_conf_init( void );
	void __Fusion_conf_deinit( void );	void __D_conf_deinit( void );

	#endif	#endif

End of changes. 14 change blocks.
	23 lines changed or deleted	113 lines changed or added

	directfb++.h	directfb++.h

	skipping to change at line 34	skipping to change at line 34

	You should have received a copy of the GNU Lesser General Public	You should have received a copy of the GNU Lesser General Public
	License along with this library; if not, write to the	License along with this library; if not, write to the
	Free Software Foundation, Inc., 59 Temple Place - Suite 330,	Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	Boston, MA 02111-1307, USA.	Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef DIRECTFBPP_H	#ifndef DIRECTFBPP_H
	#define DIRECTFBPP_H	#define DIRECTFBPP_H


	#ifdef __DIRECTFB_H__	#include <direct/Types++.h>
	#error Please include 'directfb++.h' before 'directfb.h'.
	#endif

	#define DFBPoint DFBPoint_C	#define DFBPoint DFBPoint_C
	#define DFBDimension DFBDimension_C	#define DFBDimension DFBDimension_C
	#define DFBRectangle DFBRectangle_C	#define DFBRectangle DFBRectangle_C
	#define DFBRegion DFBRegion_C	#define DFBRegion DFBRegion_C

		#define DFBUpdates DFBUpdates_C

	#include <directfb.h>	#include <directfb.h>
	#include <directfb_util.h>	#include <directfb_util.h>

	extern "C" {	extern "C" {
	#include <directfb_keynames.h>	#include <directfb_keynames.h>
	#include <directfb_strings.h>	#include <directfb_strings.h>
	}	}

	#undef DFBPoint	#undef DFBPoint
	#undef DFBDimension	#undef DFBDimension
	#undef DFBRectangle	#undef DFBRectangle
	#undef DFBRegion	#undef DFBRegion

		#undef DFBUpdates

	class DFBPoint : public DFBPoint_C {	class DFBPoint : public DFBPoint_C {
	public:	public:
	DFBPoint() {	DFBPoint() {
	x = 0;	x = 0;
	y = 0;	y = 0;
	}	}

	DFBPoint( const int &_x, const int &_y ) {	DFBPoint( const int &_x, const int &_y ) {
	x = _x;	x = _x;

	skipping to change at line 137	skipping to change at line 137

	DFBDimension( const DFBRegion_C &region ) {	DFBDimension( const DFBRegion_C &region ) {
	w = region.x2 - region.x1 + 1;	w = region.x2 - region.x1 + 1;
	h = region.y2 - region.y1 + 1;	h = region.y2 - region.y1 + 1;
	}	}

	bool operator== ( const DFBDimension &ref ) const {	bool operator== ( const DFBDimension &ref ) const {
	return ref.w == w && ref.h == h;	return ref.w == w && ref.h == h;
	}	}


		bool operator!= ( const DFBDimension &ref ) const {
		return ref.w != w \|\| ref.h != h;
		}

	bool contains( const DFBRegion_C &region ) const {	bool contains( const DFBRegion_C &region ) const {
	if (region.x1 < 0 \|\| region.y1 < 0)	if (region.x1 < 0 \|\| region.y1 < 0)
	return false;	return false;

	if (region.x2 >= w \|\| region.y2 >= h)	if (region.x2 >= w \|\| region.y2 >= h)
	return false;	return false;

	return true;	return true;
	}	}
	};	};

	skipping to change at line 259	skipping to change at line 263
	y2 = dimension.h - 1;	y2 = dimension.h - 1;
	}	}

	DFBRegion( const DFBPoint_C &point, const DFBDimension_C &dimension ) {	DFBRegion( const DFBPoint_C &point, const DFBDimension_C &dimension ) {
	x1 = point.x;	x1 = point.x;
	y1 = point.y;	y1 = point.y;
	x2 = x1 + dimension.w - 1;	x2 = x1 + dimension.w - 1;
	y2 = y1 + dimension.h - 1;	y2 = y1 + dimension.h - 1;
	}	}


		int width() const {
		return x2 - x1 + 1;
		}

		int height() const {
		return y2 - y1 + 1;
		}

		void translate( int x, int y ) {
		x1 += x;
		y1 += y;
		x2 += x;
		y2 += y;
		}

	bool operator== ( const DFBRegion &ref ) const {	bool operator== ( const DFBRegion &ref ) const {
	return ref.x1 == x1 && ref.y1 == y1 && ref.x2 == x2 && ref.y2 == y2;	return ref.x1 == x1 && ref.y1 == y1 && ref.x2 == x2 && ref.y2 == y2;
	}	}

	DFBRegion& operator-= ( const DFBPoint &sub ) {	DFBRegion& operator-= ( const DFBPoint &sub ) {
	x1 -= sub.x;	x1 -= sub.x;
	y1 -= sub.y;	y1 -= sub.y;
	x2 -= sub.x;	x2 -= sub.x;
	y2 -= sub.y;	y2 -= sub.y;

	return *this;	return *this;
	}	}

	DFBRegion operator- ( const DFBPoint &sub ) const {	DFBRegion operator- ( const DFBPoint &sub ) const {
	return DFBRegion( x1 - sub.x, y1 - sub.y, x2 - sub.x, y2 - sub.y );	return DFBRegion( x1 - sub.x, y1 - sub.y, x2 - sub.x, y2 - sub.y );
	}	}

	DFBRegion& operator\|= ( const DFBRegion &r ) {	DFBRegion& operator\|= ( const DFBRegion &r ) {

		unionWith( r );

		return *this;
		}

		void unionWith( const DFBRegion &r ) {
	if (r.x1 < x1)	if (r.x1 < x1)
	x1 = r.x1;	x1 = r.x1;

	if (r.y1 < y1)	if (r.y1 < y1)
	y1 = r.y1;	y1 = r.y1;

	if (r.x2 > x2)	if (r.x2 > x2)
	x2 = r.x2;	x2 = r.x2;

	if (r.y2 > y2)	if (r.y2 > y2)
	y2 = r.y2;	y2 = r.y2;

		}

		DFBRegion& operator&= ( const DFBRegion &r ) {
		clipBy( r );

	return *this;	return *this;
	}	}


	void unionWith ( const DFBRegion &r ) {	void clipBy( const DFBRegion &r ) {
	if (r.x1 < x1)	if (r.x1 > x1)
	x1 = r.x1;	x1 = r.x1;


	if (r.y1 < y1)	if (r.y1 > y1)
	y1 = r.y1;	y1 = r.y1;


	if (r.x2 > x2)	if (r.x2 < x2)
	x2 = r.x2;	x2 = r.x2;


	if (r.y2 > y2)	if (r.y2 < y2)
	y2 = r.y2;	y2 = r.y2;
	}	}
	};	};


		class DFBUpdates : public DFBUpdates_C {
		private:
		// int max_regions;
		// DFBRegion *regions;

		public:
		DFBUpdates( int max_regions = 8 )
		// :
		// max_regions( max_regions )
		{
		regions = new DFBRegion[max_regions];

		if (regions)
		dfb_updates_init( this, regions, max_regions );
		else
		D_OOM();
		}

		~DFBUpdates()
		{
		if (regions) {
		dfb_updates_deinit( this );

		delete regions;
		}
		}

		void Reset()
		{
		D_ASSERT( regions != NULL );

		dfb_updates_reset( this );
		}

		DFBUpdates& operator\|= ( const DFBRegion &r )
		{
		D_ASSERT( regions != NULL );

		dfb_updates_add( this, &r );

		return *this;
		}
		};

	#define DFB_ADD_SURFACE_DESC(d,f) (d) = static_cast<DFBSurfaceDescription Flags> ((d) \| (f))	#define DFB_ADD_SURFACE_DESC(d,f) (d) = static_cast<DFBSurfaceDescription Flags> ((d) \| (f))
	#define DFB_ADD_SURFACE_CAPS(c,f) (c) = static_cast<DFBSurfaceCapabilitie s> ((c) \| (f))	#define DFB_ADD_SURFACE_CAPS(c,f) (c) = static_cast<DFBSurfaceCapabilitie s> ((c) \| (f))
	#define DFB_ADD_DRAWING_FLAG(d,f) (d) = static_cast<DFBSurfaceDrawingFlag s> ((d) \| (f))	#define DFB_ADD_DRAWING_FLAG(d,f) (d) = static_cast<DFBSurfaceDrawingFlag s> ((d) \| (f))
	#define DFB_ADD_BLITTING_FLAG(b,f) (b) = static_cast<DFBSurfaceBlittingFla gs> ((b) \| (f))	#define DFB_ADD_BLITTING_FLAG(b,f) (b) = static_cast<DFBSurfaceBlittingFla gs> ((b) \| (f))

	#endif	#endif

End of changes. 12 change blocks.
	8 lines changed or deleted	81 lines changed or added

	directfb.h	directfb.h

	skipping to change at line 31	skipping to change at line 31
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Lesser General Public License for more details.	Lesser General Public License for more details.

	You should have received a copy of the GNU Lesser General Public	You should have received a copy of the GNU Lesser General Public
	License along with this library; if not, write to the	License along with this library; if not, write to the
	Free Software Foundation, Inc., 59 Temple Place - Suite 330,	Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	Boston, MA 02111-1307, USA.	Boston, MA 02111-1307, USA.
	*/	*/


		#ifdef __cplusplus
		#include <directfb++.h>
		#endif

	#ifndef __DIRECTFB_H__	#ifndef __DIRECTFB_H__
	#define __DIRECTFB_H__	#define __DIRECTFB_H__

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C"	extern "C"
	{	{
	#endif	#endif

	#include <dfb_types.h>	#include <dfb_types.h>


	skipping to change at line 1348	skipping to change at line 1352
	((fmt) == DSPF_AiRGB) \|\| \	((fmt) == DSPF_AiRGB) \|\| \
	((fmt) == DSPF_ARGB2554) \|\| \	((fmt) == DSPF_ARGB2554) \|\| \
	((fmt) == DSPF_ARGB4444) \|\| \	((fmt) == DSPF_ARGB4444) \|\| \
	((fmt) == DSPF_RGBA4444) \|\| \	((fmt) == DSPF_RGBA4444) \|\| \
	((fmt) == DSPF_ARGB1666) \|\| \	((fmt) == DSPF_ARGB1666) \|\| \
	((fmt) == DSPF_ARGB6666) \|\| \	((fmt) == DSPF_ARGB6666) \|\| \
	((fmt) == DSPF_RGB18) \|\| \	((fmt) == DSPF_RGB18) \|\| \
	((fmt) == DSPF_RGB444) \|\| \	((fmt) == DSPF_RGB444) \|\| \
	((fmt) == DSPF_RGB555) \|\| \	((fmt) == DSPF_RGB555) \|\| \
	((fmt) == DSPF_BGR555) \|\| \	((fmt) == DSPF_BGR555) \|\| \

		((fmt) == DSPF_ARGB8565) \|\| \
		((fmt) == DSPF_ABGR) \|\| \
	((fmt) == DSPF_RGBAF88871))	((fmt) == DSPF_RGBAF88871))

	#define DFB_COLOR_IS_YUV(fmt) \	#define DFB_COLOR_IS_YUV(fmt) \
	(((fmt) == DSPF_YUY2) \|\| \	(((fmt) == DSPF_YUY2) \|\| \
	((fmt) == DSPF_UYVY) \|\| \	((fmt) == DSPF_UYVY) \|\| \
	((fmt) == DSPF_I420) \|\| \	((fmt) == DSPF_I420) \|\| \
	((fmt) == DSPF_YV12) \|\| \	((fmt) == DSPF_YV12) \|\| \
	((fmt) == DSPF_NV12) \|\| \	((fmt) == DSPF_NV12) \|\| \
	((fmt) == DSPF_NV16) \|\| \	((fmt) == DSPF_NV16) \|\| \
	((fmt) == DSPF_NV21) \|\| \	((fmt) == DSPF_NV21) \|\| \

	skipping to change at line 3403	skipping to change at line 3409
	/*	/*
	* Retrieve an interface to an existing window.	* Retrieve an interface to an existing window.
	*	*
	* The window is identified by its surface' resource id.	* The window is identified by its surface' resource id.
	*/	*/
	DFBResult (*GetWindowByResourceID) (	DFBResult (*GetWindowByResourceID) (
	IDirectFBDisplayLayer *thiz,	IDirectFBDisplayLayer *thiz,
	unsigned long resource_id,	unsigned long resource_id,
	IDirectFBWindow **ret_interface	IDirectFBWindow **ret_interface
	);	);


		/ Surface /

		/*
		* Set the surface to be shown by the layer
		*
		* Only available in exclusive mode.
		*/
		DFBResult (*SetSurface) (
		IDirectFBDisplayLayer *thiz,
		IDirectFBSurface *surface
		);
	)	)

	/*	/*
	* Flipping flags controlling the behaviour of IDirectFBSurface::Flip().	* Flipping flags controlling the behaviour of IDirectFBSurface::Flip().
	*/	*/
	typedef enum {	typedef enum {
	DSFLIP_NONE = 0x00000000, /* None of these. */	DSFLIP_NONE = 0x00000000, /* None of these. */

	DSFLIP_WAIT = 0x00000001, /* Flip() returns upon vertical syn c. Flipping is still done	DSFLIP_WAIT = 0x00000001, /* Flip() returns upon vertical syn c. Flipping is still done
	immediately unless DSFLIP_ONSYNC is specified, too. */	immediately unless DSFLIP_ONSYNC is specified, too. */

End of changes. 3 change blocks.
	0 lines changed or deleted	18 lines changed or added

	directfb_strings.h	directfb_strings.h

	skipping to change at line 309	skipping to change at line 309
	{ DWCAPS_INPUTONLY, "INPUTONLY" }, \	{ DWCAPS_INPUTONLY, "INPUTONLY" }, \
	{ DWCAPS_NODECORATION, "NODECORATION" }, \	{ DWCAPS_NODECORATION, "NODECORATION" }, \
	{ DWCAPS_SUBWINDOW, "SUBWINDOW" }, \	{ DWCAPS_SUBWINDOW, "SUBWINDOW" }, \
	{ DWCAPS_COLOR, "COLOR" }, \	{ DWCAPS_COLOR, "COLOR" }, \
	{ DWCAPS_NOFOCUS, "NOFOCUS" }, \	{ DWCAPS_NOFOCUS, "NOFOCUS" }, \
	{ DWCAPS_LR_MONO, "LR_MONO" }, \	{ DWCAPS_LR_MONO, "LR_MONO" }, \
	{ DWCAPS_STEREO, "STEREO" }, \	{ DWCAPS_STEREO, "STEREO" }, \
	{ DWCAPS_NONE, "NONE" } \	{ DWCAPS_NONE, "NONE" } \
	};	};


		struct DFBDisplayLayerOptionsName {
		DFBDisplayLayerOptions option;
		const char *name;
		};

		#define DirectFBDisplayLayerOptionsNames(Identifier) struct DFBDisplayLayer
		OptionsName Identifier[] = { \
		{ DLOP_ALPHACHANNEL, "ALPHACHANNEL" }, \
		{ DLOP_FLICKER_FILTERING, "FLICKER_FILTERING" }, \
		{ DLOP_DEINTERLACING, "DEINTERLACING" }, \
		{ DLOP_SRC_COLORKEY, "SRC_COLORKEY" }, \
		{ DLOP_DST_COLORKEY, "DST_COLORKEY" }, \
		{ DLOP_OPACITY, "OPACITY" }, \
		{ DLOP_FIELD_PARITY, "FIELD_PARITY" }, \
		{ DLOP_LR_MONO, "LR_MONO" }, \
		{ DLOP_STEREO, "STEREO" }, \
		{ DLOP_STEREO, "STEREO" }, \
		{ DLOP_NONE, "NONE" } \
		};

	struct DFBWindowOptionsName {	struct DFBWindowOptionsName {
	DFBWindowOptions option;	DFBWindowOptions option;
	const char *name;	const char *name;
	};	};

	#define DirectFBWindowOptionsNames(Identifier) struct DFBWindowOptionsName Identifier[] = { \	#define DirectFBWindowOptionsNames(Identifier) struct DFBWindowOptionsName Identifier[] = { \
	{ DWOP_COLORKEYING, "COLORKEYING" }, \	{ DWOP_COLORKEYING, "COLORKEYING" }, \
	{ DWOP_ALPHACHANNEL, "ALPHACHANNEL" }, \	{ DWOP_ALPHACHANNEL, "ALPHACHANNEL" }, \
	{ DWOP_OPAQUE_REGION, "OPAQUE_REGION" }, \	{ DWOP_OPAQUE_REGION, "OPAQUE_REGION" }, \
	{ DWOP_SHAPED, "SHAPED" }, \	{ DWOP_SHAPED, "SHAPED" }, \

End of changes. 1 change blocks.
	0 lines changed or deleted	20 lines changed or added

	directfb_util.h	directfb_util.h

	skipping to change at line 31	skipping to change at line 31
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Lesser General Public License for more details.	Lesser General Public License for more details.

	You should have received a copy of the GNU Lesser General Public	You should have received a copy of the GNU Lesser General Public
	License along with this library; if not, write to the	License along with this library; if not, write to the
	Free Software Foundation, Inc., 59 Temple Place - Suite 330,	Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	Boston, MA 02111-1307, USA.	Boston, MA 02111-1307, USA.
	*/	*/


		#ifdef __cplusplus
		#include <directfb++.h>
		#endif

	#ifndef __DIRECTFB_UTIL_H__	#ifndef __DIRECTFB_UTIL_H__
	#define __DIRECTFB_UTIL_H__	#define __DIRECTFB_UTIL_H__

	#include <stdlib.h>	#include <stdlib.h>
	#include <errno.h>	#include <errno.h>

	#include <directfb.h>	#include <directfb.h>

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C"	extern "C"

	skipping to change at line 1452	skipping to change at line 1456
	} DFBUpdates;	} DFBUpdates;

	#define DFB_UPDATES_ASSERT(updates) \	#define DFB_UPDATES_ASSERT(updates) \
	do { \	do { \
	D_MAGIC_ASSERT( updates, DFBUpdates ); \	D_MAGIC_ASSERT( updates, DFBUpdates ); \
	D_ASSERT( (updates)->regions != NULL ); \	D_ASSERT( (updates)->regions != NULL ); \
	D_ASSERT( (updates)->max_regions > 0 ); \	D_ASSERT( (updates)->max_regions > 0 ); \
	D_ASSERT( (updates)->num_regions <= (updates)->max_regions ); \	D_ASSERT( (updates)->num_regions <= (updates)->max_regions ); \
	} while (0)	} while (0)


		#define DFB_UPDATES_DEBUG_AT(d,updates)
		\
		do {
		\
		D_DEBUG_AT( d, " =--[ " #updates " has %d regions ]\n", (updates)
		->num_regions ); \
		DFB_REGIONS_DEBUG_AT( d, (updates)->regions, (unsigned) ((updates
		)->num_regions) ); \
		} while (0)

	void DIRECTFB_API dfb_updates_init( DFBUpdates *updates,	void DIRECTFB_API dfb_updates_init( DFBUpdates *updates,
	DFBRegion *regions,	DFBRegion *regions,
	int max_regions );	int max_regions );

	void DIRECTFB_API dfb_updates_add ( DFBUpdates *updates,	void DIRECTFB_API dfb_updates_add ( DFBUpdates *updates,
	const DFBRegion *region );	const DFBRegion *region );

	void DIRECTFB_API dfb_updates_stat( DFBUpdates *updates,	void DIRECTFB_API dfb_updates_stat( DFBUpdates *updates,
	int *ret_total,	int *ret_total,
	int *ret_bounding );	int *ret_bounding );

End of changes. 2 change blocks.
	0 lines changed or deleted	14 lines changed or added

	directfb_version.h	directfb_version.h

	skipping to change at line 34	skipping to change at line 34
	License along with this library; if not, write to the	License along with this library; if not, write to the
	Free Software Foundation, Inc., 59 Temple Place - Suite 330,	Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	Boston, MA 02111-1307, USA.	Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __DIRECTFB_VERSION_H__	#ifndef __DIRECTFB_VERSION_H__
	#define __DIRECTFB_VERSION_H__	#define __DIRECTFB_VERSION_H__

	#define DIRECTFB_MAJOR_VERSION (1)	#define DIRECTFB_MAJOR_VERSION (1)
	#define DIRECTFB_MINOR_VERSION (7)	#define DIRECTFB_MINOR_VERSION (7)

	#define DIRECTFB_MICRO_VERSION (4)	#define DIRECTFB_MICRO_VERSION (5)
	#define DIRECTFB_BINARY_AGE (0)	#define DIRECTFB_BINARY_AGE (0)
	#define DIRECTFB_INTERFACE_AGE (0)	#define DIRECTFB_INTERFACE_AGE (0)

	#endif /* __DIRECTFB_VERSION_H__ */	#endif /* __DIRECTFB_VERSION_H__ */

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	idirectfbdisplaylayer.h	idirectfbdisplaylayer.h

	skipping to change at line 119	skipping to change at line 119
	int y);	int y);
	void PPDFB_API SetCursorAcceleration (int numerator,	void PPDFB_API SetCursorAcceleration (int numerator,
	int denominator,	int denominator,
	int threshold);	int threshold);
	void PPDFB_API SetCursorShape (IDirectFBSurfa ce *shape,	void PPDFB_API SetCursorShape (IDirectFBSurfa ce *shape,
	int hot_x,	int hot_x,
	int hot_y);	int hot_y);
	void PPDFB_API SetCursorOpacity (u8 opacity);	void PPDFB_API SetCursorOpacity (u8 opacity);

	void PPDFB_API SwitchContext (DFBBoolean exclusive);	void PPDFB_API SwitchContext (DFBBoolean exclusive);

		void PPDFB_API SetSurface (IDirectFBSurfa ce *surface);

	inline IDirectFBDisplayLayer PPDFB_API & operator = (const IDirectFBDi splayLayer& other){	inline IDirectFBDisplayLayer PPDFB_API & operator = (const IDirectFBDi splayLayer& other){
	return IPPAny<IDirectFBDisplayLayer, IDirectFBDisplayLayer_C>::op erator =(other);	return IPPAny<IDirectFBDisplayLayer, IDirectFBDisplayLayer_C>::op erator =(other);
	}	}
	inline IDirectFBDisplayLayer PPDFB_API & operator = (IDirectFBDisplayL ayer_C* other){	inline IDirectFBDisplayLayer PPDFB_API & operator = (IDirectFBDisplayL ayer_C* other){
	return IPPAny<IDirectFBDisplayLayer, IDirectFBDisplayLayer_C>::op erator =(other);	return IPPAny<IDirectFBDisplayLayer, IDirectFBDisplayLayer_C>::op erator =(other);
	}	}
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	idirectfbeventbuffer.h	idirectfbeventbuffer.h

	skipping to change at line 44	skipping to change at line 44
	#ifndef DFBPP_H	#ifndef DFBPP_H
	#error Please include ++dfb.h only.	#error Please include ++dfb.h only.
	#endif	#endif

	class IDirectFBEventBuffer : public IPPAny<IDirectFBEventBuffer, IDirectFBE ventBuffer_C> {	class IDirectFBEventBuffer : public IPPAny<IDirectFBEventBuffer, IDirectFBE ventBuffer_C> {
	friend	friend
	class IDirectFB;	class IDirectFB;
	friend	friend
	class IDirectFBInputDevice;	class IDirectFBInputDevice;
	friend	friend

		class IDirectFBSurface;
		friend
	class IDirectFBWindow;	class IDirectFBWindow;

	public:	public:
	PPDFB_API IDirectFBEventBuffer(IDirectFBEventBuffer_C* myptr=NULL):IPP Any<IDirectFBEventBuffer, IDirectFBEventBuffer_C>(myptr){}	PPDFB_API IDirectFBEventBuffer(IDirectFBEventBuffer_C* myptr=NULL):IPP Any<IDirectFBEventBuffer, IDirectFBEventBuffer_C>(myptr){}

	void PPDFB_API Reset ();	void PPDFB_API Reset ();

	void PPDFB_API WaitForEvent ();	void PPDFB_API WaitForEvent ();
	bool PPDFB_API WaitForEventWithTimeout (unsigned int seconds,	bool PPDFB_API WaitForEventWithTimeout (unsigned int seconds,
	unsigned int milli_seconds);	unsigned int milli_seconds);

End of changes. 1 change blocks.
	0 lines changed or deleted	2 lines changed or added

	idirectfbsurface.h	idirectfbsurface.h

	skipping to change at line 212	skipping to change at line 212
	int num_indices);	int num_indices);

	void PPDFB_API Read (void *ptr,	void PPDFB_API Read (void *ptr,
	int pitch,	int pitch,
	const DFBRectang le *rect = NULL);	const DFBRectang le *rect = NULL);

	void PPDFB_API Write (const void *ptr,	void PPDFB_API Write (const void *ptr,
	int pitch,	int pitch,
	const DFBRectang le *rect = NULL);	const DFBRectang le *rect = NULL);


		void PPDFB_API SetRenderOptions (const DFBSurface
		RenderOptions &options);

		IDirectFBEventBuffer PPDFB_API CreateEventBuffer ();
		void PPDFB_API AttachEventBuffer (IDirectFBEventBu
		ffer *buffer);
		void PPDFB_API DetachEventBuffer (IDirectFBEventBu
		ffer *buffer);

		DFBDimension PPDFB_API GetSize ();

	inline IDirectFBSurface PPDFB_API & operator = (const IDirectFBSurface & other){	inline IDirectFBSurface PPDFB_API & operator = (const IDirectFBSurface & other){
	return IPPAny<IDirectFBSurface, IDirectFBSurface_C>::operator =(o ther);	return IPPAny<IDirectFBSurface, IDirectFBSurface_C>::operator =(o ther);
	}	}
	inline IDirectFBSurface PPDFB_API & operator = (IDirectFBSurface_C* ot her){	inline IDirectFBSurface PPDFB_API & operator = (IDirectFBSurface_C* ot her){
	return IPPAny<IDirectFBSurface, IDirectFBSurface_C>::operator =(o ther);	return IPPAny<IDirectFBSurface, IDirectFBSurface_C>::operator =(o ther);
	}	}
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	0 lines changed or deleted	11 lines changed or added

	idirectfbwindow.h	idirectfbwindow.h

	skipping to change at line 116	skipping to change at line 116
	int height);	int height);

	void PPDFB_API ResizeSurface (int width,	void PPDFB_API ResizeSurface (int width,
	int height);	int height);

	void PPDFB_API BeginUpdates (const DFBRegion *update = NULL);	void PPDFB_API BeginUpdates (const DFBRegion *update = NULL);

	void PPDFB_API SetDstGeometry (DFBWindowGeometry *geometry);	void PPDFB_API SetDstGeometry (DFBWindowGeometry *geometry);
	void PPDFB_API SetSrcGeometry (DFBWindowGeometry *geometry);	void PPDFB_API SetSrcGeometry (DFBWindowGeometry *geometry);


		void PPDFB_API SetApplicationID (unsigned long
		application_id);
		unsigned long PPDFB_API GetApplicationID ();

	inline IDirectFBWindow PPDFB_API & operator = (const IDirectFBWindow& other){	inline IDirectFBWindow PPDFB_API & operator = (const IDirectFBWindow& other){
	return IPPAny<IDirectFBWindow, IDirectFBWindow_C>::operator =(oth er);	return IPPAny<IDirectFBWindow, IDirectFBWindow_C>::operator =(oth er);
	}	}
	inline IDirectFBWindow PPDFB_API & operator = (IDirectFBWindow_C* othe r){	inline IDirectFBWindow PPDFB_API & operator = (IDirectFBWindow_C* othe r){
	return IPPAny<IDirectFBWindow, IDirectFBWindow_C>::operator =(oth er);	return IPPAny<IDirectFBWindow, IDirectFBWindow_C>::operator =(oth er);
	}	}
	};	};

	#endif	#endif

End of changes. 1 change blocks.
	0 lines changed or deleted	4 lines changed or added

	object.h	object.h

	skipping to change at line 51	skipping to change at line 51
	#include <direct/debug.h>	#include <direct/debug.h>

	typedef void (FusionObjectDestructor)( FusionObject object, bool zombie, void *ctx );	typedef void (FusionObjectDestructor)( FusionObject object, bool zombie, void *ctx );

	typedef const char * (FusionObjectDescribe)( FusionObject object, void *c tx );	typedef const char * (FusionObjectDescribe)( FusionObject object, void *c tx );

	typedef bool (FusionPropIterator)( char key, void value, void ctx);	typedef bool (FusionPropIterator)( char key, void value, void ctx);

	typedef u32 FusionObjectID;	typedef u32 FusionObjectID;


		#ifdef __cplusplus
		}

		#include <map>

		namespace Fusion {
		typedef std::map<FusionObjectID,FusionObject*> ObjectMap;
		}
		typedef Fusion::ObjectMap Fusion_ObjectMap;
		extern "C" {
		#else
		typedef void Fusion_ObjectMap;
		#endif

	typedef enum {	typedef enum {
	FOS_INIT,	FOS_INIT,
	FOS_ACTIVE,	FOS_ACTIVE,
	FOS_DEINIT	FOS_DEINIT
	} FusionObjectState;	} FusionObjectState;

	struct __Fusion_FusionObject {	struct __Fusion_FusionObject {
	DirectLink link;	DirectLink link;
	FusionObjectPool *pool;	FusionObjectPool *pool;


	skipping to change at line 124	skipping to change at line 138
	DirectResult FUSION_API fusion_object_pool_destroy ( FusionObjec tPool *pool,	DirectResult FUSION_API fusion_object_pool_destroy ( FusionObjec tPool *pool,
	FusionWorld *world );	FusionWorld *world );

	DirectResult FUSION_API fusion_object_pool_set_describe ( FusionObjec tPool *pool,	DirectResult FUSION_API fusion_object_pool_set_describe ( FusionObjec tPool *pool,
	FusionObjec tDescribe func );	FusionObjec tDescribe func );

	DirectResult FUSION_API fusion_object_pool_enum ( FusionObjec tPool *pool,	DirectResult FUSION_API fusion_object_pool_enum ( FusionObjec tPool *pool,
	FusionObjec tCallback callback,	FusionObjec tCallback callback,
	void *ctx );	void *ctx );


		DirectResult FUSION_API fusion_object_pool_size ( FusionObjec
		tPool *pool,
		size_t
		*ret_size );

	FusionObject FUSION_API fusion_object_create ( FusionObjec tPool pool,	FusionObject FUSION_API fusion_object_create ( FusionObjec tPool pool,
	const Fusio nWorld *world,	const Fusio nWorld *world,
	FusionID identity );	FusionID identity );

	/*	/*
	* Must unref object if function returns DR_OK.	* Must unref object if function returns DR_OK.
	* It may also return DR_DEAD with allocated object, but no refs (don't unr ef).	* It may also return DR_DEAD with allocated object, but no refs (don't unr ef).
	*/	*/
	DirectResult FUSION_API fusion_object_get ( FusionObjec tPool *pool,	DirectResult FUSION_API fusion_object_get ( FusionObjec tPool *pool,
	FusionObjec tID object_id,	FusionObjec tID object_id,

End of changes. 2 change blocks.
	0 lines changed or deleted	19 lines changed or added

	signals.h	signals.h

	skipping to change at line 59	skipping to change at line 59
	/*	/*
	* Modifies the current thread's signal mask to block everything.	* Modifies the current thread's signal mask to block everything.
	* Should be called by input threads once to avoid killing themselves	* Should be called by input threads once to avoid killing themselves
	* in the signal handler by deinitializing all input drivers.	* in the signal handler by deinitializing all input drivers.
	*/	*/
	void DIRECT_API direct_signals_block_all( void );	void DIRECT_API direct_signals_block_all( void );

	/*	/*
	* Signal number to use when registering a handler for any interrupt.	* Signal number to use when registering a handler for any interrupt.
	*/	*/

	#define DIRECT_SIGNAL_ANY -1	#define DIRECT_SIGNAL_ANY -1

		#define DIRECT_SIGNAL_DUMP_STACK -2

	DirectResult DIRECT_API direct_signal_handler_add ( int num,	DirectResult DIRECT_API direct_signal_handler_add ( int num,
	DirectSignalHandlerFu nc func,	DirectSignalHandlerFu nc func,
	void *ctx,	void *ctx,
	DirectSignalHandler **ret_handler );	DirectSignalHandler **ret_handler );

	DirectResult DIRECT_API direct_signal_handler_remove( DirectSignalHandler *handler );	DirectResult DIRECT_API direct_signal_handler_remove( DirectSignalHandler *handler );

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/