Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-02-06 02:01:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

change version to 4.0.0

Browse Source
This commit is contained in:
Vincent Wei
2019-04-06 13:34:20 +08:00
parent 2b01f35cac
commit dfd4a603f9
18 changed files with 97 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Doxyfile.sa
View File

@@ -38,7 +38,7 @@ PROJECT_NAME = "MiniGUI API Reference (MiniGUI-Standalone)"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = v3.4.0
PROJECT_NUMBER = v4.0.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

6
RELEASE-NOTES.md
View File

@@ -1,8 +1,8 @@
# Release Notes
## Version 3.4.0
## Version 4.0.0
The MiniGUI development team announces the availability of MiniGUI 3.4.0.
The MiniGUI development team announces the availability of MiniGUI 4.0.0.
All users of MiniGUI are recommended strongly to use this version.
Please report any bugs and incompatibilities in
@@ -73,7 +73,7 @@ please define the logical font name in the following way:
ttf-Courier-rrncns-*-16-UTF-8
Moreover, the family name of a DEVFONT supports aliases since 3.4.0:
Moreover, the family name of a DEVFONT supports aliases since 4.0.0:
<fonttype>-<family[,aliase]*>-<styles>-<width>-<height>-<charset[,charset]*>

6
Version
View File

@@ -1,9 +1,9 @@
Version 3.4.0 (2019/06/30)
Version 4.0.0 (2019/06/30)
This release needs the following resource packages:
* minigui-res-3.4.0.tar.gz
* minigui-res-4.0.0.tar.gz
The latest samples package is:
* mg-samples-3.4.0.tar.gz
* mg-samples-4.0.0.tar.gz

6
configure.ac
View File

@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.60)
AC_INIT(libminigui, 3.4.0)
AC_INIT(libminigui, 4.0.0)
AC_CONFIG_SRCDIR(src/main/main.c)
dnl Set various version strings - taken gratefully from the SDL sources
@@ -14,8 +14,8 @@ dnl Set various version strings - taken gratefully from the SDL sources
# if backwards compatibility has been broken,
# set MINIGUI_BINARY_AGE and MINIGUI_INTERFACE_AGE to 0.
#
MINIGUI_MAJOR_VERSION=3
MINIGUI_MINOR_VERSION=4
MINIGUI_MAJOR_VERSION=4
MINIGUI_MINOR_VERSION=0
MINIGUI_MICRO_VERSION=0
MINIGUI_INTERFACE_AGE=0
MINIGUI_BINARY_AGE=0

118
include/gdi.h
View File

