CoreDFB_CallMode.h   CoreDFB_CallMode.h 
skipping to change at line 45 skipping to change at line 45
COREDFB_CALL_DENY, COREDFB_CALL_DENY,
COREDFB_CALL_DIRECT, COREDFB_CALL_DIRECT,
COREDFB_CALL_INDIRECT COREDFB_CALL_INDIRECT
} CoreDFBCallMode; } CoreDFBCallMode;
static __inline__ CoreDFBCallMode static __inline__ CoreDFBCallMode
CoreDFB_CallMode( CoreDFB *core ) CoreDFB_CallMode( CoreDFB *core )
{ {
#if FUSION_BUILD_MULTI #if FUSION_BUILD_MULTI
if (dfb_config->call_nodirect) { if (dfb_config->call_nodirect) {
if (dfb_core_is_master( core ) && fusion_dispatcher_tid( core->wo if (dfb_core_is_master( core )) {
rld ) == direct_thread_get_tid( direct_thread_self() )) DirectThread *self = direct_thread_self();
return COREDFB_CALL_DIRECT;
if (self && fusion_dispatcher_tid( core->world ) == direct_t
hread_get_tid( self ))
return COREDFB_CALL_DIRECT;
}
return COREDFB_CALL_INDIRECT; return COREDFB_CALL_INDIRECT;
} }
if (core->shutdown_tid && core->shutdown_tid != direct_gettid() && dir ect_gettid() != fusion_dispatcher_tid(core->world) && !Core_GetCalling()) { if (core->shutdown_tid && core->shutdown_tid != direct_gettid() && dir ect_gettid() != fusion_dispatcher_tid(core->world) && !Core_GetCalling()) {
while (core_dfb) while (core_dfb)
direct_thread_sleep(10000); direct_thread_sleep(10000);
return COREDFB_CALL_DENY; return COREDFB_CALL_DENY;
} }
 End of changes. 1 change blocks. 
3 lines changed or deleted 7 lines changed or added


 CoreDFB_includes.h   CoreDFB_includes.h 
skipping to change at line 457 skipping to change at line 457
FusionID caller, FusionID caller,
CoreSurface **ret_surface ) CoreSurface **ret_surface )
{ {
DFBResult ret; DFBResult ret;
CoreSurface *surface; CoreSurface *surface;
ret = dfb_core_get_surface( core, object_id, &surface ); ret = dfb_core_get_surface( core, object_id, &surface );
if (ret) if (ret)
return (DirectResult) ret; return (DirectResult) ret;
if (caller != FUSION_ID_MASTER && surface->object.identity && surface- if (caller != FUSION_ID_MASTER &&
>object.identity != caller) { surface->object.identity && surface->object.identity != caller &&
surface->object.owner && surface->object.owner != caller)
{
dfb_surface_unref( surface ); dfb_surface_unref( surface );
return DR_ACCESSDENIED; return DR_ACCESSDENIED;
} }
*ret_surface = surface; *ret_surface = surface;
return DR_OK; return DR_OK;
} }
static __inline__ DirectResult static __inline__ DirectResult
 End of changes. 1 change blocks. 
2 lines changed or deleted 4 lines changed or added


 core.h   core.h 
