directfb.h | directfb.h | |||
---|---|---|---|---|
skipping to change at line 1313 | skipping to change at line 1313 | |||
char name[DFB_DISPLAY_LAYER_DESC_NAME_LENGTH]; /* Display layer nam e. */ | char name[DFB_DISPLAY_LAYER_DESC_NAME_LENGTH]; /* Display layer nam e. */ | |||
int level; /* Default level. */ | int level; /* Default level. */ | |||
int regions; /* Number of concurr ent regions supported.<br> | int regions; /* Number of concurr ent regions supported.<br> | |||
-1 = unlimited, | -1 = unlimited, | |||
0 = unknown/one , | 0 = unknown/one , | |||
>0 = actual numb er */ | >0 = actual numb er */ | |||
int sources; /* Number of selecta ble sources. */ | int sources; /* Number of selecta ble sources. */ | |||
int clip_regions; /* Number of clippin g regions. */ | int clip_regions; /* Number of clippin g regions. */ | |||
DFBSurfaceCapabilities surface_caps; | ||||
unsigned int surface_accessor; | ||||
} DFBDisplayLayerDescription; | } DFBDisplayLayerDescription; | |||
/* | /* | |||
* Capabilities of a display layer source. | * Capabilities of a display layer source. | |||
*/ | */ | |||
typedef enum { | typedef enum { | |||
DDLSCAPS_NONE = 0x00000000, /* none of these */ | DDLSCAPS_NONE = 0x00000000, /* none of these */ | |||
DDLSCAPS_SURFACE = 0x00000001, /* source has an accessable surface */ | DDLSCAPS_SURFACE = 0x00000001, /* source has an accessable surface */ | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 3 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 (4) | #define DIRECTFB_MINOR_VERSION (4) | |||
#define DIRECTFB_MICRO_VERSION (6) | #define DIRECTFB_MICRO_VERSION (7) | |||
#define DIRECTFB_BINARY_AGE (1) | #define DIRECTFB_BINARY_AGE (2) | |||
#define DIRECTFB_INTERFACE_AGE (1) | #define DIRECTFB_INTERFACE_AGE (2) | |||
#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 104 | skipping to change at line 104 | |||
CoreSurface *surface; /* contains bitmap of glyph */ | CoreSurface *surface; /* contains bitmap of glyph */ | |||
int start; /* x offset of glyph in surface */ | int start; /* x offset of glyph in surface */ | |||
int width; /* width of the glyphs bitmap */ | int width; /* width of the glyphs bitmap */ | |||
int height; /* height of the glyphs bitmap */ | int height; /* height of the glyphs bitmap */ | |||
int left; /* x offset of the glyph */ | int left; /* x offset of the glyph */ | |||
int top; /* y offset of the glyph */ | int top; /* y offset of the glyph */ | |||
int advance; /* placement of next glyph */ | int advance; /* placement of next glyph */ | |||
int magic; | int magic; | |||
DFBFontCache *cache; | ||||
DFBFontCacheRow *row; | DFBFontCacheRow *row; | |||
}; | }; | |||
#define CORE_GLYPH_DATA_DEBUG_AT(Domain, data) \ | #define CORE_GLYPH_DATA_DEBUG_AT(Domain, data) \ | |||
do { \ | do { \ | |||
D_DEBUG_AT( Domain, " -> index %d\n", (data)->index ); \ | D_DEBUG_AT( Domain, " -> index %d\n", (data)->index ); \ | |||
D_DEBUG_AT( Domain, " -> layer %d\n", (data)->layer ); \ | D_DEBUG_AT( Domain, " -> layer %d\n", (data)->layer ); \ | |||
D_DEBUG_AT( Domain, " -> row %p\n", (data)->row ); \ | D_DEBUG_AT( Domain, " -> row %p\n", (data)->row ); \ | |||
D_DEBUG_AT( Domain, " -> surface %p\n", (data)->surface ); \ | D_DEBUG_AT( Domain, " -> surface %p\n", (data)->surface ); \ | |||
D_DEBUG_AT( Domain, " -> start %d\n", (data)->start ); \ | D_DEBUG_AT( Domain, " -> start %d\n", (data)->start ); \ | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 0 lines changed or added | |||
idirectfbimageprovider.h | idirectfbimageprovider.h | |||
---|---|---|---|---|
/* | /* | |||
(c) Copyright 2001-2009 The world wide DirectFB Open Source Community ( directfb.org) | (c) Copyright 2001-2010 The world wide DirectFB Open Source Community ( directfb.org) | |||
(c) Copyright 2000-2004 Convergence (integrated media) 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>, | |||
Ville Syrjälä <syrjala@sci.fi> and | Ville Syrjälä <syrjala@sci.fi> and | |||
Claudio Ciccani <klan@users.sf.net>. | Claudio Ciccani <klan@users.sf.net>. | |||
skipping to change at line 48 | skipping to change at line 48 | |||
unsigned char header[32]; | unsigned char header[32]; | |||
const char *filename; /* Only set if databuffer is created from fil e. */ | const char *filename; /* Only set if databuffer is created from fil e. */ | |||
} IDirectFBImageProvider_ProbeContext; | } IDirectFBImageProvider_ProbeContext; | |||
DFBResult | DFBResult | |||
IDirectFBImageProvider_CreateFromBuffer( IDirectFBDataBuffer *buffer, | IDirectFBImageProvider_CreateFromBuffer( IDirectFBDataBuffer *buffer, | |||
CoreDFB *core, | CoreDFB *core, | |||
IDirectFBImageProvider **interface ); | IDirectFBImageProvider **interface ); | |||
/************************************************************************** | ||||
********************************************/ | ||||
/* | ||||
* private data struct of IDirectFBImageProvider | ||||
* used by implementors of IDirectFBImageProvider | ||||
*/ | ||||
typedef struct { | ||||
int ref; /* reference counter */ | ||||
IDirectFBDataBuffer *buffer; | ||||
CoreDFB *core; | ||||
DIRenderCallback render_callback; | ||||
void *render_callback_context; | ||||
void (*Destruct)( IDirectFBImageProvider *thiz ); | ||||
} IDirectFBImageProvider_data; | ||||
#endif | #endif | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 21 lines changed or added | |||
layers_internal.h | layers_internal.h | |||
---|---|---|---|---|
skipping to change at line 172 | skipping to change at line 172 | |||
CoreLayerRegionStateFlags state; | CoreLayerRegionStateFlags state; | |||
CoreLayerRegionConfig config; | CoreLayerRegionConfig config; | |||
CoreSurface *surface; | CoreSurface *surface; | |||
CoreSurfaceBufferLock surface_lock; | CoreSurfaceBufferLock surface_lock; | |||
GlobalReaction surface_reaction; | GlobalReaction surface_reaction; | |||
void *region_data; | void *region_data; | |||
CoreSurfaceAccessorID surface_accessor; | ||||
}; | }; | |||
/* Called at the end of dfb_layer_region_create(). */ | /* Called at the end of dfb_layer_region_create(). */ | |||
DFBResult dfb_layer_context_add_region( CoreLayerContext *context, | DFBResult dfb_layer_context_add_region( CoreLayerContext *context, | |||
CoreLayerRegion *region ); | CoreLayerRegion *region ); | |||
/* Called early in the region_destructor(). */ | /* Called early in the region_destructor(). */ | |||
DFBResult dfb_layer_context_remove_region( CoreLayerContext *context, | DFBResult dfb_layer_context_remove_region( CoreLayerContext *context, | |||
CoreLayerRegion *region ); | CoreLayerRegion *region ); | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added | |||
surface_pool.h | surface_pool.h | |||
---|---|---|---|---|
skipping to change at line 261 | skipping to change at line 261 | |||
int pitch, | int pitch, | |||
const DFBRectangle *rect ); | const DFBRectangle *rect ); | |||
DFBResult dfb_surface_pool_enumerate ( CoreSurfacePool *pool, | DFBResult dfb_surface_pool_enumerate ( CoreSurfacePool *pool, | |||
CoreSurfaceAllocCallback callback, | CoreSurfaceAllocCallback callback, | |||
void *ctx ); | void *ctx ); | |||
/* | /* | |||
Get a surface pool's process-specific void data pointer. | Get a surface pool's process-specific void data pointer. | |||
*/ | */ | |||
void * | void *dfb_surface_pool_get_local( const CoreSurfacePool *pool ); | |||
surface_pool_get_local( const CoreSurfacePool *pool ); | ||||
#endif | #endif | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 1 lines changed or added | |||