@@ -5478,7 +5478,7 @@ MG_EXPORT int GUIAPI SubtractRect (RECT* rc, const RECT* psrc1, const RECT* psrc
#define FONT_WEIGHT_BLACK 'c'
/* Backward compatiblilty definitions.
* deprecated since v3.4.0, use FS_RENDER_XXX/FONT_RENDER_XXX instead
* deprecated since v4.0.0, use FS_RENDER_XXX/FONT_RENDER_XXX instead
*/
#define FONT_WEIGHT_SUBPIXEL 's'
#define FONT_WEIGHT_BOOK 'k'
@@ -5562,7 +5562,7 @@ MG_EXPORT int GUIAPI SubtractRect (RECT* rc, const RECT* psrc1, const RECT* psrc
#define FS_RENDER_SUBPIXEL 0x20000000
#define FS_RENDER_ANY FS_RENDER_MONO
/* Backward compatiblilty definitions; deprecated since v3.4.0 */
/* Backward compatiblilty definitions; deprecated since v4.0.0 */
#define FONT_OTHER_LCDPORTRAIT 'p'
#define FONT_OTHER_LCDPORTRAITKERN 'q'
@@ -5571,7 +5571,7 @@ MG_EXPORT int GUIAPI SubtractRect (RECT* rc, const RECT* psrc1, const RECT* psrc
#define FS_WEIGHT_ALL FS_WEIGHT_ANY
#define FS_SLANT_ALL FS_SLANT_ANY
/* Backward compatiblilty definitions; deprecated since v3.4.0
/* Backward compatiblilty definitions; deprecated since v4.0.0
* All FONT_SETWIDTH_* and FONT_SPACING_* types will
* be treated as FONT_FLIP_NIL and FONT_OTHER_NIL respectively.
*/
@@ -6429,7 +6429,7 @@ typedef struct _CHARSETOPS CHARSETOPS;
struct _DEVFONT {
/**
* The device font name.
* The family name supports aliases since 3.4.0:
* The family name supports aliases since 4.0.0:
*
* <fonttype>-<family[,aliase]*>-<styles>-<width>-<height>-<charset[,charset]*>
*
@@ -6568,7 +6568,7 @@ MG_EXPORT void GUIAPI TermVectorialFonts (void);
* - FONT_TYPE_NAME_ANY\n
* Creates a logical font by using any type device font.
* \param family The family of the logical font, such as "Courier",
* "Helvetica", and so on. Since version 3.4.0, you can specify
* "Helvetica", and so on. Since version 4.0.0, you can specify
* up to 7 family names separated by comma, e.g.,
* "Helvetica,黑体,Naskh,SansSerif". Note that a family name should
* be encoded in UTF-8 and without special characters (middle spaces
@@ -6697,7 +6697,7 @@ MG_EXPORT PLOGFONT GUIAPI CreateLogFont (const char* type, const char* family,
* - FONT_TYPE_NAME_ANY\n
* Creates a logical font by using any type device font.
* \param family The family of the logical font, such as "Courier",
* "Helvetica", and so on. Since version 3.4.0, you can specify
* "Helvetica", and so on. Since version 4.0.0, you can specify
* up to 7 family names separated by comma, e.g.,
* "Helvetica,黑体,Naskh,SansSerif". Note that a family name should
* be encoded in UTF-8 and without special characters (middle spaces
@@ -6810,7 +6810,7 @@ MG_EXPORT PLOGFONT GUIAPI CreateLogFontEx (const char* type, const char* family,
* \brief Creates a logical font by a font name.
*
* This function creates a logical font by a font name specified by
* \a font_name. Note that since version 3.4.0, you can specify up
* \a font_name. Note that since version 4.0.0, you can specify up
* to 7 family names in the LOGFONT name, such as:
*
* ttf-Courier,宋体,Naskh,SansSerif-rrncns-U-16-UTF-8
@@ -6821,7 +6821,7 @@ MG_EXPORT PLOGFONT GUIAPI CreateLogFontEx (const char* type, const char* family,
* often designed for a particular language/script or a few similar
* languages/scripts.
*
* Since 3.4.0, the previous width field of a logfont name is used for
* Since 4.0.0, the previous width field of a logfont name is used for
* the glyph orientation:
*
* - 'U': Glyphs stand upright (default).
@@ -6853,7 +6853,7 @@ MG_EXPORT PLOGFONT GUIAPI CreateLogFontByName(const char* font_name);
*
* \sa DestroyLogFont, GetUCharsUntilParagraphBoundary
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT PLOGFONT GUIAPI CreateLogFontForMChar2UChar(const char* charset);
#endif /* _MGCHARSET_UNICODE */
@@ -6879,7 +6879,7 @@ MG_EXPORT PLOGFONT GUIAPI CreateLogFontIndirect (LOGFONT* logfont);
* This function creates a new logical font from information in the LOGFONT object
* \a logfont and the new rotation value \a rotation.
*
* Since 3.4.0.
* Since 4.0.0.
*
* \param logfont The pointer to the reference logical font structure.
* \param rotation The rotation of the logical font, it is in units of
@@ -8111,7 +8111,7 @@ MG_EXPORT UCharBreakType GUIAPI UCharGetBreakType(Uchar32 uc);
*
* \sa UStrGetBidiTypes, bidi_types
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT BidiType GUIAPI UCharGetBidiType(Uchar32 uc);
@@ -8129,7 +8129,7 @@ MG_EXPORT BidiType GUIAPI UCharGetBidiType(Uchar32 uc);
*
* \sa UCharGetBidiType
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void GUIAPI UStrGetBidiTypes(const Uchar32* ucs, int nr_ucs,
BidiType* bdts);
@@ -8155,7 +8155,7 @@ MG_EXPORT void GUIAPI UStrGetBidiTypes(const Uchar32* ucs, int nr_ucs,
*
* \sa UStrGetBracketTypes
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT BidiBracketType GUIAPI UCharGetBracketType(Uchar32 ch);
@@ -8176,7 +8176,7 @@ MG_EXPORT BidiBracketType GUIAPI UCharGetBracketType(Uchar32 ch);
*
* \sa UCharGetBracketType
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void GUIAPI UStrGetBracketTypes(const Uchar32 *ucs,
const BidiType *bidi_types, int len_ucs,
@@ -8202,7 +8202,7 @@ MG_EXPORT void GUIAPI UStrGetBracketTypes(const Uchar32 *ucs,
* \return A BOOL value indicates if the character has a mirroring equivalent
* or not.
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT BOOL GUIAPI UCharGetMirror(Uchar32 uc, Uchar32* mirrored);
@@ -8228,7 +8228,7 @@ MG_EXPORT BOOL GUIAPI UCharGetMirror(Uchar32 uc, Uchar32* mirrored);
*
* \return The joining type of the specified Uchar32 character.
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT BidiJoiningType GUIAPI UCharGetJoiningType(Uchar32 uc);
@@ -8248,7 +8248,7 @@ MG_EXPORT BidiJoiningType GUIAPI UCharGetJoiningType(Uchar32 uc);
*
* \sa UCharGetJoiningType
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void GUIAPI UStrGetJoiningTypes(const Uchar32 *ucs, int nr_ucs,
BidiJoiningType *joing_types);
@@ -8278,7 +8278,7 @@ MG_EXPORT void GUIAPI UStrGetJoiningTypes(const Uchar32 *ucs, int nr_ucs,
* \return Base pargraph direction. No weak paragraph direction is returned,
* only BIDI_PGDIR_LTR, BIDI_PGDIR_RTL, or BIDI_PGDIR_ON.
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT BidiType GUIAPI UBidiGetParagraphDir(const BidiType *bidi_types, int len);
@@ -8320,7 +8320,7 @@ MG_EXPORT BidiType GUIAPI UBidiGetParagraphDir(const BidiType *bidi_types, int l
*
* \sa UStrGetBidiTypes, UStrGetBracketTypes
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT BidiLevel GUIAPI UBidiGetParagraphEmbeddingLevels(
const BidiType *bidi_types,
@@ -8401,7 +8401,7 @@ typedef void (*CB_REVERSE_ARRAY) (void* extra, int len, int pos);
* \sa UStrGetBidiTypes, UStrGetBracketTypes,
* UBidiGetParagraphEmbeddingLevels
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT BidiLevel GUIAPI UBidiReorderLine(Uint32 bidi_flags,
const BidiType *bidi_types, int len, int off,
@@ -8429,7 +8429,7 @@ MG_EXPORT BidiLevel GUIAPI UBidiReorderLine(Uint32 bidi_flags,
*
* \sa UBidiGetParagraphEmbeddingLevels
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void GUIAPI UBidiShapeMirroring(const BidiLevel *embedding_levels,
int len, Uchar32* ucs);
@@ -8465,7 +8465,7 @@ MG_EXPORT void GUIAPI UBidiShapeMirroring(const BidiLevel *embedding_levels,
*
* \sa UBidiGetParagraphEmbeddingLevels, UStrGetJoiningTypes
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void GUIAPI UBidiJoinArabic(const BidiType *bidi_types,
const BidiLevel *embedding_levels, int len,
@@ -8506,7 +8506,7 @@ MG_EXPORT void GUIAPI UBidiJoinArabic(const BidiType *bidi_types,
*
* \sa UBidiGetParagraphEmbeddingLevels, UBidiJoinArabic
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void GUIAPI UBidiShapeArabic(Uint32 shaping_flags,
const BidiLevel *embedding_levels, int len,
@@ -8542,7 +8542,7 @@ MG_EXPORT void GUIAPI UBidiShapeArabic(Uint32 shaping_flags,
*
* \sa UBidiShapeArabic, UBidiShapeMirroring
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void GUIAPI UBidiShape(Uint32 shaping_flags,
const BidiLevel *embedding_levels, int len,
@@ -8990,7 +8990,7 @@ MG_EXPORT int GUIAPI UCharFullyDecompose (Uchar32 ch, BOOL compat,
*
* \sa ScriptType
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT ScriptType GUIAPI UCharGetScriptType (Uchar32 ch);
@@ -9014,7 +9014,7 @@ MG_EXPORT ScriptType GUIAPI UCharGetScriptType (Uchar32 ch);
* [Codes for the representation of names of scripts](https://www.unicode.org/iso15924/codelists.html)
* for details.
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT Uint32 GUIAPI ScriptTypeToISO15924 (ScriptType script);
@@ -9037,7 +9037,7 @@ MG_EXPORT Uint32 GUIAPI ScriptTypeToISO15924 (ScriptType script);
* [Codes for the representation of names of scripts](https://www.unicode.org/iso15924/codelists.html)
* for details.
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT ScriptType GUIAPI ScriptTypeFromISO15924 (Uint32 iso15924);
@@ -9057,7 +9057,7 @@ MG_EXPORT ScriptType GUIAPI ScriptTypeFromISO15924 (Uint32 iso15924);
* [Codes for the representation of names of scripts](https://www.unicode.org/iso15924/codelists.html)
* for details.
*
* Since: 3.4.0
* Since: 4.0.0
*/
static inline ScriptType GUIAPI ScriptTypeFromISO15924Code (const char* iso15924)
{
@@ -9115,7 +9115,7 @@ MG_EXPORT UVerticalOrient GUIAPI UCharGetVerticalOrientation(Uchar32 uc);
* \param The resolved gravity suitable to use for a layout run of text
* with @script.
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT GlyphGravity GUIAPI ScriptGetGlyphGravity(ScriptType script,
BOOL vertical, GlyphGravity base_gravity, GlyphGravityPolicy policy);
@@ -9146,7 +9146,7 @@ MG_EXPORT GlyphGravity GUIAPI ScriptGetGlyphGravity(ScriptType script,
* \return The resolved gravity suitable to use for a run of text
* with \a script and \a wide.
*
* Since: 3.4.0
* Since: 4.0.0
*/
GlyphGravity ScriptGetGlyphGravityForWide (ScriptType script,
BOOL vertical, BOOL wide,
@@ -11936,7 +11936,7 @@ typedef enum {
* Returns: the language code for @iso639_1, or
* of %LANGCODE_unknown if @iso639_1 is invalid.
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT LanguageCode GUIAPI LanguageCodeFromISO639s1 (Uint16 iso639_1);
@@ -11950,7 +11950,7 @@ MG_EXPORT LanguageCode GUIAPI LanguageCodeFromISO639s1 (Uint16 iso639_1);
* Returns: the language code for @iso639_1, or
* of %LANGCODE_unknown if @iso639_1 is invalid.
*
* Since: 3.4.0
* Since: 4.0.0
*/
static inline LanguageCode GUIAPI LanguageCodeFromISO639s1Code(const char* iso639_1)
{
@@ -12083,7 +12083,7 @@ MG_EXPORT ScriptType GUIAPI NormalizeScriptType(LanguageCode cl,
*
* \sa DrawGlyphStringEx, white_space_rules, char_transform_rule
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT int GUIAPI GetUCharsUntilParagraphBoundary(LOGFONT* logfont,
const char* mstr, int mstr_len, Uint8 wsr,
@@ -12103,7 +12103,7 @@ MG_EXPORT int GUIAPI GetUCharsUntilParagraphBoundary(LOGFONT* logfont,
*
* \note Only available when support for UNICODE is enabled.
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT Uchar32 GUIAPI AChar2UChar(LOGFONT* logfont, Achar32 chv);
@@ -12121,7 +12121,7 @@ MG_EXPORT Uchar32 GUIAPI AChar2UChar(LOGFONT* logfont, Achar32 chv);
*
* \note Only available when support for UNICODE is enabled.
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT int GUIAPI AChars2UChars(LOGFONT* logfont, const Achar32* chs,
Uchar32* ucs, int n);
@@ -12135,7 +12135,7 @@ MG_EXPORT int GUIAPI AChars2UChars(LOGFONT* logfont, const Achar32* chs,
*
* \sa UChar2AChar, UChars2AChars
*
* Since 3.4.0
* Since 4.0.0
*/
#define UCHAR2ACHAR(uc) ((uc) | 0x80000000)
@@ -12159,7 +12159,7 @@ MG_EXPORT int GUIAPI AChars2UChars(LOGFONT* logfont, const Achar32* chs,
*
* \sa UChars2AChars, UCHAR2ACHAR
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL GUIAPI UChar2AChar(LOGFONT* logfont, Uchar32 uc, Achar32* ac);
@@ -12179,7 +12179,7 @@ MG_EXPORT BOOL GUIAPI UChar2AChar(LOGFONT* logfont, Uchar32 uc, Achar32* ac);
*
* \sa UChar2AChar, UCHAR2ACHAR
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT int GUIAPI UChars2AChars(LOGFONT* logfont, const Uchar32* ucs,
Achar32* acs, int n);
@@ -12599,7 +12599,7 @@ typedef struct _GLYPHPOS {
*
* \sa UStrGetBreaks, DrawGlyphStringEx, GLYPHEXTINFO, glyph_render_flags
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT int GUIAPI GetGlyphsExtentFromUChars(LOGFONT* logfont_upright,
const Achar32* uchars, int nr_uchars, const BreakOppo* break_oppos,
@@ -12633,7 +12633,7 @@ MG_EXPORT int GUIAPI GetGlyphsExtentFromUChars(LOGFONT* logfont_upright,
*
* \sa GetGlyphsExtentFromUChars
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT int GUIAPI DrawGlyphStringEx (HDC hdc,
LOGFONT* logfont_upright, LOGFONT* logfont_sideways,
@@ -12681,7 +12681,7 @@ typedef struct _TEXTRUNS TEXTRUNS;
* \sa GetUCharsUntilParagraphBoundary, UStrGetBreaks,
* SetFontInTextRuns, SetTextColorInTextRuns
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT TEXTRUNS* GUIAPI CreateTextRuns(
const Uchar32* ucs, int nr_ucs,
@@ -12692,7 +12692,7 @@ MG_EXPORT TEXTRUNS* GUIAPI CreateTextRuns(
/**
* Set logfont name of text runs
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL GUIAPI SetFontNameInTextRuns(TEXTRUNS* truns,
int start_index, int length, const char* logfont_name);
@@ -12700,7 +12700,7 @@ MG_EXPORT BOOL GUIAPI SetFontNameInTextRuns(TEXTRUNS* truns,
/**
* Get logfont name of a specific character in text runs
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT const char* GUIAPI GetFontNameInTextRuns(
const TEXTRUNS* truns, int index);
@@ -12708,7 +12708,7 @@ MG_EXPORT const char* GUIAPI GetFontNameInTextRuns(
/**
* Set text olor in text runs.
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL GUIAPI SetTextColorInTextRuns(TEXTRUNS* truns,
int start_index, int length, RGBCOLOR color);
@@ -12716,7 +12716,7 @@ MG_EXPORT BOOL GUIAPI SetTextColorInTextRuns(TEXTRUNS* truns,
/**
* Get text color of a specific character in text runs
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT RGBCOLOR GUIAPI GetTextColorInTextRuns(
const TEXTRUNS* truns, int index);
@@ -12724,7 +12724,7 @@ MG_EXPORT RGBCOLOR GUIAPI GetTextColorInTextRuns(
/**
* Set background color in text runs.
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL GUIAPI SetBackgroundColorInTextRuns(TEXTRUNS* truns,
int start_index, int length, RGBCOLOR color);
@@ -12732,7 +12732,7 @@ MG_EXPORT BOOL GUIAPI SetBackgroundColorInTextRuns(TEXTRUNS* truns,
/**
* Get background color of a specific character in text runs
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT RGBCOLOR GUIAPI GetBackgroundColorInTextRuns(
const TEXTRUNS* truns, int index);
@@ -12753,7 +12753,7 @@ MG_EXPORT RGBCOLOR GUIAPI GetBackgroundColorInTextRuns(
*
* \sa CreateTextRuns
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL GUIAPI DestroyTextRuns(TEXTRUNS* truns);
@@ -12786,7 +12786,7 @@ MG_EXPORT BOOL GUIAPI DestroyTextRuns(TEXTRUNS* truns);
*
* \sa InitComplexShapingEngine, CreateLayout
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL GUIAPI InitBasicShapingEngine(TEXTRUNS* truns);
@@ -12820,7 +12820,7 @@ MG_EXPORT BOOL GUIAPI InitBasicShapingEngine(TEXTRUNS* truns);
*
* \sa InitBasicShapingEngine, CreateLayout
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL GUIAPI InitComplexShapingEngine(TEXTRUNS* truns);
@@ -12861,7 +12861,7 @@ typedef struct _LAYOUTLINE LAYOUTLINE;
* \sa CreateTextRuns, InitBasicShapingEngine, InitComplexShapingEngine,
* UStrGetBreaks, LayoutNextLine
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT LAYOUT* GUIAPI CreateLayout(
const TEXTRUNS* truns, Uint32 render_flags,
@@ -12882,7 +12882,7 @@ MG_EXPORT LAYOUT* GUIAPI CreateLayout(
*
* \sa CreateLayout
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL GUIAPI DestroyLayout(LAYOUT* layout);
@@ -12944,7 +12944,7 @@ typedef struct _RENDERDATA {
*
* \sa LayoutNextLine, GLYPHPOS, RENDERDATA
*
* Since 3.4.0
* Since 4.0.0
*/
typedef BOOL (*CB_GLYPH_LAID_OUT) (GHANDLE ctxt,
Glyph32 glyph_value, const GLYPHPOS* glyph_pos,
@@ -12990,7 +12990,7 @@ typedef BOOL (*CB_GLYPH_LAID_OUT) (GHANDLE ctxt,
*
* \sa CreateLayout, DestroyLayout, CreateTextRuns
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT LAYOUTLINE* GUIAPI LayoutNextLine(LAYOUT* layout,
LAYOUTLINE* prev_line, int max_extent, BOOL last_line,
@@ -13010,7 +13010,7 @@ MG_EXPORT LAYOUTLINE* GUIAPI LayoutNextLine(LAYOUT* layout,
*
* \sa CreateLayout, DestroyLayout, LayoutNextLine
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL GUIAPI GetLayoutLineSize(const LAYOUTLINE* line,
SIZE* line_size);
@@ -13044,7 +13044,7 @@ MG_EXPORT BOOL GUIAPI GetLayoutLineSize(const LAYOUTLINE* line,
* \sa CreateLayout, DestroyLayout, LayoutNextLine,
* GetLayoutLineSize
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL GUIAPI GetLayoutLineRect(const LAYOUTLINE* line,
int* x, int* y, int line_height, RECT* line_rc);
@@ -13082,7 +13082,7 @@ MG_EXPORT BOOL GUIAPI GetLayoutLineRect(const LAYOUTLINE* line,
* \sa CreateLayout, DestroyLayout, LayoutNextLine
* GetLayoutLineRect
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT int GUIAPI CalcLayoutBoundingRect(LAYOUT* layout,
int max_line_extent, int max_height, int line_height,
@@ -13115,7 +13115,7 @@ MG_EXPORT int GUIAPI CalcLayoutBoundingRect(LAYOUT* layout,
* \sa CreateLayout, DestroyLayout, LayoutNextLine,
* DrawLayoutLine, GLYPHPOS, RENDERDATA
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT BOOL DrawShapedGlyph(HDC hdc,
Glyph32 glyph_value, const GLYPHPOS* glyph_pos,
@@ -13152,7 +13152,7 @@ MG_EXPORT BOOL DrawShapedGlyph(HDC hdc,
*
* \sa CreateLayout, DestroyLayout, LayoutNextLine
*
* Since 3.4.0
* Since 4.0.0
*/
MG_EXPORT int DrawLayoutLine(HDC hdc, const LAYOUTLINE* line,
int x, int y);

20
include/minigui.h
View File

@@ -3610,7 +3610,7 @@ MG_EXPORT char * strtrimall (char* src);
* Returns: a pointer to the allocated memory block, which will be %NULL if and
* only if @mem_size is 0
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void *mg_slice_alloc(size_t block_size);
@@ -3626,7 +3626,7 @@ MG_EXPORT void *mg_slice_alloc(size_t block_size);
* Returns: a pointer to the allocated block, which will be %NULL if and only
* if @mem_size is 0
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void *mg_slice_alloc0(size_t block_size);
@@ -3643,7 +3643,7 @@ MG_EXPORT void *mg_slice_alloc0(size_t block_size);
* Returns: a pointer to the allocated memory block, which will be %NULL if and
* only if @mem_size is 0
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void *mg_slice_copy(size_t block_size, const void *mem_block);
@@ -3662,7 +3662,7 @@ MG_EXPORT void *mg_slice_copy(size_t block_size, const void *mem_block);
*
* If @mem_block is %NULL, this function does nothing.
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void mg_slice_free(size_t block_size, void *mem_block);
@@ -3684,7 +3684,7 @@ MG_EXPORT void mg_slice_free(size_t block_size, void *mem_block);
*
* If @mem_chain is %NULL, this function does nothing.
*
* Since: 3.4.0
* Since: 4.0.0
*/
MG_EXPORT void mg_slice_free_chain_with_offset(size_t block_size,
void *mem_chain, size_t next_offset);
@@ -3708,7 +3708,7 @@ MG_EXPORT void mg_slice_free_chain_with_offset(size_t block_size,
* Returns: (not nullable): a pointer to the allocated block, cast to a pointer
* to @type
*
* Since: 3.4.0
* Since: 4.0.0
*/
#define mg_slice_new(type) ((type*)mg_slice_alloc(sizeof (type)))
@@ -3732,7 +3732,7 @@ MG_EXPORT void mg_slice_free_chain_with_offset(size_t block_size,
* Returns: (not nullable): a pointer to the allocated block, cast to a pointer
* to @type
*
* Since: 3.4.0
* Since: 4.0.0
*/
#define mg_slice_new0(type) ((type*)mg_slice_alloc0(sizeof (type)))
@@ -3767,7 +3767,7 @@ MG_EXPORT void mg_slice_free_chain_with_offset(size_t block_size,
* Returns: (not nullable): a pointer to the allocated block, cast to a pointer
* to @type
*
* Since: 3.4.0
* Since: 4.0.0
*/
#define mg_slice_dup(type, mem) \
(1 ? (type*) mg_slice_copy (sizeof (type), (mem)) \
@@ -3789,7 +3789,7 @@ MG_EXPORT void mg_slice_free_chain_with_offset(size_t block_size,
*
* If @mem is %NULL, this macro does nothing.
*
* Since: 3.4.0
* Since: 4.0.0
*/
#define mg_slice_delete(type, mem) \
do { \
@@ -3814,7 +3814,7 @@ MG_EXPORT void mg_slice_free_chain_with_offset(size_t block_size,
*
* If @mem_chain is %NULL, this function does nothing.
*
* Since: 3.4.0
* Since: 4.0.0
*/
#define mg_slice_delete_chain(type, mem_chain, next) \
do { \

6
src/font/fontname.c
View File

@@ -236,7 +236,7 @@ DWORD fontConvertStyle (const char* style_part)
case FONT_WEIGHT_BOLD:
style |= FS_WEIGHT_BOLD;
break;
/* deprecated since v3.4.0
/* deprecated since v4.0.0
case FONT_WEIGHT_BOOK:
style |= FS_WEIGHT_BOOK;
break;
@@ -262,7 +262,7 @@ DWORD fontConvertStyle (const char* style_part)
case FONT_WEIGHT_THIN:
style |= FS_WEIGHT_THIN;
break;
/* deprecated since v3.4.0
/* deprecated since v4.0.0
case FONT_WEIGHT_SUBPIXEL:
style |= FS_WEIGHT_SUBPIXEL;
break;
@@ -472,7 +472,7 @@ int fontGetWidthFromName (const char* name)
return atoi (width);
}
/* Since 3.4.0; only for LOGFONT name */
/* Since 4.0.0; only for LOGFONT name */
char fontGetOrientFromName (const char* name)
{
int i;

2
src/font/utils/gen-arabic-shaping-tab.c
View File

@@ -1,7 +1,7 @@
/* MGBidi
* gen-arabic-shaping-tab.c - generate unicode-arabic-shaping-table.h
*
* Revised from FriBidi by Vincent Wei for MiniGUI 3.4.0
* Revised from FriBidi by Vincent Wei for MiniGUI 4.0.0
*
* Authors of FriBidi:
* Behdad Esfahbod, 2004, 2005

2
src/font/utils/gen-bidi-type-tab.c
View File

@@ -1,7 +1,7 @@
/* MGBidi
* gen-bidi-type-tab.c - generate unicode-bidi-type-table.h
*
* Revised from FriBidi by Vincent Wei for MiniGUI 3.4.0
* Revised from FriBidi by Vincent Wei for MiniGUI 4.0.0
*
* Authors of FriBidi:
* Behdad Esfahbod, 2001, 2002, 2004

2
src/font/utils/gen-brackets-tab.c
View File

@@ -1,7 +1,7 @@
/* MGBidi
* gen-brackets-tab.c - generate unicode-bidi-brackets-tables.h
*
* Revised from FriBidi by Vincent Wei for MiniGUI 3.4.0
* Revised from FriBidi by Vincent Wei for MiniGUI 4.0.0
*
* Authors of FriBidi:
* Behdad Esfahbod, 2001, 2002, 2004

2
src/font/utils/gen-brackets-type-tab.c
View File

@@ -1,7 +1,7 @@
/* MGBidi
* gen-brackets-type-tab.c - generate unicode-bidi-brackets-type-table.h
*
* Revised from FriBidi by Vincent Wei for MiniGUI 3.4.0
* Revised from FriBidi by Vincent Wei for MiniGUI 4.0.0
*
* Authors of FriBidi:
* Behdad Esfahbod, 2001, 2002, 2004

2
src/font/utils/gen-joining-type-tab.c
View File

@@ -1,7 +1,7 @@
/* MGBidi
* gen-joining-type-tab.c - generate unicode-joining-type-table.h
*
* Revised from FriBidi by Vincent Wei for MiniGUI 3.4.0
* Revised from FriBidi by Vincent Wei for MiniGUI 4.0.0
*
* Authors of FriBidi:
* Behdad Esfahbod, 2004

2
src/font/utils/gen-mirroring-tab.c
View File

@@ -1,7 +1,7 @@
/* MGBidi
* gen-mirroring-tab.c - generate unicode-bidi-mirroring-table.h
*
* Revised from FriBidi by Vincent Wei for MiniGUI 3.4.0
* Revised from FriBidi by Vincent Wei for MiniGUI 4.0.0
*
* Authors of FriBidi:
* Behdad Esfahbod, 2001, 2002, 2004

2
src/font/utils/gen-unicode-version.c
View File

@@ -1,7 +1,7 @@
/* MGBidi
* gen-unicode-version.c - generate unicode-version.h
*
* Revised from FriBidi by Vincent Wei for MiniGUI 3.4.0
* Revised from FriBidi by Vincent Wei for MiniGUI 4.0.0
*
* Authors of FriBidi:
* Behdad Esfahbod, 2001, 2002, 2004

2
src/font/utils/gen-vop-tab.c
View File

@@ -1,7 +1,7 @@
/*
* gen-vop-tab.c - generate unicode-vop-table.inc
*
* Derived from utilities of FriBidi by Vincent Wei for MiniGUI 3.4.0
* Derived from utilities of FriBidi by Vincent Wei for MiniGUI 4.0.0
*
* Authors of FriBidi:
* Behdad Esfahbod, 2004, 2005

4
src/include/devfont.h
View File

@@ -322,14 +322,14 @@ struct _FONTOPS
* The method to get the glyph value according to the character value.
* If it is NULL, the glyph value will be equal to the character value.
*
* Since 3.4.0.
* Since 4.0.0.
*/
Glyph32 (*get_glyph_value) (LOGFONT* logfont, DEVFONT* devfont, Achar32 chv);
/**
* The method to get the kerning delta values
*
* Since 3.4.0.
* Since 4.0.0.
*/
void (*get_kerning) (LOGFONT* logfont, DEVFONT* devfont,
Glyph32 prev, Glyph32 curr, int* delta_x, int* delta_y);

1
src/libc/mgslice.c
View File

@@ -75,6 +75,7 @@
#endif
#include <stdio.h> /* fputs */
#include <pthread.h> /* pthread_xxx */
/* the slice allocator is split up into 4 layers, roughly modelled after the slab
* allocator and magazine extensions as outlined in:

8
src/newgdi/glyph-old.c
View File

@@ -1806,7 +1806,7 @@ int _gdi_draw_one_glyph (PDC pdc, Glyph32 glyph_value, BOOL direction,
fg_gal_rc.w = bbox.w + italic;
fg_gal_rc.h = bbox.h;
#if 0 // VincentWei: use FS_DECORATE_XXXX instead (3.4.0)
#if 0 // VincentWei: use FS_DECORATE_XXXX instead (4.0.0)
if ( pdc->bkmode != BM_TRANSPARENT
|| logfont->style & FS_UNDERLINE_LINE
|| logfont->style & FS_STRUCKOUT_LINE )
@@ -1817,7 +1817,7 @@ int _gdi_draw_one_glyph (PDC pdc, Glyph32 glyph_value, BOOL direction,
#endif
need_rc_back = TRUE;
#if 0 // VincentWei: use FS_RENDER_MASK instead (3.4.0)
#if 0 // VincentWei: use FS_RENDER_MASK instead (4.0.0)
if (glyph_bmptype == DEVFONTGLYPHTYPE_MONOBMP) {
if (logfont->style & FS_WEIGHT_BOOK_LIGHT) {
fg_gal_rc.x--; fg_gal_rc.y--;
@@ -1845,7 +1845,7 @@ int _gdi_draw_one_glyph (PDC pdc, Glyph32 glyph_value, BOOL direction,
make_back_area(pdc, x+*adv_x, y+*adv_y, x, y,
area, &bg_gal_rc, &flag);
#if 0 // VincentWei: use FS_RENDER_MASK instead (3.4.0)
#if 0 // VincentWei: use FS_RENDER_MASK instead (4.0.0)
if (glyph_bmptype == DEVFONTGLYPHTYPE_MONOBMP) {
if (logfont->style & FS_WEIGHT_BOOK_LIGHT) {
bg_gal_rc.x--; bg_gal_rc.y--;
@@ -1912,7 +1912,7 @@ int _gdi_draw_one_glyph (PDC pdc, Glyph32 glyph_value, BOOL direction,
bbx_size.cx = bbox.w;
bbx_size.cy = bbox.h;
#if 0 // VincentWei: use FS_RENDER_MASK instead (3.4.0)
#if 0 // VincentWei: use FS_RENDER_MASK instead (4.0.0)
if (logfont->style & FS_WEIGHT_BOOK) {
if(! get_book_bmp(pdc, glyph_value, &bbx_size, bold, italic))
is_draw_glyph = FALSE;