conf.h   conf.h 
skipping to change at line 246 skipping to change at line 246
struct { struct {
DFBDimension min_size; DFBDimension min_size;
} allocate_buffer; } allocate_buffer;
} warn; } warn;
int keep_accumulators; /* Free accumulators abov e this limit */ int keep_accumulators; /* Free accumulators abov e this limit */
bool software_trace; bool software_trace;
unsigned int max_axis_rate;
bool cursor_automation; bool cursor_automation;
int max_font_rows; int max_font_rows;
int max_font_row_width; int max_font_row_width;
} DFBConfig; } DFBConfig;
extern DFBConfig *dfb_config; extern DFBConfig *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
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 directfb.h   directfb.h 
skipping to change at line 1023 skipping to change at line 1023
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 */
DFDESC_FIXEDADVANCE = 0x00000010, /* specify a fixed advance ove rriding DFDESC_FIXEDADVANCE = 0x00000010, /* specify a fixed advance ove rriding
any character advance of fi xed or any character advance of fi xed or
proportional fonts */ proportional fonts */
DFDESC_FRACT_HEIGHT = 0x00000020, /* fractional height is set */ DFDESC_FRACT_HEIGHT = 0x00000020, /* fractional height is set */
DFDESC_FRACT_WIDTH = 0x00000040, /* fractional width is set */ DFDESC_FRACT_WIDTH = 0x00000040, /* fractional width is set */
DFDESC_OUTLINE_WIDTH = 0x00000080, /* outline width is set */ DFDESC_OUTLINE_WIDTH = 0x00000080, /* outline width is set */
DFDESC_OUTLINE_OPACITY = 0x00000100, /* outline opacity is set */ DFDESC_OUTLINE_OPACITY = 0x00000100, /* outline opacity is set */
DFDESC_ROTATION = 0x00000200, /* rotation is set */
} DFBFontDescriptionFlags; } DFBFontDescriptionFlags;
/* /*
* Description of how to load glyphs from a font file. * Description of how to load glyphs from a font file.
* *
* The attributes control how the glyphs are rendered. Width and height can be used to specify the * The attributes control how the glyphs are rendered. Width and height can be used to specify the
* desired face size in pixels. If you are loading a non-scalable font, you shouldn't specify a * desired face size in pixels. If you are loading a non-scalable font, you shouldn't specify a
* font size. * font size.
* *
* Please note that the height value in the DFBFontDescription doesn't corr espond to the height * Please note that the height value in the DFBFontDescription doesn't corr espond to the height
* returned by IDirectFBFont::GetHeight(). * returned by IDirectFBFont::GetHeight().
* *
* The index field controls which face is loaded from a font file that prov ides a collection of * The index field controls which face is loaded from a font file that prov ides a collection of
* faces. This is rarely needed. * faces. This is rarely needed.
* *
* Fractional sizes (fract_height and fract_width) are 26.6 fixed point int egers and override * Fractional sizes (fract_height and fract_width) are 26.6 fixed point int egers and override
* the pixel sizes if both are specified. * the pixel sizes if both are specified.
* *
* Outline parameters are ignored if DFFA_OUTLINED is not used (see DFBFont Attributes). To change the * Outline parameters are ignored if DFFA_OUTLINED is not used (see DFBFont Attributes). To change the
* default values of 1.0 each use DFDESC_OUTLINE_WIDTH and/or DFDESC_OUTLIN E_OPACITY. * default values of 1.0 each use DFDESC_OUTLINE_WIDTH and/or DFDESC_OUTLIN E_OPACITY.
*
* The rotation value is a 0.24 fixed point number of rotations. Use the m
acros DFB_DEGREES
* and DFB_RADIANS to convert from those units.
*/ */
typedef struct { typedef struct {
DFBFontDescriptionFlags flags; DFBFontDescriptionFlags flags;
DFBFontAttributes attributes; DFBFontAttributes attributes;
int height; int height;
int width; int width;
unsigned int index; unsigned int index;
int fixed_advance; int fixed_advance;
int fract_height; int fract_height;
int fract_width; int fract_width;
int outline_width; /* Outline widt h as 16.16 fixed point integer */ int outline_width; /* Outline widt h as 16.16 fixed point integer */
int outline_opacity; /* Outline opac ity as 16.16 fixed point integer */ int outline_opacity; /* Outline opac ity as 16.16 fixed point integer */
int rotation;
} DFBFontDescription; } DFBFontDescription;
#define DFB_DEGREES(deg) ((int)((deg)/360.0*(1<<24)))
#define DFB_RADIANS(rad) ((int)((rad)/(2.0*M_PI)*(1<<24)))
/* /*
* @internal * @internal
* *
* Encodes format constants in the following way (bit 31 - 0): * Encodes format constants in the following way (bit 31 - 0):
* *
* lkjj:hhgg | gfff:eeed | cccc:bbbb | baaa:aaaa * lkjj:hhgg | gfff:eeed | cccc:bbbb | baaa:aaaa
* *
* a) pixelformat index<br> * a) pixelformat index<br>
* b) effective color (or index) bits per pixel of format<br> * b) effective color (or index) bits per pixel of format<br>
* c) effective alpha bits per pixel of format<br> * c) effective alpha bits per pixel of format<br>
skipping to change at line 3139 skipping to change at line 3148
int rotation int rotation
); );
/* /*
* Get the rotation of data within the layer. * Get the rotation of data within the layer.
*/ */
DFBResult (*GetRotation) ( DFBResult (*GetRotation) (
IDirectFBDisplayLayer *thiz, IDirectFBDisplayLayer *thiz,
int *ret_rotation int *ret_rotation
); );
/** Windows **/
/*
* Retrieve an interface to an existing window.
*
* The window is identified by its surface' resource id.
*/
DFBResult (*GetWindowByResourceID) (
IDirectFBDisplayLayer *thiz,
unsigned long resource_id,
IDirectFBWindow **ret_interface
);
) )
/* /*
* Flipping flags controlling the behaviour of IDirectFBSurface::Flip(). * Flipping flags controlling the behaviour of IDirectFBSurface::Flip().
*/ */
typedef enum { typedef enum {
DSFLIP_NONE = 0x00000000, /* None of these. */ DSFLIP_NONE = 0x00000000, /* None of these. */
DSFLIP_WAIT = 0x00000001, /* Flip() returns upon vertical syn c. Flipping is still done DSFLIP_WAIT = 0x00000001, /* Flip() returns upon vertical syn c. Flipping is still done
immediately unless DSFLIP_ONSYNC is specified, too. */ immediately unless DSFLIP_ONSYNC is specified, too. */
skipping to change at line 4597 skipping to change at line 4619
the window */ the window */
DWET_LEAVE = 0x00100000, /* mouse cursor left the window */ DWET_LEAVE = 0x00100000, /* mouse cursor left the window */
DWET_WHEEL = 0x00200000, /* mouse wheel was moved while DWET_WHEEL = 0x00200000, /* mouse wheel was moved while
window has focus */ window has focus */
DWET_POSITION_SIZE = DWET_POSITION | DWET_SIZE,/* initially sent to DWET_POSITION_SIZE = DWET_POSITION | DWET_SIZE,/* initially sent to
window when it's window when it's
created */ created */
DWET_ALL = 0x003F033F /* all event types */ DWET_UPDATE = 0x01000000,
DWET_ALL = 0x013F033F /* all event types */
} DFBWindowEventType; } DFBWindowEventType;
/* /*
* Flags for a window event. * Flags for a window event.
*/ */
typedef enum { typedef enum {
DWEF_NONE = 0x00000000, /* none of these */ DWEF_NONE = 0x00000000, /* none of these */
DWEF_RETURNED = 0x00000001, /* This is a returned event, e.g. u nconsumed key. */ DWEF_RETURNED = 0x00000001, /* This is a returned event, e.g. u nconsumed key. */
DWEF_RELATIVE = 0x00000002, /* This is a relative motion event (using DWCF_RELATIVE) */
DWEF_REPEAT = 0x00000010, /* repeat event, e.g. repeating key */ DWEF_REPEAT = 0x00000010, /* repeat event, e.g. repeating key */
DWEF_ALL = 0x00000011 /* all of these */ DWEF_ALL = 0x00000013 /* all of these */
} DFBWindowEventFlags; } DFBWindowEventFlags;
/* /*
* Video Provider Event Types - can also be used as flags for event filters . * Video Provider Event Types - can also be used as flags for event filters .
*/ */
typedef enum { typedef enum {
DVPET_NONE = 0x00000000, DVPET_NONE = 0x00000000,
DVPET_STARTED = 0x00000001, /* The video provider has started the playback */ DVPET_STARTED = 0x00000001, /* The video provider has started the playback */
DVPET_STOPPED = 0x00000002, /* The video provider has stopped the playback */ DVPET_STOPPED = 0x00000002, /* The video provider has stopped the playback */
DVPET_SPEEDCHANGE = 0x00000004, /* A speed change has occured */ DVPET_SPEEDCHANGE = 0x00000004, /* A speed change has occured */
skipping to change at line 4955 skipping to change at line 4980
DWGM_LOCATION = 0x00000003 /* Use relative values as defined. */ DWGM_LOCATION = 0x00000003 /* Use relative values as defined. */
} DFBWindowGeometryMode; } DFBWindowGeometryMode;
typedef struct { typedef struct {
DFBWindowGeometryMode mode; DFBWindowGeometryMode mode;
DFBRectangle rectangle; DFBRectangle rectangle;
DFBLocation location; DFBLocation location;
} DFBWindowGeometry; } DFBWindowGeometry;
typedef enum {
DWCF_NONE = 0x00000000,
DWCF_RELATIVE = 0x00000001,
DWCF_EXPLICIT = 0x00000002,
DWCF_UNCLIPPED = 0x00000004,
DWCF_TRAPPED = 0x00000008,
DWCF_FIXED = 0x00000010,
DWCF_INVISIBLE = 0x00000020,
DWCF_ALL = 0x0000003F
} DFBWindowCursorFlags;
/******************* /*******************
* IDirectFBWindow * * IDirectFBWindow *
*******************/ *******************/
/* /*
* <i>No summary yet...</i> * <i>No summary yet...</i>
*/ */
DEFINE_INTERFACE( IDirectFBWindow, DEFINE_INTERFACE( IDirectFBWindow,
/** Retrieving information **/ /** Retrieving information **/
skipping to change at line 5530 skipping to change at line 5568
/** Updates **/ /** Updates **/
/* /*
* Signal start of window content updates. * Signal start of window content updates.
*/ */
DFBResult (*BeginUpdates) ( DFBResult (*BeginUpdates) (
IDirectFBWindow *thiz, IDirectFBWindow *thiz,
const DFBRegion *update const DFBRegion *update
); );
/** Events **/
/*
* Send event
*/
DFBResult (*SendEvent) (
IDirectFBWindow *thiz,
const DFBWindowEvent *event
);
/** Cursor **/
/*
* Set cursor flags (active when in focus).
*/
DFBResult (*SetCursorFlags) (
IDirectFBWindow *thiz,
DFBWindowCursorFlags flags
);
/*
* Set cursor resolution (coordinate space for cursor within window).
*
* The default cursor resolution is the surface dimensions.
*/
DFBResult (*SetCursorResolution) (
IDirectFBWindow *thiz,
const DFBDimension *resolution
);
/*
* Set cursor position within window coordinates (surface or cursor re
solution).
*/
DFBResult (*SetCursorPosition) (
IDirectFBWindow *thiz,
int x,
int y
);
) )
/* /*
* 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
); );
skipping to change at line 5573 skipping to change at line 5650
* the logical extents of this font. * the logical extents of this font.
* *
* This is a negative value! * This is a negative value!
*/ */
DFBResult (*GetDescender) ( DFBResult (*GetDescender) (
IDirectFBFont *thiz, IDirectFBFont *thiz,
int *ret_descender int *ret_descender
); );
/* /*
* Get the logical height of this font. This is the vertical * Get the logical height of this font. This is the
* distance from one baseline to the next when writing * distance from one baseline to the next when writing
* several lines of text. Note that this value does not * several lines of text. Note that this value does not
* correspond the height value specified when loading the * correspond the height value specified when loading the
* font. * font.
*/ */
DFBResult (*GetHeight) ( DFBResult (*GetHeight) (
IDirectFBFont *thiz, IDirectFBFont *thiz,
int *ret_height int *ret_height
); );
skipping to change at line 5754 skipping to change at line 5831
/** Resources **/ /** Resources **/
/* /*
* Dispose resources used by the font. * Dispose resources used by the font.
* *
* Keeps font usable, recreating resources as needed. * Keeps font usable, recreating resources as needed.
*/ */
DFBResult (*Dispose) ( DFBResult (*Dispose) (
IDirectFBFont *thiz IDirectFBFont *thiz
); );
/** Measurements **/
/*
* Get the line spacing vector of this font. This is the
* displacement vector from one line to the next when writing
* several lines of text. It differs from the height only
* when the font is rotated.
*/
DFBResult (*GetLineSpacingVector) (
IDirectFBFont *thiz,
int *ret_xspacing,
int *ret_yspacing
);
/*
* Get the extents of a glyph specified by its character code (extende
d version).
*
* The rectangle describes the the smallest rectangle
* containing all pixels that are touched when drawing the
* glyph. It is reported relative to the baseline. If you
* only need the advance, pass NULL for the rectangle.
*
* The advance describes the horizontal offset to the next
* glyph (without kerning applied). It may be a negative
* value indicating left-to-right rendering. If you don't
* need this value, pass NULL for advance.
*/
DFBResult (*GetGlyphExtentsXY) (
IDirectFBFont *thiz,
unsigned int character,
DFBRectangle *ret_rect,
int *ret_xadvance,
int *ret_yadvance
);
) )
/* /*
* Capabilities of an image. * Capabilities of an image.
*/ */
typedef enum { typedef enum {
DICAPS_NONE = 0x00000000, /* None of these. */ DICAPS_NONE = 0x00000000, /* None of these. */
DICAPS_ALPHACHANNEL = 0x00000001, /* The image data contains an DICAPS_ALPHACHANNEL = 0x00000001, /* The image data contains an
alphachannel. */ alphachannel. */
DICAPS_COLORKEY = 0x00000002 /* The image has a colorkey, DICAPS_COLORKEY = 0x00000002 /* The image has a colorkey,
 End of changes. 12 change blocks. 
3 lines changed or deleted 118 lines changed or added


 directfb_keyboard.h   directfb_keyboard.h 
skipping to change at line 616 skipping to change at line 616
DIKS_CUSTOM89 = DFB_CUSTOM_KEY( 89 ), DIKS_CUSTOM89 = DFB_CUSTOM_KEY( 89 ),
DIKS_CUSTOM90 = DFB_CUSTOM_KEY( 90 ), DIKS_CUSTOM90 = DFB_CUSTOM_KEY( 90 ),
DIKS_CUSTOM91 = DFB_CUSTOM_KEY( 91 ), DIKS_CUSTOM91 = DFB_CUSTOM_KEY( 91 ),
DIKS_CUSTOM92 = DFB_CUSTOM_KEY( 92 ), DIKS_CUSTOM92 = DFB_CUSTOM_KEY( 92 ),
DIKS_CUSTOM93 = DFB_CUSTOM_KEY( 93 ), DIKS_CUSTOM93 = DFB_CUSTOM_KEY( 93 ),
DIKS_CUSTOM94 = DFB_CUSTOM_KEY( 94 ), DIKS_CUSTOM94 = DFB_CUSTOM_KEY( 94 ),
DIKS_CUSTOM95 = DFB_CUSTOM_KEY( 95 ), DIKS_CUSTOM95 = DFB_CUSTOM_KEY( 95 ),
DIKS_CUSTOM96 = DFB_CUSTOM_KEY( 96 ), DIKS_CUSTOM96 = DFB_CUSTOM_KEY( 96 ),
DIKS_CUSTOM97 = DFB_CUSTOM_KEY( 97 ), DIKS_CUSTOM97 = DFB_CUSTOM_KEY( 97 ),
DIKS_CUSTOM98 = DFB_CUSTOM_KEY( 98 ), DIKS_CUSTOM98 = DFB_CUSTOM_KEY( 98 ),
DIKS_CUSTOM99 = DFB_CUSTOM_KEY( 99 ) DIKS_CUSTOM99 = DFB_CUSTOM_KEY( 99 ),
DIKS_CUSTOM100 = DFB_CUSTOM_KEY( 100 ),
DIKS_CUSTOM101 = DFB_CUSTOM_KEY( 101 ),
DIKS_CUSTOM102 = DFB_CUSTOM_KEY( 102 ),
DIKS_CUSTOM103 = DFB_CUSTOM_KEY( 103 ),
DIKS_CUSTOM104 = DFB_CUSTOM_KEY( 104 ),
DIKS_CUSTOM105 = DFB_CUSTOM_KEY( 105 ),
DIKS_CUSTOM106 = DFB_CUSTOM_KEY( 106 ),
DIKS_CUSTOM107 = DFB_CUSTOM_KEY( 107 ),
DIKS_CUSTOM108 = DFB_CUSTOM_KEY( 108 ),
DIKS_CUSTOM109 = DFB_CUSTOM_KEY( 109 ),
DIKS_CUSTOM110 = DFB_CUSTOM_KEY( 110 ),
DIKS_CUSTOM111 = DFB_CUSTOM_KEY( 111 ),
DIKS_CUSTOM112 = DFB_CUSTOM_KEY( 112 ),
DIKS_CUSTOM113 = DFB_CUSTOM_KEY( 113 ),
DIKS_CUSTOM114 = DFB_CUSTOM_KEY( 114 ),
DIKS_CUSTOM115 = DFB_CUSTOM_KEY( 115 ),
DIKS_CUSTOM116 = DFB_CUSTOM_KEY( 116 ),
DIKS_CUSTOM117 = DFB_CUSTOM_KEY( 117 ),
DIKS_CUSTOM118 = DFB_CUSTOM_KEY( 118 ),
DIKS_CUSTOM119 = DFB_CUSTOM_KEY( 119 ),
DIKS_CUSTOM120 = DFB_CUSTOM_KEY( 120 ),
DIKS_CUSTOM121 = DFB_CUSTOM_KEY( 121 ),
DIKS_CUSTOM122 = DFB_CUSTOM_KEY( 122 ),
DIKS_CUSTOM123 = DFB_CUSTOM_KEY( 123 ),
DIKS_CUSTOM124 = DFB_CUSTOM_KEY( 124 ),
DIKS_CUSTOM125 = DFB_CUSTOM_KEY( 125 ),
DIKS_CUSTOM126 = DFB_CUSTOM_KEY( 126 ),
DIKS_CUSTOM127 = DFB_CUSTOM_KEY( 127 ),
DIKS_CUSTOM128 = DFB_CUSTOM_KEY( 128 ),
DIKS_CUSTOM129 = DFB_CUSTOM_KEY( 129 ),
DIKS_CUSTOM130 = DFB_CUSTOM_KEY( 130 ),
DIKS_CUSTOM131 = DFB_CUSTOM_KEY( 131 ),
DIKS_CUSTOM132 = DFB_CUSTOM_KEY( 132 ),
DIKS_CUSTOM133 = DFB_CUSTOM_KEY( 133 ),
DIKS_CUSTOM134 = DFB_CUSTOM_KEY( 134 ),
DIKS_CUSTOM135 = DFB_CUSTOM_KEY( 135 ),
DIKS_CUSTOM136 = DFB_CUSTOM_KEY( 136 ),
DIKS_CUSTOM137 = DFB_CUSTOM_KEY( 137 ),
DIKS_CUSTOM138 = DFB_CUSTOM_KEY( 138 ),
DIKS_CUSTOM139 = DFB_CUSTOM_KEY( 139 ),
DIKS_CUSTOM140 = DFB_CUSTOM_KEY( 140 ),
DIKS_CUSTOM141 = DFB_CUSTOM_KEY( 141 ),
DIKS_CUSTOM142 = DFB_CUSTOM_KEY( 142 ),
DIKS_CUSTOM143 = DFB_CUSTOM_KEY( 143 ),
DIKS_CUSTOM144 = DFB_CUSTOM_KEY( 144 ),
DIKS_CUSTOM145 = DFB_CUSTOM_KEY( 145 ),
DIKS_CUSTOM146 = DFB_CUSTOM_KEY( 146 ),
DIKS_CUSTOM147 = DFB_CUSTOM_KEY( 147 ),
DIKS_CUSTOM148 = DFB_CUSTOM_KEY( 148 ),
DIKS_CUSTOM149 = DFB_CUSTOM_KEY( 149 ),
DIKS_CUSTOM150 = DFB_CUSTOM_KEY( 150 ),
DIKS_CUSTOM151 = DFB_CUSTOM_KEY( 151 ),
DIKS_CUSTOM152 = DFB_CUSTOM_KEY( 152 ),
DIKS_CUSTOM153 = DFB_CUSTOM_KEY( 153 ),
DIKS_CUSTOM154 = DFB_CUSTOM_KEY( 154 ),
DIKS_CUSTOM155 = DFB_CUSTOM_KEY( 155 ),
DIKS_CUSTOM156 = DFB_CUSTOM_KEY( 156 ),
DIKS_CUSTOM157 = DFB_CUSTOM_KEY( 157 ),
DIKS_CUSTOM158 = DFB_CUSTOM_KEY( 158 ),
DIKS_CUSTOM159 = DFB_CUSTOM_KEY( 159 ),
DIKS_CUSTOM160 = DFB_CUSTOM_KEY( 160 ),
DIKS_CUSTOM161 = DFB_CUSTOM_KEY( 161 ),
DIKS_CUSTOM162 = DFB_CUSTOM_KEY( 162 ),
DIKS_CUSTOM163 = DFB_CUSTOM_KEY( 163 ),
DIKS_CUSTOM164 = DFB_CUSTOM_KEY( 164 ),
DIKS_CUSTOM165 = DFB_CUSTOM_KEY( 165 ),
DIKS_CUSTOM166 = DFB_CUSTOM_KEY( 166 ),
DIKS_CUSTOM167 = DFB_CUSTOM_KEY( 167 ),
DIKS_CUSTOM168 = DFB_CUSTOM_KEY( 168 ),
DIKS_CUSTOM169 = DFB_CUSTOM_KEY( 169 ),
DIKS_CUSTOM170 = DFB_CUSTOM_KEY( 170 ),
DIKS_CUSTOM171 = DFB_CUSTOM_KEY( 171 ),
DIKS_CUSTOM172 = DFB_CUSTOM_KEY( 172 ),
DIKS_CUSTOM173 = DFB_CUSTOM_KEY( 173 ),
DIKS_CUSTOM174 = DFB_CUSTOM_KEY( 174 ),
DIKS_CUSTOM175 = DFB_CUSTOM_KEY( 175 ),
DIKS_CUSTOM176 = DFB_CUSTOM_KEY( 176 ),
DIKS_CUSTOM177 = DFB_CUSTOM_KEY( 177 ),
DIKS_CUSTOM178 = DFB_CUSTOM_KEY( 178 ),
DIKS_CUSTOM179 = DFB_CUSTOM_KEY( 179 ),
DIKS_CUSTOM180 = DFB_CUSTOM_KEY( 180 ),
DIKS_CUSTOM181 = DFB_CUSTOM_KEY( 181 ),
DIKS_CUSTOM182 = DFB_CUSTOM_KEY( 182 ),
DIKS_CUSTOM183 = DFB_CUSTOM_KEY( 183 ),
DIKS_CUSTOM184 = DFB_CUSTOM_KEY( 184 ),
DIKS_CUSTOM185 = DFB_CUSTOM_KEY( 185 ),
DIKS_CUSTOM186 = DFB_CUSTOM_KEY( 186 ),
DIKS_CUSTOM187 = DFB_CUSTOM_KEY( 187 ),
DIKS_CUSTOM188 = DFB_CUSTOM_KEY( 188 ),
DIKS_CUSTOM189 = DFB_CUSTOM_KEY( 189 ),
DIKS_CUSTOM190 = DFB_CUSTOM_KEY( 190 ),
DIKS_CUSTOM191 = DFB_CUSTOM_KEY( 191 ),
DIKS_CUSTOM192 = DFB_CUSTOM_KEY( 192 ),
DIKS_CUSTOM193 = DFB_CUSTOM_KEY( 193 ),
DIKS_CUSTOM194 = DFB_CUSTOM_KEY( 194 ),
DIKS_CUSTOM195 = DFB_CUSTOM_KEY( 195 ),
DIKS_CUSTOM196 = DFB_CUSTOM_KEY( 196 ),
DIKS_CUSTOM197 = DFB_CUSTOM_KEY( 197 ),
DIKS_CUSTOM198 = DFB_CUSTOM_KEY( 198 ),
DIKS_CUSTOM199 = DFB_CUSTOM_KEY( 199 ),
DIKS_CUSTOM200 = DFB_CUSTOM_KEY( 200 ),
DIKS_CUSTOM201 = DFB_CUSTOM_KEY( 201 ),
DIKS_CUSTOM202 = DFB_CUSTOM_KEY( 202 ),
DIKS_CUSTOM203 = DFB_CUSTOM_KEY( 203 ),
DIKS_CUSTOM204 = DFB_CUSTOM_KEY( 204 ),
DIKS_CUSTOM205 = DFB_CUSTOM_KEY( 205 ),
DIKS_CUSTOM206 = DFB_CUSTOM_KEY( 206 ),
DIKS_CUSTOM207 = DFB_CUSTOM_KEY( 207 ),
DIKS_CUSTOM208 = DFB_CUSTOM_KEY( 208 ),
DIKS_CUSTOM209 = DFB_CUSTOM_KEY( 209 ),
DIKS_CUSTOM210 = DFB_CUSTOM_KEY( 210 ),
DIKS_CUSTOM211 = DFB_CUSTOM_KEY( 211 ),
DIKS_CUSTOM212 = DFB_CUSTOM_KEY( 212 ),
DIKS_CUSTOM213 = DFB_CUSTOM_KEY( 213 ),
DIKS_CUSTOM214 = DFB_CUSTOM_KEY( 214 ),
DIKS_CUSTOM215 = DFB_CUSTOM_KEY( 215 ),
DIKS_CUSTOM216 = DFB_CUSTOM_KEY( 216 ),
DIKS_CUSTOM217 = DFB_CUSTOM_KEY( 217 ),
DIKS_CUSTOM218 = DFB_CUSTOM_KEY( 218 ),
DIKS_CUSTOM219 = DFB_CUSTOM_KEY( 219 ),
DIKS_CUSTOM220 = DFB_CUSTOM_KEY( 220 ),
DIKS_CUSTOM221 = DFB_CUSTOM_KEY( 221 ),
DIKS_CUSTOM222 = DFB_CUSTOM_KEY( 222 ),
DIKS_CUSTOM223 = DFB_CUSTOM_KEY( 223 ),
DIKS_CUSTOM224 = DFB_CUSTOM_KEY( 224 ),
DIKS_CUSTOM225 = DFB_CUSTOM_KEY( 225 ),
DIKS_CUSTOM226 = DFB_CUSTOM_KEY( 226 ),
DIKS_CUSTOM227 = DFB_CUSTOM_KEY( 227 ),
DIKS_CUSTOM228 = DFB_CUSTOM_KEY( 228 ),
DIKS_CUSTOM229 = DFB_CUSTOM_KEY( 229 ),
DIKS_CUSTOM230 = DFB_CUSTOM_KEY( 230 ),
DIKS_CUSTOM231 = DFB_CUSTOM_KEY( 231 ),
DIKS_CUSTOM232 = DFB_CUSTOM_KEY( 232 ),
DIKS_CUSTOM233 = DFB_CUSTOM_KEY( 233 ),
DIKS_CUSTOM234 = DFB_CUSTOM_KEY( 234 ),
DIKS_CUSTOM235 = DFB_CUSTOM_KEY( 235 ),
DIKS_CUSTOM236 = DFB_CUSTOM_KEY( 236 ),
DIKS_CUSTOM237 = DFB_CUSTOM_KEY( 237 ),
DIKS_CUSTOM238 = DFB_CUSTOM_KEY( 238 ),
DIKS_CUSTOM239 = DFB_CUSTOM_KEY( 239 ),
DIKS_CUSTOM240 = DFB_CUSTOM_KEY( 240 ),
DIKS_CUSTOM241 = DFB_CUSTOM_KEY( 241 ),
DIKS_CUSTOM242 = DFB_CUSTOM_KEY( 242 ),
DIKS_CUSTOM243 = DFB_CUSTOM_KEY( 243 ),
DIKS_CUSTOM244 = DFB_CUSTOM_KEY( 244 ),
DIKS_CUSTOM245 = DFB_CUSTOM_KEY( 245 ),
DIKS_CUSTOM246 = DFB_CUSTOM_KEY( 246 ),
DIKS_CUSTOM247 = DFB_CUSTOM_KEY( 247 ),
DIKS_CUSTOM248 = DFB_CUSTOM_KEY( 248 ),
DIKS_CUSTOM249 = DFB_CUSTOM_KEY( 249 ),
DIKS_CUSTOM250 = DFB_CUSTOM_KEY( 250 ),
DIKS_CUSTOM251 = DFB_CUSTOM_KEY( 251 ),
DIKS_CUSTOM252 = DFB_CUSTOM_KEY( 252 ),
DIKS_CUSTOM253 = DFB_CUSTOM_KEY( 253 ),
DIKS_CUSTOM254 = DFB_CUSTOM_KEY( 254 ),
DIKS_CUSTOM255 = DFB_CUSTOM_KEY( 255 )
} DFBInputDeviceKeySymbol; } DFBInputDeviceKeySymbol;
/* /*
* Flags specifying the key locks that are currently active. * Flags specifying the key locks that are currently active.
*/ */
typedef enum { typedef enum {
DILS_SCROLL = 0x00000001, /* scroll-lock active? */ DILS_SCROLL = 0x00000001, /* scroll-lock active? */
DILS_NUM = 0x00000002, /* num-lock active? */ DILS_NUM = 0x00000002, /* num-lock active? */
DILS_CAPS = 0x00000004 /* caps-lock active? */ DILS_CAPS = 0x00000004 /* caps-lock active? */
} DFBInputDeviceLockState; } DFBInputDeviceLockState;
 End of changes. 1 change blocks. 
1 lines changed or deleted 157 lines changed or added


 directfb_keynames.h   directfb_keynames.h 
skipping to change at line 353 skipping to change at line 353
{ DIKS_CUSTOM90, "CUSTOM90" }, \ { DIKS_CUSTOM90, "CUSTOM90" }, \
{ DIKS_CUSTOM91, "CUSTOM91" }, \ { DIKS_CUSTOM91, "CUSTOM91" }, \
{ DIKS_CUSTOM92, "CUSTOM92" }, \ { DIKS_CUSTOM92, "CUSTOM92" }, \
{ DIKS_CUSTOM93, "CUSTOM93" }, \ { DIKS_CUSTOM93, "CUSTOM93" }, \
{ DIKS_CUSTOM94, "CUSTOM94" }, \ { DIKS_CUSTOM94, "CUSTOM94" }, \
{ DIKS_CUSTOM95, "CUSTOM95" }, \ { DIKS_CUSTOM95, "CUSTOM95" }, \
{ DIKS_CUSTOM96, "CUSTOM96" }, \ { DIKS_CUSTOM96, "CUSTOM96" }, \
{ DIKS_CUSTOM97, "CUSTOM97" }, \ { DIKS_CUSTOM97, "CUSTOM97" }, \
{ DIKS_CUSTOM98, "CUSTOM98" }, \ { DIKS_CUSTOM98, "CUSTOM98" }, \
{ DIKS_CUSTOM99, "CUSTOM99" }, \ { DIKS_CUSTOM99, "CUSTOM99" }, \
{ DIKS_CUSTOM100, "CUSTOM100" }, \
{ DIKS_CUSTOM101, "CUSTOM101" }, \
{ DIKS_CUSTOM102, "CUSTOM102" }, \
{ DIKS_CUSTOM103, "CUSTOM103" }, \
{ DIKS_CUSTOM104, "CUSTOM104" }, \
{ DIKS_CUSTOM105, "CUSTOM105" }, \
{ DIKS_CUSTOM106, "CUSTOM106" }, \
{ DIKS_CUSTOM107, "CUSTOM107" }, \
{ DIKS_CUSTOM108, "CUSTOM108" }, \
{ DIKS_CUSTOM109, "CUSTOM109" }, \
{ DIKS_CUSTOM110, "CUSTOM110" }, \
{ DIKS_CUSTOM111, "CUSTOM111" }, \
{ DIKS_CUSTOM112, "CUSTOM112" }, \
{ DIKS_CUSTOM113, "CUSTOM113" }, \
{ DIKS_CUSTOM114, "CUSTOM114" }, \
{ DIKS_CUSTOM115, "CUSTOM115" }, \
{ DIKS_CUSTOM116, "CUSTOM116" }, \
{ DIKS_CUSTOM117, "CUSTOM117" }, \
{ DIKS_CUSTOM118, "CUSTOM118" }, \
{ DIKS_CUSTOM119, "CUSTOM119" }, \
{ DIKS_CUSTOM120, "CUSTOM120" }, \
{ DIKS_CUSTOM121, "CUSTOM121" }, \
{ DIKS_CUSTOM122, "CUSTOM122" }, \
{ DIKS_CUSTOM123, "CUSTOM123" }, \
{ DIKS_CUSTOM124, "CUSTOM124" }, \
{ DIKS_CUSTOM125, "CUSTOM125" }, \
{ DIKS_CUSTOM126, "CUSTOM126" }, \
{ DIKS_CUSTOM127, "CUSTOM127" }, \
{ DIKS_CUSTOM128, "CUSTOM128" }, \
{ DIKS_CUSTOM129, "CUSTOM129" }, \
{ DIKS_CUSTOM130, "CUSTOM130" }, \
{ DIKS_CUSTOM131, "CUSTOM131" }, \
{ DIKS_CUSTOM132, "CUSTOM132" }, \
{ DIKS_CUSTOM133, "CUSTOM133" }, \
{ DIKS_CUSTOM134, "CUSTOM134" }, \
{ DIKS_CUSTOM135, "CUSTOM135" }, \
{ DIKS_CUSTOM136, "CUSTOM136" }, \
{ DIKS_CUSTOM137, "CUSTOM137" }, \
{ DIKS_CUSTOM138, "CUSTOM138" }, \
{ DIKS_CUSTOM139, "CUSTOM139" }, \
{ DIKS_CUSTOM140, "CUSTOM140" }, \
{ DIKS_CUSTOM141, "CUSTOM141" }, \
{ DIKS_CUSTOM142, "CUSTOM142" }, \
{ DIKS_CUSTOM143, "CUSTOM143" }, \
{ DIKS_CUSTOM144, "CUSTOM144" }, \
{ DIKS_CUSTOM145, "CUSTOM145" }, \
{ DIKS_CUSTOM146, "CUSTOM146" }, \
{ DIKS_CUSTOM147, "CUSTOM147" }, \
{ DIKS_CUSTOM148, "CUSTOM148" }, \
{ DIKS_CUSTOM149, "CUSTOM149" }, \
{ DIKS_CUSTOM150, "CUSTOM150" }, \
{ DIKS_CUSTOM151, "CUSTOM151" }, \
{ DIKS_CUSTOM152, "CUSTOM152" }, \
{ DIKS_CUSTOM153, "CUSTOM153" }, \
{ DIKS_CUSTOM154, "CUSTOM154" }, \
{ DIKS_CUSTOM155, "CUSTOM155" }, \
{ DIKS_CUSTOM156, "CUSTOM156" }, \
{ DIKS_CUSTOM157, "CUSTOM157" }, \
{ DIKS_CUSTOM158, "CUSTOM158" }, \
{ DIKS_CUSTOM159, "CUSTOM159" }, \
{ DIKS_CUSTOM160, "CUSTOM160" }, \
{ DIKS_CUSTOM161, "CUSTOM161" }, \
{ DIKS_CUSTOM162, "CUSTOM162" }, \
{ DIKS_CUSTOM163, "CUSTOM163" }, \
{ DIKS_CUSTOM164, "CUSTOM164" }, \
{ DIKS_CUSTOM165, "CUSTOM165" }, \
{ DIKS_CUSTOM166, "CUSTOM166" }, \
{ DIKS_CUSTOM167, "CUSTOM167" }, \
{ DIKS_CUSTOM168, "CUSTOM168" }, \
{ DIKS_CUSTOM169, "CUSTOM169" }, \
{ DIKS_CUSTOM170, "CUSTOM170" }, \
{ DIKS_CUSTOM171, "CUSTOM171" }, \
{ DIKS_CUSTOM172, "CUSTOM172" }, \
{ DIKS_CUSTOM173, "CUSTOM173" }, \
{ DIKS_CUSTOM174, "CUSTOM174" }, \
{ DIKS_CUSTOM175, "CUSTOM175" }, \
{ DIKS_CUSTOM176, "CUSTOM176" }, \
{ DIKS_CUSTOM177, "CUSTOM177" }, \
{ DIKS_CUSTOM178, "CUSTOM178" }, \
{ DIKS_CUSTOM179, "CUSTOM179" }, \
{ DIKS_CUSTOM180, "CUSTOM180" }, \
{ DIKS_CUSTOM181, "CUSTOM181" }, \
{ DIKS_CUSTOM182, "CUSTOM182" }, \
{ DIKS_CUSTOM183, "CUSTOM183" }, \
{ DIKS_CUSTOM184, "CUSTOM184" }, \
{ DIKS_CUSTOM185, "CUSTOM185" }, \
{ DIKS_CUSTOM186, "CUSTOM186" }, \
{ DIKS_CUSTOM187, "CUSTOM187" }, \
{ DIKS_CUSTOM188, "CUSTOM188" }, \
{ DIKS_CUSTOM189, "CUSTOM189" }, \
{ DIKS_CUSTOM190, "CUSTOM190" }, \
{ DIKS_CUSTOM191, "CUSTOM191" }, \
{ DIKS_CUSTOM192, "CUSTOM192" }, \
{ DIKS_CUSTOM193, "CUSTOM193" }, \
{ DIKS_CUSTOM194, "CUSTOM194" }, \
{ DIKS_CUSTOM195, "CUSTOM195" }, \
{ DIKS_CUSTOM196, "CUSTOM196" }, \
{ DIKS_CUSTOM197, "CUSTOM197" }, \
{ DIKS_CUSTOM198, "CUSTOM198" }, \
{ DIKS_CUSTOM199, "CUSTOM199" }, \
{ DIKS_CUSTOM200, "CUSTOM200" }, \
{ DIKS_CUSTOM201, "CUSTOM201" }, \
{ DIKS_CUSTOM202, "CUSTOM202" }, \
{ DIKS_CUSTOM203, "CUSTOM203" }, \
{ DIKS_CUSTOM204, "CUSTOM204" }, \
{ DIKS_CUSTOM205, "CUSTOM205" }, \
{ DIKS_CUSTOM206, "CUSTOM206" }, \
{ DIKS_CUSTOM207, "CUSTOM207" }, \
{ DIKS_CUSTOM208, "CUSTOM208" }, \
{ DIKS_CUSTOM209, "CUSTOM209" }, \
{ DIKS_CUSTOM210, "CUSTOM210" }, \
{ DIKS_CUSTOM211, "CUSTOM211" }, \
{ DIKS_CUSTOM212, "CUSTOM212" }, \
{ DIKS_CUSTOM213, "CUSTOM213" }, \
{ DIKS_CUSTOM214, "CUSTOM214" }, \
{ DIKS_CUSTOM215, "CUSTOM215" }, \
{ DIKS_CUSTOM216, "CUSTOM216" }, \
{ DIKS_CUSTOM217, "CUSTOM217" }, \
{ DIKS_CUSTOM218, "CUSTOM218" }, \
{ DIKS_CUSTOM219, "CUSTOM219" }, \
{ DIKS_CUSTOM220, "CUSTOM220" }, \
{ DIKS_CUSTOM221, "CUSTOM221" }, \
{ DIKS_CUSTOM222, "CUSTOM222" }, \
{ DIKS_CUSTOM223, "CUSTOM223" }, \
{ DIKS_CUSTOM224, "CUSTOM224" }, \
{ DIKS_CUSTOM225, "CUSTOM225" }, \
{ DIKS_CUSTOM226, "CUSTOM226" }, \
{ DIKS_CUSTOM227, "CUSTOM227" }, \
{ DIKS_CUSTOM228, "CUSTOM228" }, \
{ DIKS_CUSTOM229, "CUSTOM229" }, \
{ DIKS_CUSTOM230, "CUSTOM230" }, \
{ DIKS_CUSTOM231, "CUSTOM231" }, \
{ DIKS_CUSTOM232, "CUSTOM232" }, \
{ DIKS_CUSTOM233, "CUSTOM233" }, \
{ DIKS_CUSTOM234, "CUSTOM234" }, \
{ DIKS_CUSTOM235, "CUSTOM235" }, \
{ DIKS_CUSTOM236, "CUSTOM236" }, \
{ DIKS_CUSTOM237, "CUSTOM237" }, \
{ DIKS_CUSTOM238, "CUSTOM238" }, \
{ DIKS_CUSTOM239, "CUSTOM239" }, \
{ DIKS_CUSTOM240, "CUSTOM240" }, \
{ DIKS_CUSTOM241, "CUSTOM241" }, \
{ DIKS_CUSTOM242, "CUSTOM242" }, \
{ DIKS_CUSTOM243, "CUSTOM243" }, \
{ DIKS_CUSTOM244, "CUSTOM244" }, \
{ DIKS_CUSTOM245, "CUSTOM245" }, \
{ DIKS_CUSTOM246, "CUSTOM246" }, \
{ DIKS_CUSTOM247, "CUSTOM247" }, \
{ DIKS_CUSTOM248, "CUSTOM248" }, \
{ DIKS_CUSTOM249, "CUSTOM249" }, \
{ DIKS_CUSTOM250, "CUSTOM250" }, \
{ DIKS_CUSTOM251, "CUSTOM251" }, \
{ DIKS_CUSTOM252, "CUSTOM252" }, \
{ DIKS_CUSTOM253, "CUSTOM253" }, \
{ DIKS_CUSTOM254, "CUSTOM254" }, \
{ DIKS_CUSTOM255, "CUSTOM255" }, \
{ DIKS_NULL, "NULL" } \ { DIKS_NULL, "NULL" } \
}; };
struct DFBKeyIdentifierName { struct DFBKeyIdentifierName {
DFBInputDeviceKeyIdentifier identifier; DFBInputDeviceKeyIdentifier identifier;
const char *name; const char *name;
}; };
#define DirectFBKeyIdentifierNames(Identifier) struct DFBKeyIdentifierName Identifier[] = { \ #define DirectFBKeyIdentifierNames(Identifier) struct DFBKeyIdentifierName Identifier[] = { \
{ DIKI_A, "A" }, \ { DIKI_A, "A" }, \
 End of changes. 1 change blocks. 
