conf.h   conf.h 
skipping to change at line 165 skipping to change at line 165
int primary_layer; /* select alternative pri mary int primary_layer; /* select alternative pri mary
display layer */ display layer */
bool force_desktop; /* Desktop background is bool force_desktop; /* Desktop background is
the primary surface. * / the primary surface. * /
bool linux_input_ir_only; /* Ignore non-IR devices. */ bool linux_input_ir_only; /* Ignore non-IR devices. */
struct { struct {
char *host; /* Remote host to connect to. */ char *host; /* Remote host to connect to. */
int session; /* Remote session number. */ int port; /* Remote port number. */
} remote; } remote;
char *wm; /* Window manager to use. */ char *wm; /* Window manager to use. */
bool vt; /* Use VT stuff at all? * / bool vt; /* Use VT stuff at all? * /
bool decorations; /* Enable window decorati ons. */ bool decorations; /* Enable window decorati ons. */
DFBSurfacePixelFormat font_format; /* Preferred font format. */ DFBSurfacePixelFormat font_format; /* Preferred font format. */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 directfb.h   directfb.h 
skipping to change at line 278 skipping to change at line 278
typedef struct { typedef struct {
int x1; /* X coordinate of first edge */ int x1; /* X coordinate of first edge */
int y1; /* Y coordinate of first edge */ int y1; /* Y coordinate of first edge */
int x2; /* X coordinate of second edge */ int x2; /* X coordinate of second edge */
int y2; /* Y coordinate of second edge */ int y2; /* Y coordinate of second edge */
int x3; /* X coordinate of third edge */ int x3; /* X coordinate of third edge */
int y3; /* Y coordinate of third edge */ int y3; /* Y coordinate of third edge */
} DFBTriangle; } DFBTriangle;
/* /*
* A trapezoid specified by two points with a width each.
*/
typedef struct {
int x1; /* X coordinate of first span */
int y1; /* Y coordinate of first span */
int w1; /* width of first span */
int x2; /* X coordinate of second span */
int y2; /* Y coordinate of second span */
int w2; /* width of second span */
} DFBTrapezoid;
/*
* A color defined by channels with 8bit each. * A color defined by channels with 8bit each.
*/ */
typedef struct { typedef struct {
u8 a; /* alpha channel */ u8 a; /* alpha channel */
u8 r; /* red channel */ u8 r; /* red channel */
u8 g; /* green channel */ u8 g; /* green channel */
u8 b; /* blue channel */ u8 b; /* blue channel */
} DFBColor; } DFBColor;
/* /*
skipping to change at line 770 skipping to change at line 782
/* /*
* Mask of accelerated functions. * Mask of accelerated functions.
*/ */
typedef enum { typedef enum {
DFXL_NONE = 0x00000000, /* None of these. */ DFXL_NONE = 0x00000000, /* None of these. */
DFXL_FILLRECTANGLE = 0x00000001, /* FillRectangle() is accelerated. */ DFXL_FILLRECTANGLE = 0x00000001, /* FillRectangle() is accelerated. */
DFXL_DRAWRECTANGLE = 0x00000002, /* DrawRectangle() is accelerated. */ DFXL_DRAWRECTANGLE = 0x00000002, /* DrawRectangle() is accelerated. */
DFXL_DRAWLINE = 0x00000004, /* DrawLine() is accelerated. */ DFXL_DRAWLINE = 0x00000004, /* DrawLine() is accelerated. */
DFXL_FILLTRIANGLE = 0x00000008, /* FillTriangle() is accelerated. * / DFXL_FILLTRIANGLE = 0x00000008, /* FillTriangle() is accelerated. * /
DFXL_FILLTRAPEZOID = 0x00000010, /* FillTrapezoid() is accelerated. */
DFXL_BLIT = 0x00010000, /* Blit() and TileBlit() are accele rated. */ DFXL_BLIT = 0x00010000, /* Blit() and TileBlit() are accele rated. */
DFXL_STRETCHBLIT = 0x00020000, /* StretchBlit() is accelerated. */ DFXL_STRETCHBLIT = 0x00020000, /* StretchBlit() is accelerated. */
DFXL_TEXTRIANGLES = 0x00040000, /* TextureTriangles() is accelerate d. */ DFXL_TEXTRIANGLES = 0x00040000, /* TextureTriangles() is accelerate d. */
DFXL_BLIT2 = 0x00080000, /* BatchBlit2() is accelerated. */ DFXL_BLIT2 = 0x00080000, /* BatchBlit2() is accelerated. */
DFXL_DRAWSTRING = 0x01000000, /* DrawString() and DrawGlyph() are accelerated. */ DFXL_DRAWSTRING = 0x01000000, /* DrawString() and DrawGlyph() are accelerated. */
DFXL_ALL = 0x010F000F, /* All drawing/blitting functions. DFXL_ALL = 0x010F001F, /* All drawing/blitting functions.
*/ */
DFXL_ALL_DRAW = 0x0000000F, /* All drawing functions. */ DFXL_ALL_DRAW = 0x0000001F, /* All drawing functions. */
DFXL_ALL_BLIT = 0x010F0000, /* All blitting functions. */ DFXL_ALL_BLIT = 0x010F0000, /* All blitting functions. */
} DFBAccelerationMask; } DFBAccelerationMask;
/* /*
* @internal * @internal
*/ */
#define DFB_DRAWING_FUNCTION(a) ((a) & 0x0000FFFF) #define DFB_DRAWING_FUNCTION(a) ((a) & 0x0000FFFF)
/* /*
* @internal * @internal
skipping to change at line 4148 skipping to change at line 4161
/* /*
* Returns the physical address of a locked surface. * Returns the physical address of a locked surface.
* *
* The surface must exist in a video memory pool. * The surface must exist in a video memory pool.
*/ */
DFBResult (*GetPhysicalAddress) ( DFBResult (*GetPhysicalAddress) (
IDirectFBSurface *thiz, IDirectFBSurface *thiz,
unsigned long *addr unsigned long *addr
); );
/** Drawing functions **/
/*
* Fill a bunch of trapezoids with a single call.
*
* Fill <b>num</b> trapezoids with the current color following the
* drawing flags. Each trapezoid specified by a DFBTrapezoid.
*/
DFBResult (*FillTrapezoids) (
IDirectFBSurface *thiz,
const DFBTrapezoid *traps,
unsigned int num
);
) )
/******************** /********************
* IDirectFBPalette * * IDirectFBPalette *
********************/ ********************/
/* /*
* <i>No summary yet...</i> * <i>No summary yet...</i>
*/ */
DEFINE_INTERFACE( IDirectFBPalette, DEFINE_INTERFACE( IDirectFBPalette,
 End of changes. 4 change blocks. 
3 lines changed or deleted 30 lines changed or added


 directfb_strings.h   directfb_strings.h 
skipping to change at line 494 skipping to change at line 494
struct DFBAccelerationMaskName { struct DFBAccelerationMaskName {
DFBAccelerationMask mask; DFBAccelerationMask mask;
const char *name; const char *name;
}; };
#define DirectFBAccelerationMaskNames(Identifier) struct DFBAccelerationMas kName Identifier[] = { \ #define DirectFBAccelerationMaskNames(Identifier) struct DFBAccelerationMas kName Identifier[] = { \
{ DFXL_FILLRECTANGLE, "FILLRECTANGLE" }, \ { DFXL_FILLRECTANGLE, "FILLRECTANGLE" }, \
{ DFXL_DRAWRECTANGLE, "DRAWRECTANGLE" }, \ { DFXL_DRAWRECTANGLE, "DRAWRECTANGLE" }, \
{ DFXL_DRAWLINE, "DRAWLINE" }, \ { DFXL_DRAWLINE, "DRAWLINE" }, \
{ DFXL_FILLTRIANGLE, "FILLTRIANGLE" }, \ { DFXL_FILLTRIANGLE, "FILLTRIANGLE" }, \
{ DFXL_FILLTRAPEZOID, "FILLTRAPEZOID" }, \
{ DFXL_BLIT, "BLIT" }, \ { DFXL_BLIT, "BLIT" }, \
{ DFXL_STRETCHBLIT, "STRETCHBLIT" }, \ { DFXL_STRETCHBLIT, "STRETCHBLIT" }, \
{ DFXL_TEXTRIANGLES, "TEXTRIANGLES" }, \ { DFXL_TEXTRIANGLES, "TEXTRIANGLES" }, \
{ DFXL_BLIT2, "BLIT2" }, \ { DFXL_BLIT2, "BLIT2" }, \
{ DFXL_DRAWSTRING, "DRAWSTRING" }, \ { DFXL_DRAWSTRING, "DRAWSTRING" }, \
{ DFXL_NONE, "NONE" } \ { DFXL_NONE, "NONE" } \
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 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 (10) #define DIRECTFB_MICRO_VERSION (11)
#define DIRECTFB_BINARY_AGE (5) #define DIRECTFB_BINARY_AGE (6)
#define DIRECTFB_INTERFACE_AGE (5) #define DIRECTFB_INTERFACE_AGE (6)
#endif /* __DIRECTFB_VERSION_H__ */ #endif /* __DIRECTFB_VERSION_H__ */
 End of changes. 1 change blocks. 
3 lines changed or deleted 3 lines changed or added


 gfxcard.h   gfxcard.h 
skipping to change at line 245 skipping to change at line 245
bool (*DrawRectangle) ( void *driver_data, void *device_data, bool (*DrawRectangle) ( void *driver_data, void *device_data,
DFBRectangle *rect ); DFBRectangle *rect );
bool (*DrawLine) ( void *driver_data, void *device_data, bool (*DrawLine) ( void *driver_data, void *device_data,
DFBRegion *line ); DFBRegion *line );
bool (*FillTriangle) ( void *driver_data, void *device_data, bool (*FillTriangle) ( void *driver_data, void *device_data,
DFBTriangle *tri ); DFBTriangle *tri );
bool (*FillTrapezoid) ( void *driver_data, void *device_data,
DFBTrapezoid *trap );
/* /*
* blitting functions * blitting functions
*/ */
bool (*Blit) ( void *driver_data, void *device_data, bool (*Blit) ( void *driver_data, void *device_data,
DFBRectangle *rect, int dx, int dy ); DFBRectangle *rect, int dx, int dy );
bool (*Blit2) ( void *driver_data, void *device_data, bool (*Blit2) ( void *driver_data, void *device_data,
DFBRectangle *rect, int dx, int dy, int sx2, int sy2 ); DFBRectangle *rect, int dx, int dy, int sx2, int sy2 );
bool (*StretchBlit) ( void *driver_data, void *device_data, bool (*StretchBlit) ( void *driver_data, void *device_data,
skipping to change at line 348 skipping to change at line 351
void dfb_gfxcard_fillspans ( int y, void dfb_gfxcard_fillspans ( int y,
DFBSpan *spans, DFBSpan *spans,
int num_spans, int num_spans,
CardState *state ); CardState *state );
void dfb_gfxcard_filltriangles ( const DFBTriangle *tris, void dfb_gfxcard_filltriangles ( const DFBTriangle *tris,
int num, int num,
CardState *state ); CardState *state );
void dfb_gfxcard_filltrapezoids ( const DFBTrapezoid *traps,
int num,
CardState *state );
void dfb_gfxcard_blit ( DFBRectangle *rect, void dfb_gfxcard_blit ( DFBRectangle *rect,
int dx, int dx,
int dy, int dy,
CardState *state ); CardState *state );
void dfb_gfxcard_batchblit ( DFBRectangle *rects, void dfb_gfxcard_batchblit ( DFBRectangle *rects,
DFBPoint *points, DFBPoint *points,
int num, int num,
CardState *state ); CardState *state );
 End of changes. 2 change blocks. 
0 lines changed or deleted 7 lines changed or added


 shm.h   shm.h 
skipping to change at line 47 skipping to change at line 47
DirectResult fusion_shm_init ( FusionWorld *world ); DirectResult fusion_shm_init ( FusionWorld *world );
DirectResult fusion_shm_deinit( FusionWorld *world ); DirectResult fusion_shm_deinit( FusionWorld *world );
DirectResult fusion_shm_attach_unattached( FusionWorld *world ); DirectResult fusion_shm_attach_unattached( FusionWorld *world );
DirectResult fusion_shm_enum_pools( FusionWorld *world, DirectResult fusion_shm_enum_pools( FusionWorld *world,
FusionSHMPoolCallback callback, FusionSHMPoolCallback callback,
void *ctx ); void *ctx );
int fusion_find_tmpfs( char *name, int len );
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 shm_internal.h   shm_internal.h 
skipping to change at line 58 skipping to change at line 58
int magic; int magic;
bool attached; /* Indicates usage of this entry in the static pool array. */ bool attached; /* Indicates usage of this entry in the static pool array. */
FusionSHM *shm; /* Back pointer to local SHM data. */ FusionSHM *shm; /* Back pointer to local SHM data. */
FusionSHMPoolShared *shared; /* Pointer to shared pool data. */ FusionSHMPoolShared *shared; /* Pointer to shared pool data. */
int pool_id; /* The pool's ID within the world. */ int pool_id; /* The pool's ID within the world. */
int fd; /* File descriptor of shared memory file. */
char *filename; /* Name of the shared memory file. */ char *filename; /* Name of the shared memory file. */
}; };
/* /*
* Shared pool data. * Shared pool data.
*/ */
struct __Fusion_FusionSHMPoolShared { struct __Fusion_FusionSHMPoolShared {
int magic; int magic;
bool debug; /* Debug allocations in this pool? */ bool debug; /* Debug allocations in this pool? */
skipping to change at line 227 skipping to change at line 226
size_t chunks_used; size_t chunks_used;
size_t bytes_used; size_t bytes_used;
size_t chunks_free; size_t chunks_free;
size_t bytes_free; size_t bytes_free;
/* Total size of heap in bytes. */ /* Total size of heap in bytes. */
int size; int size;
/* Back pointer to shared memory pool. */ /* Back pointer to shared memory pool. */
FusionSHMPoolShared *pool; FusionSHMPoolShared *pool;
char filename[FUSION_SHM_TMPFS_PATH_NAME_LEN+32];
}; };
void *_fusion_shmalloc (shmalloc_heap *heap, size_t __size); void *_fusion_shmalloc (shmalloc_heap *heap, size_t __size);
void *_fusion_shrealloc (shmalloc_heap *heap, void *__ptr, size_t __size); void *_fusion_shrealloc (shmalloc_heap *heap, void *__ptr, size_t __size);
void _fusion_shfree (shmalloc_heap *heap, void *__ptr); void _fusion_shfree (shmalloc_heap *heap, void *__ptr);
DirectResult __shmalloc_init_heap( FusionSHM *shm, DirectResult __shmalloc_init_heap( FusionSHM *shm,
const char *filename, const char *filename,
void *addr_base, void *addr_base,
int space, int space,
int *ret_fd,
int *ret_size ); int *ret_size );
DirectResult __shmalloc_join_heap( FusionSHM *shm, DirectResult __shmalloc_join_heap( FusionSHM *shm,
const char *filename, const char *filename,
void *addr_base, void *addr_base,
int size, int size );
int *ret_fd );
void *__shmalloc_brk ( shmalloc_heap *heap, void *__shmalloc_brk ( shmalloc_heap *heap,
int increment ); int increment );
#endif #endif
 End of changes. 4 change blocks. 
4 lines changed or deleted 3 lines changed or added


 util.h   util.h 
skipping to change at line 42 skipping to change at line 42
#include <core/surface.h> #include <core/surface.h>
void dfb_gfx_copy( CoreSurface *source, CoreSurface *destination, const DFB Rectangle *rect ); void dfb_gfx_copy( CoreSurface *source, CoreSurface *destination, const DFB Rectangle *rect );
void dfb_gfx_copy_to( CoreSurface *source, CoreSurface *destination, const DFBRectangle *rect, int x, int y, bool from_back ); void dfb_gfx_copy_to( CoreSurface *source, CoreSurface *destination, const DFBRectangle *rect, int x, int y, bool from_back );
void dfb_gfx_stretch_to( CoreSurface *source, CoreSurface *destination, con st DFBRectangle *srect, const DFBRectangle *drect, bool from_back ); void dfb_gfx_stretch_to( CoreSurface *source, CoreSurface *destination, con st DFBRectangle *srect, const DFBRectangle *drect, bool from_back );
void dfb_back_to_front_copy( CoreSurface *surface, const DFBRegion *region ); void dfb_back_to_front_copy( CoreSurface *surface, const DFBRegion *region );
void dfb_back_to_front_copy_rotation( CoreSurface *surface, const DFBRegion *region, int rotation ); void dfb_back_to_front_copy_rotation( CoreSurface *surface, const DFBRegion *region, int rotation );
void dfb_clear_depth( CoreSurface *surface, const DFBRegion *region ); void dfb_clear_depth( CoreSurface *surface, const DFBRegion *region );
void dfb_sort_triangle( DFBTriangle *tri ); void dfb_sort_triangle( DFBTriangle *tri );
void dfb_sort_trapezoid( DFBTrapezoid *trap );
void dfb_gfx_copy_regions( CoreSurface *source, void dfb_gfx_copy_regions( CoreSurface *source,
CoreSurfaceBufferRole from, CoreSurfaceBufferRole from,
CoreSurface *destination, CoreSurface *destination,
CoreSurfaceBufferRole to, CoreSurfaceBufferRole to,
const DFBRegion *regions, const DFBRegion *regions,
unsigned int num, unsigned int num,
int x, int x,
int y ); int y );
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 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/