directfb.h   directfb.h 
skipping to change at line 901 skipping to change at line 901
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_SUBWINDOW = 0x00000010, /* Not a top level window. */ DWCAPS_SUBWINDOW = 0x00000010, /* Not a top level window. */
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 = 0x0000011F /* All of these. */ DWCAPS_ALL = 0x0000013F /* 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 4977 skipping to change at line 4982
/* /*
* 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.
*
* This is used in case you specified DWCAPS_COLOR.
* It specifies the window draw color.
*/
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 5335 skipping to change at line 5354
void **ret_value void **ret_value
); );
/* /*
* Set window rotation. * Set window rotation.
*/ */
DFBResult (*SetRotation) ( DFBResult (*SetRotation) (
IDirectFBWindow *thiz, IDirectFBWindow *thiz,
int rotation int rotation
); );
/** Association **/
/*
* Change the window association.
*
* If <b>window_id</b> is 0, the window will be dissociated.
*/
DFBResult (*SetAssociation) (
IDirectFBWindow *thiz,
DFBWindowID window_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. 4 change blocks. 
1 lines changed or deleted 33 lines changed or added


 directfb_strings.h   directfb_strings.h 
skipping to change at line 199 skipping to change at line 199
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_SUBWINDOW, "SUBWINDOW" }, \ { DWCAPS_SUBWINDOW, "SUBWINDOW" }, \
{ 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 (4) #define DIRECTFB_MINOR_VERSION (4)
#define DIRECTFB_MICRO_VERSION (0) #define DIRECTFB_MICRO_VERSION (1)
#define DIRECTFB_BINARY_AGE (0) #define DIRECTFB_BINARY_AGE (1)
#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


 fbdev.h   fbdev.h 
skipping to change at line 117 skipping to change at line 117
/* virtual framebuffer address */ /* virtual framebuffer address */
void *framebuffer_base; void *framebuffer_base;
int fd; /* file descriptor for /dev/fb */ int fd; /* file descriptor for /dev/fb */
VirtualTerminal *vt; VirtualTerminal *vt;
AGPDevice *agp; AGPDevice *agp;
} FBDev; } FBDev;
/*
* core init function, opens /dev/fb, get fbdev screeninfo
* disables font acceleration, reads mode list
*/
DFBResult dfb_fbdev_initialize( void );
DFBResult dfb_fbdev_join( void );
/*
* deinitializes DirectFB fbdev stuff and restores fbdev settings
*/
DFBResult dfb_fbdev_shutdown( bool emergency );
DFBResult dfb_fbdev_leave ( bool emergency );
const VideoMode *dfb_fbdev_find_mode( int width,
int height )
;
DFBResult dfb_fbdev_test_mode ( const VideoMode *mode,
const CoreLayerRegionConfig *config )
;
DFBResult dfb_fbdev_test_mode_simple( const VideoMode *mode );
DFBResult dfb_fbdev_set_mode ( const VideoMode *mode,
CoreSurface *surface,
unsigned int xoffset,
unsigned int yoffset
);
#endif #endif
 End of changes. 1 change blocks. 
27 lines changed or deleted 0 lines changed or added


 types.h   types.h 
skipping to change at line 53 skipping to change at line 53
# warning Fallback definition of bool using u8! Checking for 'flags & 0x10 0' or higher bits will be false :( # warning Fallback definition of bool using u8! Checking for 'flags & 0x10 0' or higher bits will be false :(
typedef u8 bool; typedef u8 bool;
# ifndef false # ifndef false
# define false (0) # define false (0)
# endif # endif
# ifndef true # ifndef true
# define true (!false) # define true (!false)
# endif # endif
#endif /* DIRECT_BUILD_STDBOOL */ #endif /* DIRECT_BUILD_STDBOOL */
/* makes it possible to prevent definition of "direct" standard types */
#ifndef __DIRECT__STDTYPES__
#define __DIRECT__STDTYPES__
#ifdef USE_KOS #ifdef USE_KOS
#include <sys/types.h> #include <sys/types.h>
typedef uint8 u8; typedef uint8 u8;
typedef uint16 u16; typedef uint16 u16;
typedef uint32 u32; typedef uint32 u32;
typedef uint64 u64; typedef uint64 u64;
typedef sint8 s8; typedef sint8 s8;
skipping to change at line 82 skipping to change at line 85
typedef uint16_t u16; typedef uint16_t u16;
typedef uint32_t u32; typedef uint32_t u32;
typedef uint64_t u64; typedef uint64_t u64;
typedef int8_t s8; typedef int8_t s8;
typedef int16_t s16; typedef int16_t s16;
typedef int32_t s32; typedef int32_t s32;
typedef int64_t s64; typedef int64_t s64;
#endif #endif
#endif /* __DIRECT__STDTYPES__ */
typedef enum { typedef enum {
DR_OK = 0x00000000, /* No error occured. */ DR_OK = 0x00000000, /* No error occured. */
DR_FAILURE, /* A general or unknown error occured. */ DR_FAILURE, /* A general or unknown error occured. */
DR_INIT, /* A general initialization error occured. */ DR_INIT, /* A general initialization error occured. */
DR_BUG, /* Internal bug or inconsistency has been detected . */ DR_BUG, /* Internal bug or inconsistency has been detected . */
DR_DEAD, /* Interface has a zero reference counter (availab le in debug mode). */ DR_DEAD, /* Interface has a zero reference counter (availab le in debug mode). */
DR_UNSUPPORTED, /* The requested operation or an argument is (curr ently) not supported. */ DR_UNSUPPORTED, /* The requested operation or an argument is (curr ently) not supported. */
DR_UNIMPLEMENTED, /* The requested operation is not implemented, yet . */ DR_UNIMPLEMENTED, /* The requested operation is not implemented, yet . */
DR_ACCESSDENIED, /* Access to the resource is denied. */ DR_ACCESSDENIED, /* Access to the resource is denied. */
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 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_ROTATION = 0x00040000, CWCF_ROTATION = 0x00040000,
CWCF_ALL = 0x0007133F CWCF_ALL = 0x0007177F
} 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 */
int rotation; int rotation;
DFBWindowID association;
}; };
#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 211 skipping to change at line 216
* 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 13 lines changed or added


 windows_internal.h   windows_internal.h 
skipping to change at line 103 skipping to change at line 103
CoreLayerRegion *region; /* hardware allocated window * / CoreLayerRegion *region; /* hardware allocated window * /
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 (window binding) */ CoreWindow *boundto; /* window to which this window is bound (window binding) */
DFBWindowID parent_id; /* window id of parent window
(window association) */
DFBWindowID toplevel_id; /* in case of a sub window top level_id != 0 */ DFBWindowID toplevel_id; /* in case of a sub window top level_id != 0 */
CoreWindow *toplevel; /* for top level windows this will be NULL */ CoreWindow *toplevel; /* for top level windows this will be NULL */
FusionVector subwindows; /* list of sub windows (only v alid for top level windows) */ FusionVector subwindows; /* list of sub windows (only v alid for top level windows) */
CoreWindow *subfocus; /* which of the sub windows ha s the focus? */ CoreWindow *subfocus; /* which of the sub windows ha s the focus? */
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. 2 change blocks. 
3 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/