conf.h   conf.h 
skipping to change at line 260 skipping to change at line 260
int max_font_rows; int max_font_rows;
int max_font_row_width; int max_font_row_width;
bool core_sighandler; bool core_sighandler;
bool linux_input_force; /* use linux-input with all system modules */ bool linux_input_force; /* use linux-input with all system modules */
u64 resource_id; u64 resource_id;
bool no_singleton; bool no_singleton;
bool x11_borderless;
DFBPoint x11_position;
} DFBConfig; } DFBConfig;
extern DFBConfig DIRECTFB_API *dfb_config; extern DFBConfig DIRECTFB_API *dfb_config;
/* /*
* Allocate Config struct, fill with defaults and parse command line option s * Allocate Config struct, fill with defaults and parse command line option s
* for overrides. Options identified as DirectFB options are stripped out * for overrides. Options identified as DirectFB options are stripped out
* of the array. * of the array.
*/ */
DFBResult DIRECTFB_API dfb_config_init( int *argc, char *(*argv[]) ); DFBResult DIRECTFB_API dfb_config_init( int *argc, char *(*argv[]) );
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 directfb.h   directfb.h 
skipping to change at line 1108 skipping to change at line 1108
ignored */ ignored */
DFFA_OUTLINED = 0x00000040, DFFA_OUTLINED = 0x00000040,
DFFA_AUTOHINTING = 0x00000080, /* prefer auto-hinter over the font's DFFA_AUTOHINTING = 0x00000080, /* prefer auto-hinter over the font's
native hinter */ native hinter */
DFFA_SOFTHINTING = 0x00000100, /* use a lighter hinting algor ithm DFFA_SOFTHINTING = 0x00000100, /* use a lighter hinting algor ithm
that produces glyphs that a re more that produces glyphs that a re more
fuzzy but better resemble t he fuzzy but better resemble t he
original shape */ original shape */
DFFA_STYLE_ITALIC = 0x00000200, /* load italic style */ DFFA_STYLE_ITALIC = 0x00000200, /* load italic style */
DFFA_VERTICAL_LAYOUT = 0x00000400, /* load vertical layout */ DFFA_VERTICAL_LAYOUT = 0x00000400, /* load vertical layout */
DFFA_STYLE_BOLD = 0x00000800, /* load bold style */
} DFBFontAttributes; } DFBFontAttributes;
/* /*
* Flags defining which fields of a DFBFontDescription are valid. * Flags defining which fields of a DFBFontDescription are valid.
*/ */
typedef enum { typedef enum {
DFDESC_ATTRIBUTES = 0x00000001, /* attributes field is valid * / DFDESC_ATTRIBUTES = 0x00000001, /* attributes field is valid * /
DFDESC_HEIGHT = 0x00000002, /* height is specified */ DFDESC_HEIGHT = 0x00000002, /* height is specified */
DFDESC_WIDTH = 0x00000004, /* width is specified */ DFDESC_WIDTH = 0x00000004, /* width is specified */
DFDESC_INDEX = 0x00000008, /* index is specified */ DFDESC_INDEX = 0x00000008, /* index is specified */
skipping to change at line 2492 skipping to change at line 2493
DSECAPS_FREQUENCY = 0x00000020, /* Can switch between different fre quencies. */ DSECAPS_FREQUENCY = 0x00000020, /* Can switch between different fre quencies. */
DSECAPS_BRIGHTNESS = 0x00000100, /* Adjustment of brightness is supp orted. */ DSECAPS_BRIGHTNESS = 0x00000100, /* Adjustment of brightness is supp orted. */
DSECAPS_CONTRAST = 0x00000200, /* Adjustment of contrast is suppor ted. */ DSECAPS_CONTRAST = 0x00000200, /* Adjustment of contrast is suppor ted. */
DSECAPS_HUE = 0x00000400, /* Adjustment of hue is supported. */ DSECAPS_HUE = 0x00000400, /* Adjustment of hue is supported. */
DSECAPS_SATURATION = 0x00000800, /* Adjustment of saturation is supp orted. */ DSECAPS_SATURATION = 0x00000800, /* Adjustment of saturation is supp orted. */
DSECAPS_CONNECTORS = 0x00001000, /* Select output connector(s). */ DSECAPS_CONNECTORS = 0x00001000, /* Select output connector(s). */
DSECAPS_SLOW_BLANKING = 0x00002000, /* Slow Blanking on outputs is sup ported. */ DSECAPS_SLOW_BLANKING = 0x00002000, /* Slow Blanking on outputs is sup ported. */
DSECAPS_RESOLUTION = 0x00004000, /* Different encoder resolutions su pported */ DSECAPS_RESOLUTION = 0x00004000, /* Different encoder resolutions su pported */
DSECAPS_FRAMING = 0x00008000, /* Can select picture framing mode for stereo */
DSECAPS_ALL = 0x00007f3f DSECAPS_ALL = 0x0000FF3F
} DFBScreenEncoderCapabilities; } DFBScreenEncoderCapabilities;
/* /*
* Type of display encoder. * Type of display encoder.
*/ */
typedef enum { typedef enum {
DSET_UNKNOWN = 0x00000000, /* Unknown type */ DSET_UNKNOWN = 0x00000000, /* Unknown type */
DSET_CRTC = 0x00000001, /* Encoder is a CRTC. */ DSET_CRTC = 0x00000001, /* Encoder is a CRTC. */
DSET_TV = 0x00000002, /* TV output encoder. */ DSET_TV = 0x00000002, /* TV output encoder. */
skipping to change at line 2617 skipping to change at line 2619
DSETP_CYAN = 0x00000030, /* Whole screen (00, ff, ff). */ DSETP_CYAN = 0x00000030, /* Whole screen (00, ff, ff). */
DSETP_GREEN = 0x00000040, /* Whole screen (00, ff, 00). */ DSETP_GREEN = 0x00000040, /* Whole screen (00, ff, 00). */
DSETP_MAGENTA = 0x00000050, /* Whole screen (ff, 00, ff). */ DSETP_MAGENTA = 0x00000050, /* Whole screen (ff, 00, ff). */
DSETP_RED = 0x00000060, /* Whole screen (ff, 00, 00). */ DSETP_RED = 0x00000060, /* Whole screen (ff, 00, 00). */
DSETP_BLUE = 0x00000070, /* Whole screen (00, 00, ff). */ DSETP_BLUE = 0x00000070, /* Whole screen (00, 00, ff). */
DSETP_BLACK = 0x00000080 /* Whole screen (00, 00, 00). */ DSETP_BLACK = 0x00000080 /* Whole screen (00, 00, 00). */
} DFBScreenEncoderTestPicture; } DFBScreenEncoderTestPicture;
/* /*
* Encoder picture delivery method. * Encoder picture delivery method.
* See HDMI Specification 1.4a - Extraction of 3D signaling portion for mor e details
*/ */
typedef enum { typedef enum {
DSEPF_UNKNOWN = 0, DSEPF_UNKNOWN = 0,
DSEPF_MONO = 0x00000001, /* Normal output to non-s DSEPF_MONO = 0x00000001, /* Normal output to
tereoscopic (3D) TV. No non-stereoscopic (3D) TV. No
L/R content provided t L/R content provi
o TV. Frame is output on ded to TV. Frame is output on
each vsync. */ each vsync. */
DSEPF_STEREO_PACKED_HORIZ = 0x00000002, /* L/R frames are downsca DSEPF_STEREO_SIDE_BY_SIDE_HALF = 0x00000002, /* L/R frames are do
led horizontally by 2 and wnscaled horizontally by 2 and
packed side-by-side in packed side-by-si
to a single frame, left on left de into a single frame, left on left
half of frame. The pac half of frame. Th
ked frame is output on each e packed frame is output on each
vsync. Some stereoscop vsync. Some stere
ic TV's support this mode oscopic TV's support this mode
using HDMI v1.3 and a using HDMI v1.3 a
special menu configuration. */ nd a special menu configuration. */
DSEPF_STEREO_PACKED_VERT = 0x00000004, /* L/R frames are downsca DSEPF_STEREO_TOP_AND_BOTTOM = 0x00000004, /* L/R frames are do
led vertically by 2 and wnscaled vertically by 2 and
packed into a single f packed into a sin
rame, left on top. The packed gle frame, left on top. The packed
frame is output on eac frame is output o
h vsync. Some stereoscopic TV's n each vsync. Some stereoscopic TV's
support this mode usin support this mode
g HDMI v1.3 and a special using HDMI v1.3 and a special
menu configuration. */ menu configuratio
DSEPF_STEREO_SEQUENTIAL = 0x00000008 /* Full resolution L/R fr n. */
ames are delivered sequentially DSEPF_STEREO_FRAME_PACKING = 0x00000008, /* Full resolution L
to the TV, alternating /R frames or fields are delivered sequentially
left & right. Vsync occurs at to the TV, altern
2x equivalent non-ster ating left & right with an active
eo frequency (i.e. 24Hz output space between eac
frequency causes 48Hz h video frame. Vsync occurs
vsync frequency to obtain both after each sequen
left & right frames at ce of: vblank, left eye video frame,
24Hz rate). Requires HDMI v1.4. */ active space, rig
ht eye video frame. Requires HDMI v1.4a. */
DSEPF_STEREO_SIDE_BY_SIDE_FULL = 0x00000010, /* L/R frames are pa
cked side-by-side into a double width
single frame, lef
t on left half of frame. The packed
frame is output o
n each vsync. Requires HDMI v1.4a. */
DSEPF_ALL = 0x0000001f
} DFBScreenEncoderPictureFraming; } DFBScreenEncoderPictureFraming;
#ifndef DIRECTFB_DISABLE_DEPRECATED
#define DSEPF_STEREO_PACKED_HORIZ DSEPF_STEREO_SIDE_BY_SIDE_HALF
#define DSEPF_STEREO_PACKED_VERT DSEPF_STEREO_TOP_AND_BOTTOM
#define DSEPF_STEREO_SEQUENTIAL DSEPF_STEREO_FRAME_PACKING
#endif
/* /*
* Configuration of a display encoder. * Configuration of a display encoder.
*/ */
typedef struct { typedef struct {
DFBScreenEncoderConfigFlags flags; /* Validates st ruct members. */ DFBScreenEncoderConfigFlags flags; /* Validates st ruct members. */
DFBScreenEncoderTVStandards tv_standard; /* TV standard. */ DFBScreenEncoderTVStandards tv_standard; /* TV standard. */
DFBScreenEncoderTestPicture test_picture; /* Test picture mode. */ DFBScreenEncoderTestPicture test_picture; /* Test picture mode. */
int mixer; /* Selected mix er. */ int mixer; /* Selected mix er. */
DFBScreenOutputSignals out_signals; /* Generated ou tput signals. */ DFBScreenOutputSignals out_signals; /* Generated ou tput signals. */
 End of changes. 6 change blocks. 
36 lines changed or deleted 54 lines changed or added


 directfb_strings.h   directfb_strings.h 
skipping to change at line 298 skipping to change at line 298
{ DSECAPS_OUT_SIGNALS, "OUT_SIGNALS" }, \ { DSECAPS_OUT_SIGNALS, "OUT_SIGNALS" }, \
{ DSECAPS_SCANMODE, "SCANMODE" }, \ { DSECAPS_SCANMODE, "SCANMODE" }, \
{ DSECAPS_FREQUENCY, "FREQUENCY" }, \ { DSECAPS_FREQUENCY, "FREQUENCY" }, \
{ DSECAPS_BRIGHTNESS, "BRIGHTNESS" }, \ { DSECAPS_BRIGHTNESS, "BRIGHTNESS" }, \
{ DSECAPS_CONTRAST, "CONTRAST" }, \ { DSECAPS_CONTRAST, "CONTRAST" }, \
{ DSECAPS_HUE, "HUE" }, \ { DSECAPS_HUE, "HUE" }, \
{ DSECAPS_SATURATION, "SATURATION" }, \ { DSECAPS_SATURATION, "SATURATION" }, \
{ DSECAPS_CONNECTORS, "CONNECTORS" }, \ { DSECAPS_CONNECTORS, "CONNECTORS" }, \
{ DSECAPS_SLOW_BLANKING, "SLOW_BLANKING" }, \ { DSECAPS_SLOW_BLANKING, "SLOW_BLANKING" }, \
{ DSECAPS_RESOLUTION, "RESOLUTION" }, \ { DSECAPS_RESOLUTION, "RESOLUTION" }, \
{ DSECAPS_FRAMING, "FRAMING" }, \
{ DSECAPS_NONE, "NONE" } \ { DSECAPS_NONE, "NONE" } \
}; };
struct DFBScreenEncoderTypeName { struct DFBScreenEncoderTypeName {
DFBScreenEncoderType type; DFBScreenEncoderType type;
const char *name; const char *name;
}; };
#define DirectFBScreenEncoderTypeNames(Identifier) struct DFBScreenEncoderT ypeName Identifier[] = { \ #define DirectFBScreenEncoderTypeNames(Identifier) struct DFBScreenEncoderT ypeName Identifier[] = { \
{ DSET_CRTC, "CRTC" }, \ { DSET_CRTC, "CRTC" }, \
 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 (5) #define DIRECTFB_MINOR_VERSION (5)
