convert.h   convert.h 
skipping to change at line 78 skipping to change at line 78
(((b)&0xF0) >> 4) ) (((b)&0xF0) >> 4) )
#define PIXEL_RGB16(r,g,b) ( (((r)&0xF8) << 8) | \ #define PIXEL_RGB16(r,g,b) ( (((r)&0xF8) << 8) | \
(((g)&0xFC) << 3) | \ (((g)&0xFC) << 3) | \
(((b)&0xF8) >> 3) ) (((b)&0xF8) >> 3) )
#define PIXEL_RGB18(r,g,b) ( (((r)&0xFC) << 10) | \ #define PIXEL_RGB18(r,g,b) ( (((r)&0xFC) << 10) | \
(((g)&0xFC) << 4) | \ (((g)&0xFC) << 4) | \
(((b)&0xFC) >> 2) ) (((b)&0xFC) >> 2) )
#define PIXEL_RGB32(r,g,b) ( ((r) << 16) | \ #define PIXEL_RGB32(r,g,b) ( (0xff << 24) | \
((g) << 8) | \ ((r) << 16) | \
((g) << 8) | \
(b) ) (b) )
#define PIXEL_ARGB(a,r,g,b) ( ((a) << 24) | \ #define PIXEL_ARGB(a,r,g,b) ( ((a) << 24) | \
((r) << 16) | \ ((r) << 16) | \
((g) << 8) | \ ((g) << 8) | \
(b) ) (b) )
#define PIXEL_ARGB1666(a,r,g,b) ( (((a)&0x80) << 11) | \ #define PIXEL_ARGB1666(a,r,g,b) ( (((a)&0x80) << 11) | \
(((r)&0xFC) << 10) | \ (((r)&0xFC) << 10) | \
(((g)&0xFC) << 4) | \ (((g)&0xFC) << 4) | \
 End of changes. 1 change blocks. 
2 lines changed or deleted 3 lines changed or added


 directfb.h   directfb.h 