0 lines changed or deleted 156 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 (7) #define DIRECTFB_MICRO_VERSION (8)
#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


 fonts.h   fonts.h 
skipping to change at line 100 skipping to change at line 100
unsigned int index; unsigned int index;
unsigned int layer; unsigned int layer;
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 xadvance; /* placement of next glyph
*/ */
int yadvance;
int magic; int magic;
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 );
\ \
D_DEBUG_AT( Domain, " -> width %d\n", (data)->width ); D_DEBUG_AT( Domain, " -> width %d\n", (data)->width );
\ \
D_DEBUG_AT( Domain, " -> height %d\n", (data)->height ); D_DEBUG_AT( Domain, " -> height %d\n", (data)->height );
\ \
D_DEBUG_AT( Domain, " -> left %d\n", (data)->left ); D_DEBUG_AT( Domain, " -> left %d\n", (data)->left );
\ \
D_DEBUG_AT( Domain, " -> top %d\n", (data)->top ); D_DEBUG_AT( Domain, " -> top %d\n", (data)->top );
\ \
D_DEBUG_AT( Domain, " -> advance %d\n", (data)->advance ); D_DEBUG_AT( Domain, " -> xadvance %d\n", (data)->xadvance );
\ \
D_DEBUG_AT( Domain, " -> yadvance %d\n", (data)->yadvance );
\
} while (0) } while (0)
typedef struct { typedef struct {
DFBResult (* GetCharacterIndex) ( CoreFont *thiz, DFBResult (* GetCharacterIndex) ( CoreFont *thiz,
unsigned int character, unsigned int character,
unsigned int *ret_index ); unsigned int *ret_index );
DFBResult (* DecodeText) ( CoreFont *thiz, DFBResult (* DecodeText) ( CoreFont *thiz,
const void *text, const void *text,
int length, int length,
skipping to change at line 173 skipping to change at line 175
} layers[DFB_FONT_MAX_LAYERS]; } layers[DFB_FONT_MAX_LAYERS];
int height; /* font height */ int height; /* font height */
int ascender; /* a positive value, the distance int ascender; /* a positive value, the distance
from the baseline to t he top */ from the baseline to t he top */
int descender; /* a negative value, the distance int descender; /* a negative value, the distance
from the baseline to t he bottom */ from the baseline to t he bottom */
int maxadvance; /* width of largest chara cter */ int maxadvance; /* width of largest chara cter */
float up_unit_x; /* unit vector pointing '
up' in for */
float up_unit_y; /* this font's rotation
*/
const CoreFontEncodingFuncs *utf8; /* for default encoding, DTEID_UTF8 */ const CoreFontEncodingFuncs *utf8; /* for default encoding, DTEID_UTF8 */
CoreFontEncoding **encodings; /* for other encodings */ CoreFontEncoding **encodings; /* for other encodings */
DFBTextEncodingID last_encoding; /* dynamic allocation imp l. helper */ DFBTextEncodingID last_encoding; /* dynamic allocation imp l. helper */
void *impl_data; /* a pointer used by the impl. */ void *impl_data; /* a pointer used by the impl. */
DFBResult (* GetGlyphData) ( CoreFont *thiz, DFBResult (* GetGlyphData) ( CoreFont *thiz,
unsigned int index, unsigned int index,
CoreGlyphData *data ); CoreGlyphData *data );
 End of changes. 3 change blocks. 
22 lines changed or deleted 30 lines changed or added


 idirectfbfont.h   idirectfbfont.h 
skipping to change at line 47 skipping to change at line 47
* probing context * probing context
*/ */
typedef struct { typedef struct {
/* Only set if databuffer is created from file. /* Only set if databuffer is created from file.
deprecated - use memory location below. */ deprecated - use memory location below. */
const char *filename; const char *filename;
/* if !=NULL, pointer to the file content */ /* if !=NULL, pointer to the file content */
unsigned char *content; unsigned char *content;
unsigned int content_size; unsigned int content_size;
bool content_mapped;
} IDirectFBFont_ProbeContext; } IDirectFBFont_ProbeContext;
DFBResult DFBResult
IDirectFBFont_CreateFromBuffer( IDirectFBDataBuffer *buffer, IDirectFBFont_CreateFromBuffer( IDirectFBDataBuffer *buffer,
CoreDFB *core, CoreDFB *core,
const DFBFontDescription *desc, const DFBFontDescription *desc,
IDirectFBFont **interface ); IDirectFBFont **interface );
/************************************************************************** ********************************************/ /************************************************************************** ********************************************/
/* /*
* private data struct of IDirectFBFont * private data struct of IDirectFBFont
* used by implementors of IDirectFBFont * used by implementors of IDirectFBFont
*/ */
typedef struct { typedef struct {
int ref; /* reference counter */ int ref; /* reference counter */
CoreFont *font; /* pointer to core font */ CoreFont *font; /* pointer to core font */
unsigned char *content; /* possible allocation, free at intf. cl ose */ unsigned char *content; /* possible allocation, free at intf. cl ose */
unsigned int content_size;
bool content_mapped;
DFBTextEncodingID encoding; /* text encoding */ DFBTextEncodingID encoding; /* text encoding */
} IDirectFBFont_data; } IDirectFBFont_data;
/* /*
* common code to construct the interface (internal usage only) * common code to construct the interface (internal usage only)
*/ */
DFBResult IDirectFBFont_Construct( IDirectFBFont *thiz, CoreFont *font ); DFBResult IDirectFBFont_Construct( IDirectFBFont *thiz, CoreFont *font );
/* /*
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added


 windows.h   windows.h 
skipping to change at line 63 skipping to change at line 63
CWCF_OPTIONS = 0x00000010, CWCF_OPTIONS = 0x00000010,
CWCF_EVENTS = 0x00000020, CWCF_EVENTS = 0x00000020,
CWCF_ASSOCIATION = 0x00000040, CWCF_ASSOCIATION = 0x00000040,
CWCF_COLOR_KEY = 0x00000100, CWCF_COLOR_KEY = 0x00000100,
CWCF_OPAQUE = 0x00000200, CWCF_OPAQUE = 0x00000200,
CWCF_COLOR = 0x00000400, CWCF_COLOR = 0x00000400,
CWCF_KEY_SELECTION = 0x00001000, CWCF_KEY_SELECTION = 0x00001000,
CWCF_CURSOR_FLAGS = 0x00002000,
CWCF_CURSOR_RESOLUTION = 0x00004000,
CWCF_SRC_GEOMETRY = 0x00010000, CWCF_SRC_GEOMETRY = 0x00010000,
CWCF_DST_GEOMETRY = 0x00020000, CWCF_DST_GEOMETRY = 0x00020000,
CWCF_ROTATION = 0x00040000, CWCF_ROTATION = 0x00040000,
CWCF_APPLICATION_ID= 0x00080000, CWCF_APPLICATION_ID= 0x00080000,
CWCF_ALL = 0x000F177F CWCF_ALL = 0x000F777F
} 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, ne ver premultiplied! */ DFBColor color; /* color for DWCAPS_COLOR, ne ver premultiplied! */
u32 color_key; /* transparent pixel */ u32 color_key; /* transparent pixel */
skipping to change at line 97 skipping to change at line 99
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; DFBWindowID association;
unsigned long application_id; /* this can be changed at run time by the application. 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. */ * it's here so appman can ge t a callback on change. */
DFBWindowCursorFlags cursor_flags;
DFBDimension cursor_resolution;
}; };
#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.
 End of changes. 3 change blocks. 