skipping to change at line 339 skipping to change at line 339
* *
* Incoming dispatch pushes ID of caller * Incoming dispatch pushes ID of caller
*/ */
void Core_PushIdentity( FusionID caller ); void Core_PushIdentity( FusionID caller );
void Core_PopIdentity ( void ); void Core_PopIdentity ( void );
FusionID Core_GetIdentity ( void ); FusionID Core_GetIdentity ( void );
#if FUSION_BUILD_MULTI
void Core_PushCalling ( void ); void Core_PushCalling ( void );
void Core_PopCalling ( void ); void Core_PopCalling ( void );
int Core_GetCalling ( void ); int Core_GetCalling ( void );
#else
#define Core_PushCalling(x)
#define Core_PopCalling(x)
#define Core_GetCalling(x) (0)
#endif
/* /*
* Resource management * Resource management
* *
* Quotas etc can be implemented. * Quotas etc can be implemented.
* *
* Run time option 'resource-manager' is needed. * Run time option 'resource-manager' is needed.
*/ */
DFBResult Core_Resource_CheckSurface ( const CoreSurfaceConfig *confi g, DFBResult Core_Resource_CheckSurface ( const CoreSurfaceConfig *confi g,
 End of changes. 2 change blocks. 
0 lines changed or deleted 6 lines changed or added


 directfb_util.h   directfb_util.h 
skipping to change at line 914 skipping to change at line 914
if (region->y1 < y1) if (region->y1 < y1)
region->y1 = y1; region->y1 = y1;
if (region->x2 > x2) if (region->x2 > x2)
region->x2 = x2; region->x2 = x2;
if (region->y2 > y2) if (region->y2 > y2)
region->y2 = y2; region->y2 = y2;
} }
static __inline__ void
dfb_regions_unite( DFBRegion *united,
const DFBRegion *regions,
unsigned int num_regions )
{
unsigned int i;
D_ASSERT( united != NULL );
D_ASSERT( regions != NULL );
D_ASSERT( num_regions > 0 );
*united = regions[0];
for (i=1; i<num_regions; i++) {
DFB_REGION_ASSERT( &regions[i] );
dfb_region_region_union( united, &regions[i] );
}
}
/************************************************************************** ********************************************/ /************************************************************************** ********************************************/
/************************************************************************** ********************************************/ /************************************************************************** ********************************************/
static __inline__ void static __inline__ void
dfb_box_from_rectangle( DFBBox *box, dfb_box_from_rectangle( DFBBox *box,
const DFBRectangle *rect ) const DFBRectangle *rect )
{ {
D_ASSERT( box != NULL ); D_ASSERT( box != NULL );
DFB_RECTANGLE_ASSERT( rect ); DFB_RECTANGLE_ASSERT( rect );
 End of changes. 1 change blocks. 
0 lines changed or deleted 20 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 (6) #define DIRECTFB_MINOR_VERSION (6)
#define DIRECTFB_MICRO_VERSION (1) #define DIRECTFB_MICRO_VERSION (2)
#define DIRECTFB_BINARY_AGE (1) #define DIRECTFB_BINARY_AGE (2)
#define DIRECTFB_INTERFACE_AGE (1) #define DIRECTFB_INTERFACE_AGE (0)
#endif /* __DIRECTFB_VERSION_H__ */ #endif /* __DIRECTFB_VERSION_H__ */
 End of changes. 1 change blocks. 
3 lines changed or deleted 3 lines changed or added


 fonts.h   fonts.h 
skipping to change at line 148 skipping to change at line 148
typedef struct { typedef struct {
DirectLink link; DirectLink link;
DFBTextEncodingID encoding; DFBTextEncodingID encoding;
char *name; char *name;
const CoreFontEncodingFuncs *funcs; const CoreFontEncodingFuncs *funcs;
int magic; int magic;
} CoreFontEncoding; } CoreFontEncoding;
typedef enum {
CFF_NONE = 0x00000000,
CFF_SUBPIXEL_ADVANCE = 0x00000001,
CFF_ALL = 0x00000001,
} CoreFontFlags;
#define DFB_FONT_MAX_LAYERS 2 #define DFB_FONT_MAX_LAYERS 2
/* /*
* font struct * font struct
*/ */
struct _CoreFont { struct _CoreFont {
CoreDFB *core; CoreDFB *core;
DFBFontManager *manager; DFBFontManager *manager;
skipping to change at line 208 skipping to change at line 216
DFBResult (* GetKerning) ( CoreFont *thiz, DFBResult (* GetKerning) ( CoreFont *thiz,
unsigned int prev, unsigned int prev,
unsigned int current, unsigned int current,
int *ret_x, int *ret_x,
int *ret_y ); int *ret_y );
int magic; int magic;
int underline_position; int underline_position;
int underline_thickness; int underline_thickness;
CoreFontFlags flags;
}; };
#define CORE_FONT_DEBUG_AT(Domain, font) \ #define CORE_FONT_DEBUG_AT(Domain, font) \
do { \ do { \
D_DEBUG_AT( Domain, " -> ascender %d\n", (font)->ascender ); \ D_DEBUG_AT( Domain, " -> ascender %d\n", (font)->ascender ); \
D_DEBUG_AT( Domain, " -> descender %d\n", (font)->descender ); \ D_DEBUG_AT( Domain, " -> descender %d\n", (font)->descender ); \
D_DEBUG_AT( Domain, " -> height %d\n", (font)->height ); \ D_DEBUG_AT( Domain, " -> height %d\n", (font)->height ); \
} while (0) } while (0)
/* /*
 End of changes. 2 change blocks. 
0 lines changed or deleted 10 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/