skipping to change at line 881 skipping to change at line 881
that is still in preparation. that is still in preparation.
Normally a window's content can Normally a window's content can
get visible before an update if get visible before an update if
there is another reason causing there is another reason causing
a window stack repaint. */ a window stack repaint. */
DWCAPS_INPUTONLY = 0x00000004, /* The window has no surface. DWCAPS_INPUTONLY = 0x00000004, /* The window has no surface.
You can not draw to it but it You can not draw to it but it
receives events */ receives events */
DWCAPS_NODECORATION = 0x00000008, /* The window won't be decorated. * / DWCAPS_NODECORATION = 0x00000008, /* The window won't be decorated. * /
DWCAPS_COLOR = 0x00000020, /* The window has no buffer;
it consumes no backing store.
It is filled with a constant col
or
and it receives events */
DWCAPS_NOFOCUS = 0x00000100, /* Window will never get focus or r eceive key events, unless it grabs them. */ DWCAPS_NOFOCUS = 0x00000100, /* Window will never get focus or r eceive key events, unless it grabs them. */
DWCAPS_ALL = 0x0000010F /* All of these. */ DWCAPS_ALL = 0x0000012F /* All of these. */
} DFBWindowCapabilities; } DFBWindowCapabilities;
/* /*
* Flags controlling the appearance and behaviour of the window. * Flags controlling the appearance and behaviour of the window.
*/ */
typedef enum { typedef enum {
DWOP_NONE = 0x00000000, /* none of these */ DWOP_NONE = 0x00000000, /* none of these */
DWOP_COLORKEYING = 0x00000001, /* enable color key */ DWOP_COLORKEYING = 0x00000001, /* enable color key */
DWOP_ALPHACHANNEL = 0x00000002, /* enable alpha blending using the DWOP_ALPHACHANNEL = 0x00000002, /* enable alpha blending using the
window's alpha channel */ window's alpha channel */
skipping to change at line 3077 skipping to change at line 3082
DSPD_SRC_OVER = 3, /* fs: 1.0 fd: 1.0-sa */ DSPD_SRC_OVER = 3, /* fs: 1.0 fd: 1.0-sa */
DSPD_DST_OVER = 4, /* fs: 1.0-da fd: 1.0 */ DSPD_DST_OVER = 4, /* fs: 1.0-da fd: 1.0 */
DSPD_SRC_IN = 5, /* fs: da fd: 0.0 */ DSPD_SRC_IN = 5, /* fs: da fd: 0.0 */
DSPD_DST_IN = 6, /* fs: 0.0 fd: sa */ DSPD_DST_IN = 6, /* fs: 0.0 fd: sa */
DSPD_SRC_OUT = 7, /* fs: 1.0-da fd: 0.0 */ DSPD_SRC_OUT = 7, /* fs: 1.0-da fd: 0.0 */
DSPD_DST_OUT = 8, /* fs: 0.0 fd: 1.0-sa */ DSPD_DST_OUT = 8, /* fs: 0.0 fd: 1.0-sa */
DSPD_SRC_ATOP = 9, /* fs: da fd: 1.0-sa */ DSPD_SRC_ATOP = 9, /* fs: da fd: 1.0-sa */
DSPD_DST_ATOP = 10, /* fs: 1.0-da fd: sa */ DSPD_DST_ATOP = 10, /* fs: 1.0-da fd: sa */
DSPD_ADD = 11, /* fs: 1.0 fd: 1.0 */ DSPD_ADD = 11, /* fs: 1.0 fd: 1.0 */
DSPD_XOR = 12, /* fs: 1.0-da fd: 1.0-sa */ DSPD_XOR = 12, /* fs: 1.0-da fd: 1.0-sa */
DSPD_DST = 13, /* fs: 0.0 fd: 1.0 */
} DFBSurfacePorterDuffRule; } DFBSurfacePorterDuffRule;
/* /*
* Blend functions to use for source and destination blending * Blend functions to use for source and destination blending
*/ */
typedef enum { typedef enum {
/* /*
* pixel color = sc * cf[sf] + dc * cf[df] * pixel color = sc * cf[sf] + dc * cf[df]
* pixel alpha = sa * af[sf] + da * af[df] * pixel alpha = sa * af[sf] + da * af[df]
* sc = source color * sc = source color
skipping to change at line 3924 skipping to change at line 3930
/* /*
* Read from the surface without the need for (Un)Lock. * Read from the surface without the need for (Un)Lock.
* *
* <b>rect</b> defines the area inside the surface to be read. * <b>rect</b> defines the area inside the surface to be read.
* <br><b>ptr</b> and <b>pitch</b> specify the destination. * <br><b>ptr</b> and <b>pitch</b> specify the destination.
* <br>The destination data will have the same format as the surface. * <br>The destination data will have the same format as the surface.
*/ */
DFBResult (*Read) ( DFBResult (*Read) (
IDirectFBSurface *thiz, IDirectFBSurface *thiz,
const DFBRectangle *rect, const DFBRectangle *rect,
const void *ptr, void *ptr,
int pitch int pitch
); );
) )
/******************** /********************
* IDirectFBPalette * * IDirectFBPalette *
********************/ ********************/
/* /*
* <i>No summary yet...</i> * <i>No summary yet...</i>
skipping to change at line 4879 skipping to change at line 4885
/* /*
* Get options controlling appearance and behaviour of the window. * Get options controlling appearance and behaviour of the window.
*/ */
DFBResult (*GetOptions) ( DFBResult (*GetOptions) (
IDirectFBWindow *thiz, IDirectFBWindow *thiz,
DFBWindowOptions *ret_options DFBWindowOptions *ret_options
); );
/* /*
* Set the window color, or colorises the window.
*
* In case you specified DWCAPS_COLOR, this sets the window draw color
.
* In case you didn't, it colorises the window with this color; this w
ill darken the window.
* no DWCAPS_COLOR and an opacity of 0 means: no effect.
*/
DFBResult (*SetColor) (
IDirectFBWindow *thiz,
u8 r,
u8 g,
u8 b,
u8 a
);
/*
* Set the window color key. * Set the window color key.
* *
* If a pixel of the window matches this color the * If a pixel of the window matches this color the
* underlying window or the background is visible at this * underlying window or the background is visible at this
* point. * point.
*/ */
DFBResult (*SetColorKey) ( DFBResult (*SetColorKey) (
IDirectFBWindow *thiz, IDirectFBWindow *thiz,
u8 r, u8 r,
u8 g, u8 g,
skipping to change at line 5239 skipping to change at line 5260
/* /*
* Set destination location of window within its bounds. * Set destination location of window within its bounds.
* *
* Default and maximum is to fill whole bounds. * Default and maximum is to fill whole bounds.
*/ */
DFBResult (*SetDstGeometry) ( DFBResult (*SetDstGeometry) (
IDirectFBWindow *thiz, IDirectFBWindow *thiz,
const DFBWindowGeometry *geometry const DFBWindowGeometry *geometry
); );
/** Association **/
/*
* Change the window association.
*
* If <b>window_id</b> is 0, the window will be dissociated.
*/
DFBResult (*SetAssociation) (
IDirectFBWindow *thiz,
DFBWindowID window_id
);
/** Application ID **/
/*
* Set application ID.
*
* The usage of the application ID is not imposed by DirectFB
* and can be used at will by the application. Any change will
* be notified, and as such, an application manager using SaWMan
* can be used to act on any change.
*/
DFBResult (*SetApplicationID) (
IDirectFBWindow *thiz,
unsigned long application_id
);
/*
* Get current application ID.
*/
DFBResult (*GetApplicationID) (
IDirectFBWindow *thiz,
unsigned long *ret_application_id
);
) )
/* /*
* Called for each provided text encoding. * Called for each provided text encoding.
*/ */
typedef DFBEnumerationResult (*DFBTextEncodingCallback) ( typedef DFBEnumerationResult (*DFBTextEncodingCallback) (
DFBTextEncodingID encoding_id, DFBTextEncodingID encoding_id,
const char *name, const char *name,
void *context void *context
); );
 End of changes. 6 change blocks. 