1 lines changed or deleted 6 lines changed or added


 wm.h   wm.h 
skipping to change at line 258 skipping to change at line 258
DFBResult (*RequestFocus) ( CoreWindow *window, DFBResult (*RequestFocus) ( CoreWindow *window,
void *wm_data, void *wm_data,
void *window_data ) ; void *window_data ) ;
DFBResult (*BeginUpdates) ( CoreWindow *window, DFBResult (*BeginUpdates) ( CoreWindow *window,
void *wm_data, void *wm_data,
void *window_data, void *window_data,
const DFBRegion *update ); const DFBRegion *update );
DFBResult (*SetCursorPosition) ( CoreWindow *window,
void *wm_data,
void *window_data,
int x,
int y );
/** Updates **/ /** Updates **/
DFBResult (*UpdateStack) ( CoreWindowStack *stack, DFBResult (*UpdateStack) ( CoreWindowStack *stack,
void *wm_data, void *wm_data,
void *stack_data, void *stack_data,
const DFBRegion *region, const DFBRegion *region,
DFBSurfaceFlipFlags flags ); DFBSurfaceFlipFlags flags );
DFBResult (*UpdateWindow) ( CoreWindow *window, DFBResult (*UpdateWindow) ( CoreWindow *window,
void *wm_data, void *wm_data,
skipping to change at line 359 skipping to change at line 365
CoreWMGrab *grab ); CoreWMGrab *grab );
DFBResult dfb_wm_ungrab ( CoreWindow *window, DFBResult dfb_wm_ungrab ( CoreWindow *window,
CoreWMGrab *grab ); CoreWMGrab *grab );
DFBResult dfb_wm_request_focus ( CoreWindow *window ); DFBResult dfb_wm_request_focus ( CoreWindow *window );
DFBResult dfb_wm_begin_updates ( CoreWindow *window, DFBResult dfb_wm_begin_updates ( CoreWindow *window,
const DFBRegion *update ); const DFBRegion *update );
DFBResult dfb_wm_set_cursor_position( CoreWindow *window,
int x,
int y );
DFBResult dfb_wm_update_stack ( CoreWindowStack *stack, DFBResult dfb_wm_update_stack ( CoreWindowStack *stack,
const DFBRegion *region, const DFBRegion *region,
DFBSurfaceFlipFlags flags ); DFBSurfaceFlipFlags flags );
DFBResult dfb_wm_update_window ( CoreWindow *window, DFBResult dfb_wm_update_window ( CoreWindow *window,
const DFBRegion *region, const DFBRegion *region,
DFBSurfaceFlipFlags flags ); DFBSurfaceFlipFlags flags );
DFBResult dfb_wm_update_cursor ( CoreWindowStack *stack, DFBResult dfb_wm_update_cursor ( CoreWindowStack *stack,
CoreCursorUpdateFlags flags ); CoreCursorUpdateFlags flags );
 End of changes. 2 change blocks. 