#define DIRECTFB_MICRO_VERSION (2) #define DIRECTFB_MICRO_VERSION (3)
#define DIRECTFB_BINARY_AGE (2) #define DIRECTFB_BINARY_AGE (3)
#define DIRECTFB_INTERFACE_AGE (2) #define DIRECTFB_INTERFACE_AGE (3)
#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 284 skipping to change at line 284
/* /*
* Signal beginning of a sequence of operations using this state. * Signal beginning of a sequence of operations using this state.
* Any number of states can be 'drawing'. * Any number of states can be 'drawing'.
*/ */
void (*StartDrawing)( void *driver_data, void *device_data, CardState *state ); void (*StartDrawing)( void *driver_data, void *device_data, CardState *state );
/* /*
* Signal end of sequence, i.e. destination surface is consistent agai n. * Signal end of sequence, i.e. destination surface is consistent agai n.
*/ */
void (*StopDrawing)( void *driver_data, void *device_data, CardState * state ); void (*StopDrawing)( void *driver_data, void *device_data, CardState * state );
/*
* BatchBlit
*
* When driver returns false (late fallback), it may set *ret_num
* to the number of successful blits in case of partial execution.
*/
bool (*BatchBlit)( void *driver_data, void *device_data,
const DFBRectangle *rects, const DFBPoint *points,
unsigned int num, unsigned int *ret_num );
/*
* BatchFill
*
* When driver returns false (late fallback), it may set *ret_num
* to the number of successful fills in case of partial execution.
*/
bool (*BatchFill)( void *driver_data, void *device_data,
const DFBRectangle *rects,
unsigned int num, unsigned int *ret_num );
} GraphicsDeviceFuncs; } GraphicsDeviceFuncs;
typedef struct { typedef struct {
int (*Probe) (CoreGraphicsDevice *device); int (*Probe) (CoreGraphicsDevice *device);
void (*GetDriverInfo) (CoreGraphicsDevice *device, void (*GetDriverInfo) (CoreGraphicsDevice *device,
GraphicsDriverInfo *driver_info); GraphicsDriverInfo *driver_info);
DFBResult (*InitDriver) (CoreGraphicsDevice *device, DFBResult (*InitDriver) (CoreGraphicsDevice *device,
GraphicsDeviceFuncs *funcs, GraphicsDeviceFuncs *funcs,
void *driver_data, void *driver_data,
 End of changes. 1 change blocks. 
0 lines changed or deleted 20 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/