2 lines changed or deleted 61 lines changed or added


 directfb_strings.h   directfb_strings.h 
skipping to change at line 195 skipping to change at line 195
struct DFBWindowCapabilitiesName { struct DFBWindowCapabilitiesName {
DFBWindowCapabilities capability; DFBWindowCapabilities capability;
const char *name; const char *name;
}; };
#define DirectFBWindowCapabilitiesNames(Identifier) struct DFBWindowCapabil itiesName Identifier[] = { \ #define DirectFBWindowCapabilitiesNames(Identifier) struct DFBWindowCapabil itiesName Identifier[] = { \
{ DWCAPS_ALPHACHANNEL, "ALPHACHANNEL" }, \ { DWCAPS_ALPHACHANNEL, "ALPHACHANNEL" }, \
{ DWCAPS_DOUBLEBUFFER, "DOUBLEBUFFER" }, \ { DWCAPS_DOUBLEBUFFER, "DOUBLEBUFFER" }, \
{ DWCAPS_INPUTONLY, "INPUTONLY" }, \ { DWCAPS_INPUTONLY, "INPUTONLY" }, \
{ DWCAPS_NODECORATION, "NODECORATION" }, \ { DWCAPS_NODECORATION, "NODECORATION" }, \
{ DWCAPS_COLOR, "COLOR" }, \
{ DWCAPS_NOFOCUS, "NOFOCUS" }, \ { DWCAPS_NOFOCUS, "NOFOCUS" }, \
{ DWCAPS_NONE, "NONE" } \ { DWCAPS_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[] = { \
 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 (2) #define DIRECTFB_MINOR_VERSION (2)
#define DIRECTFB_MICRO_VERSION (8) #define DIRECTFB_MICRO_VERSION (9)
#define DIRECTFB_BINARY_AGE (8) #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. 
2 lines changed or deleted 2 lines changed or added


 windows.h   windows.h 
skipping to change at line 56 skipping to change at line 56
typedef enum { typedef enum {
CWCF_NONE = 0x00000000, CWCF_NONE = 0x00000000,
CWCF_POSITION = 0x00000001, CWCF_POSITION = 0x00000001,
CWCF_SIZE = 0x00000002, CWCF_SIZE = 0x00000002,
CWCF_OPACITY = 0x00000004, CWCF_OPACITY = 0x00000004,
CWCF_STACKING = 0x00000008, CWCF_STACKING = 0x00000008,
CWCF_OPTIONS = 0x00000010, CWCF_OPTIONS = 0x00000010,
CWCF_EVENTS = 0x00000020, CWCF_EVENTS = 0x00000020,
CWCF_ASSOCIATION = 0x00000040,
CWCF_COLOR_KEY = 0x00000100, CWCF_COLOR_KEY = 0x00000100,
CWCF_OPAQUE = 0x00000200, CWCF_OPAQUE = 0x00000200,
CWCF_COLOR = 0x00000400,
CWCF_KEY_SELECTION = 0x00001000, CWCF_KEY_SELECTION = 0x00001000,
CWCF_SRC_GEOMETRY = 0x00010000, CWCF_SRC_GEOMETRY = 0x00010000,
CWCF_DST_GEOMETRY = 0x00020000, CWCF_DST_GEOMETRY = 0x00020000,
CWCF_ALL = 0x0003133F CWCF_APPLICATION_ID= 0x00080000,
CWCF_ALL = 0x000B177F
} CoreWindowConfigFlags; } CoreWindowConfigFlags;
struct __DFB_CoreWindowConfig { struct __DFB_CoreWindowConfig {
DFBRectangle bounds; /* position and size */ DFBRectangle bounds; /* position and size */
int opacity; /* global alpha factor */ int opacity; /* global alpha factor */
DFBWindowStackingClass stacking; /* level boundaries */ DFBWindowStackingClass stacking; /* level boundaries */
DFBWindowOptions options; /* flags for appearance/behav iour */ DFBWindowOptions options; /* flags for appearance/behav iour */
DFBWindowEventType events; /* mask of enabled events */ DFBWindowEventType events; /* mask of enabled events */
DFBColor color; /* color for DWCAPS_COLOR */
u32 color_key; /* transparent pixel */ u32 color_key; /* transparent pixel */
DFBRegion opaque; /* region of the window force d to be opaque */ DFBRegion opaque; /* region of the window force d to be opaque */
DFBWindowKeySelection key_selection; /* how to filter keys in focu s */ DFBWindowKeySelection key_selection; /* how to filter keys in focu s */
DFBInputDeviceKeySymbol *keys; /* list of keys for DWKS_LIST */ DFBInputDeviceKeySymbol *keys; /* list of keys for DWKS_LIST */
unsigned int num_keys; /* number of entries in key a rray */ unsigned int num_keys; /* number of entries in key a rray */
DFBWindowGeometry src_geometry; /* advanced source geometry * / DFBWindowGeometry src_geometry; /* advanced source geometry * /
DFBWindowGeometry dst_geometry; /* advanced destination geome try */ DFBWindowGeometry dst_geometry; /* advanced destination geome try */
DFBWindowID association;
unsigned long application_id; /* this can be changed at run
time by the application.
* it's here so appman can ge
t a callback on change. */
}; };
#define TRANSLUCENT_WINDOW(w) ((w)->config.opacity < 0xff || \ #define TRANSLUCENT_WINDOW(w) ((w)->config.opacity < 0xff || \
(w)->config.options & (DWOP_ALPHACHANNEL | D WOP_COLORKEYING)) (w)->config.options & (DWOP_ALPHACHANNEL | D WOP_COLORKEYING))
#define VISIBLE_WINDOW(w) (!((w)->caps & DWCAPS_INPUTONLY) && \ #define VISIBLE_WINDOW(w) (!((w)->caps & DWCAPS_INPUTONLY) && \
(w)->config.opacity > 0 && !DFB_WINDOW_DESTR OYED((w))) (w)->config.opacity > 0 && !DFB_WINDOW_DESTR OYED((w)))
/* /*
* Creates a pool of window objects. * Creates a pool of window objects.
skipping to change at line 207 skipping to change at line 217
* stacks the window below another one * stacks the window below another one
*/ */
DFBResult DFBResult
dfb_window_putbelow( CoreWindow *window, dfb_window_putbelow( CoreWindow *window,
CoreWindow *upper ); CoreWindow *upper );
/* /*
* sets the source color key * sets the source color key
*/ */
DFBResult DFBResult
dfb_window_set_color( CoreWindow *window,
DFBColor color );
/*
* sets the source color key
*/
DFBResult
dfb_window_set_colorkey( CoreWindow *window, dfb_window_set_colorkey( CoreWindow *window,
u32 color_key ); u32 color_key );
/* /*
* change window configuration * change window configuration
*/ */
DFBResult DFBResult
dfb_window_set_config( CoreWindow *window, dfb_window_set_config( CoreWindow *window,
const CoreWindowConfig *config, const CoreWindowConfig *config,
CoreWindowConfigFlags flags ); CoreWindowConfigFlags flags );
 End of changes. 6 change blocks. 