0 lines changed or deleted 10 lines changed or added


 wm_module.h   wm_module.h 
skipping to change at line 192 skipping to change at line 192
static DFBResult wm_request_focus ( CoreWindow *window, static DFBResult wm_request_focus ( CoreWindow *window,
void *wm_data, void *wm_data,
void *window_data ); void *window_data );
static DFBResult wm_begin_updates ( CoreWindow *window, static DFBResult wm_begin_updates ( CoreWindow *window,
void *wm_data, void *wm_data,
void *window_data, void *window_data,
const DFBRegion *update ); const DFBRegion *update );
static DFBResult wm_set_cursor_position( CoreWindow *window,
void *wm_data,
void *window_dat
a,
int x,
int y );
/** Updates **/ /** Updates **/
static DFBResult wm_update_stack ( CoreWindowStack *stack, static DFBResult wm_update_stack ( CoreWindowStack *stack,
void *wm_data, void *wm_data,
void *stack_data, void *stack_data,
const DFBRegion *region, const DFBRegion *region,
DFBSurfaceFlipFlags flags ); DFBSurfaceFlipFlags flags );
static DFBResult wm_update_window ( CoreWindow *window, static DFBResult wm_update_window ( CoreWindow *window,
void *wm_data, void *wm_data,
skipping to change at line 245 skipping to change at line 251
.GetWindowProperty = wm_get_window_property, .GetWindowProperty = wm_get_window_property,
.RemoveWindowProperty = wm_remove_window_property, .RemoveWindowProperty = wm_remove_window_property,
.AddWindow = wm_add_window, .AddWindow = wm_add_window,
.RemoveWindow = wm_remove_window, .RemoveWindow = wm_remove_window,
.SetWindowConfig = wm_set_window_config, .SetWindowConfig = wm_set_window_config,
.RestackWindow = wm_restack_window, .RestackWindow = wm_restack_window,
.Grab = wm_grab, .Grab = wm_grab,
.Ungrab = wm_ungrab, .Ungrab = wm_ungrab,
.RequestFocus = wm_request_focus, .RequestFocus = wm_request_focus,
.BeginUpdates = wm_begin_updates, .BeginUpdates = wm_begin_updates,
.SetCursorPosition = wm_set_cursor_position,
.UpdateStack = wm_update_stack, .UpdateStack = wm_update_stack,
.UpdateWindow = wm_update_window, .UpdateWindow = wm_update_window,
.UpdateCursor = wm_update_cursor .UpdateCursor = wm_update_cursor
}; };
#define DFB_WINDOW_MANAGER(shortname) \ #define DFB_WINDOW_MANAGER(shortname) \
__attribute__((constructor)) void directfbwm_##shortname( void ); \ __attribute__((constructor)) void directfbwm_##shortname( void ); \
\ \
void \ void \
 End of changes. 2 change blocks. 
0 lines changed or deleted 8 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/