1 lines changed or deleted 20 lines changed or added


 windows_internal.h   windows_internal.h 
skipping to change at line 102 skipping to change at line 102
void *window_data; /* private data of window mana ger */ void *window_data; /* private data of window mana ger */
CoreGraphicsSerial serial1; CoreGraphicsSerial serial1;
CoreGraphicsSerial serial2; CoreGraphicsSerial serial2;
DirectLink *bound_windows; /* list of bound windows */ DirectLink *bound_windows; /* list of bound windows */
CoreWindow *boundto; /* window to which this window is bound */ CoreWindow *boundto; /* window to which this window is bound */
DFBWindowID parent_id; /* window id of parent window */ unsigned long resource_id;
}; };
typedef enum { typedef enum {
CWSF_NONE = 0x00000000, CWSF_NONE = 0x00000000,
CWSF_INITIALIZED = 0x00000001, CWSF_INITIALIZED = 0x00000001,
CWSF_ACTIVATED = 0x00000002, CWSF_ACTIVATED = 0x00000002,
CWSF_ALL = 0x00000003 CWSF_ALL = 0x00000003
} CoreWindowStackFlags; } CoreWindowStackFlags;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 windowstack.h   windowstack.h 
skipping to change at line 42 skipping to change at line 42
#include <core/coredefs.h> #include <core/coredefs.h>
#include <core/coretypes.h> #include <core/coretypes.h>
#include <fusion/lock.h> #include <fusion/lock.h>
/* /*
* allocates a WindowStack, initializes it, registers it for input events * allocates a WindowStack, initializes it, registers it for input events
*/ */
CoreWindowStack *dfb_windowstack_create ( CoreLayerContext *context ); CoreWindowStack *dfb_windowstack_create ( CoreLayerContext *context );
void dfb_windowstack_detach_devices( CoreWindowStack *stack );
void dfb_windowstack_destroy( CoreWindowStack *stack ); void dfb_windowstack_destroy( CoreWindowStack *stack );
void dfb_windowstack_resize ( CoreWindowStack *stack, void dfb_windowstack_resize ( CoreWindowStack *stack,
int width, int width,
int height ); int height );
DirectResult dfb_windowstack_lock ( CoreWindowStack *stack ); DirectResult dfb_windowstack_lock ( CoreWindowStack *stack );
DirectResult dfb_windowstack_unlock ( CoreWindowStack *stack ); DirectResult dfb_windowstack_unlock ( CoreWindowStack *stack );
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 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/