change GLYPHTYPE_ to CHARTYPE_

.gitignore

@@ -22,5 +22,4 @@ Makefile.in
 /*.pc
 /*config.h
 /*config.h.in
-/*config.h.in~
 

AUTHORS

@@ -1,2 +0,0 @@
-Beijing FMSoft Technologies Co., Ltd.. (http://www.fmsoft.cn)
-

AUTHORS.md

@@ -0,0 +1,16 @@
+The current main maintainers and/or developers:
+
+* WEI Yongming
+
+As employed engineers of [Beijing FMSoft Technologies Co., Ltd.],
+the following people have participated in the development of MiniGUI Core:
+
+* HOU Huihua
+* WAN Zheng
+* DONG Kai
+* DONG Junjie
+* YAN Xiaowei
+
+For community contributors, please see RELASENOTES.md documentation.
+
+[Beijing FMSoft Technologies Co., Ltd.]: http://www.fmsoft.cn

ChangeLog

@@ -3216,7 +3216,7 @@ alExtra.(xwyan)
 	* src/gui/lf_flat.c
 	* src/gui/lf_skin.c
 
-08/24: ENHANCEMENT #1: Add a new method for FONTOPS: get_glyph_type to return
+08/24: ENHANCEMENT #1: Add a new method for FONTOPS: get_char_type to return
 the glyph type the devfont can give us.
 	* src/include/devfont.h
 	* src/font/*.c
@@ -4761,7 +4761,7 @@ create_skin_main_window_ex:
 	* ext/skin/skin.c
 
 05/16. ENHANCEMENT #8: Support for UTF-16LE and UTF-16BE charsets/encodings.
-	* Change the definition of UChar32 to 'int'.
+	* Change the definition of Uchar32 to 'int'.
 		* include/gdi.h
 
 05/16. ENHANCEMENT #11: Support for FreeType2.

Doxyfile.sa

@@ -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.2.0
+PROJECT_NUMBER         = v3.4.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

README.md

@@ -2,10 +2,12 @@
 
 A mature and proven cross-platform GUI system for embedded and smart IoT devices.
 
+
 ## TABLE OF CONTENTS
 
   1. Introduction
   1. A brief building instruction
+  1. New features in version 3.4.x
   1. New features in version 3.2.x
   1. The runtime modes of MiniGUI
   1. History
@@ -21,7 +23,7 @@ A mature and proven cross-platform GUI system for embedded and smart IoT devices
 MiniGUI is a mature cross-platform windowing system and a GUI (Graphics
 User Interface) support system for embedded systems and smart IoT devices.
 This is the version 3.2.x of MiniGUI maintained by WEI Yongming
-(Vincent Wei, <https://github.com/VincentWei>).
+(Vincent Wei, https://github.com/VincentWei).
 
 MiniGUI is released under GPLv3 and the dual-licensing applies to commercial
 use.
@@ -29,39 +31,45 @@ use.
 MiniGUI aims to provide a fast, stable, full-featured, and cross-platform
 windowing and GUI support system, which is especially fit for
 embedded systems or smart IoT devices based-on Linux/uClinux, eCos, and other
-traditional RTOSes, such as RTEMS, VxWorks, ThreadX, Nucleus, pSOS, uC/OS-II,
+traditional RTOSes, such as VxWorks, ThreadX, Nucleus, pSOS, uC/OS-II,
 and OSE.
 
 This is the MiniGUI core source tree, which provides windowing
-and graphics interfaces as well as a lot of standard controls (toolkit).
+and graphics interfaces as well as a lot of standard controls (tookit).
 
 Besides MiniGUI core, FMSoft also provides some components
 for the developers to develop app much easier:
 
-* mGUtils: A MiniGUI component which contains miscellaneous utilities
-  like `ColorSelectionDialogBox`, `FileOpenDialogBox`, and so on.
-* mGPlus: A MiniGUI component which provides support for advanced graphics
-  functions like path, gradient, anti-aliased stretch, and color combination.
-* mGEff: mGEff provides an animation framework for MiniGUI app.
-  It also provides some popular UI/UE special effects.
-* mGNCS: This component provides a new control set for MiniGUI app.
-  By using mGNCS, you can use miniStudio to develop MiniGUI app in
-  WYSIWYG way.
-* mGNCS4Touch: This component provides some new controls, which are
-  compliant to the new control API spec of mGNCS, for devices with
-  a touch screen.
+  * mGUtils: A MiniGUI component which contains miscellaneous utilities
+    like ColorSelectionDialogBox, FileOpenDialogBox, and so on.
+
+  * mGPlus: A MiniGUI component which provides support for advanced graphics
+    functions like path, gradient, anti-aliase stretch, and color combination.
+
+  * mGEff: mGEff provides an animation framework for MiniGUI app.
+     It also provides some popular UI/UE special effects.
+
+  * mGNCS: This component provides a new control set for MiniGUI app.
+    By using mGNCS, you can use miniStudio to develop MiniGUI app in
+    WYSIWYG way.
+
+  * mGNCS4Touch: This component provides some new controls, which are
+    compliant to the new control API spec of mGNCS, for devices with
+    a touch screen.
 
 There are also some legacy MiniGUI components. We will not maintain these
-components for MiniGUI 3.2.x:
+components for MiniGUI core v3.2:
 
-* mGi: An input method component for MiniGUI. This component provides
-  some typical input methods (such as soft keyboard, hand-writing, and predict
-  text input for mobile phone) for MiniGUI apps.
-* mGp: A printing component for MiniGUI. By using mGp, you can print
-  out the graphics created by MiniGUI app to general-purpose printers.
-* mG3d: A simple three-dimension component for MiniGUI. This component
-  provides a simple 3D API for app. You can use mG3d to create simple
-  3D UI.
+  * mGi: An input method component for MiniGUI. This component provides
+    some typical input methods (such as softkey, hand-writing, and predict
+    text input for mobile phone) for MiniGUI apps.
+
+  * mGp: A printing component for MiniGUI. By using mGp, you can print
+    out the graphics created by MiniGUI app to general-purpose printers.
+
+  * mG3d: A simple three-dimension component for MiniGUI. This component
+    provides a simple 3D API for app. You can use mG3d to create simple
+    3D UI.
 
 MiniGUI is a free software project. In December 1998, the initiator of
 FMSoft, Wei Yongming, began to develop MiniGUI under the GNU General Public
@@ -73,34 +81,34 @@ as a free software project.
 You can download the source code tarball of MiniGUI and the dependent libraries
 from the download zone of the site:
 
-<http://www.minigui.com>
+  http://www.minigui.com
 
 FMSoft also releases some open source apps for MiniGUI on the site above,
 for examples:
 
-* mDolphin, licensed under Apache 2.0, is a full-featured
-  WEB/WAP browser, which is developed based on the open source browser
-  core WebKit and uses MiniGUI as its underlying graphics support system.
-* mGallery, licensed under Apache 2.0, intends to
-  provide a total solution for PMP (Portable Multimedia Player),
-  which uses MiniGUI as the graphics platform.
-* mSpider, licensed under GPL 3.0, intends to provide a
-  light-weight MiniGUI-based web browser (HTML 3.2 and part JavaScript)
-* mEagle, licensed under GPL 3.0, is an embedded GIS development platform
-  which addresses the needs of map browse, query, analysis, etc
+  * mDolphin, licensed under Apache 2.0, is a full-featured
+    WEB/WAP browser, which is developed based on the open source browser
+    core WebKit and uses MiniGUI as its underlying graphics support system.
+
+  * mGallery, licensed under Apache 2.0, intends to
+    provide a total solution for PMP (Portable Multimedia Player),
+    which uses MiniGUI as the graphics platform.
+
+  * mSpider, licensed under GPL 3.0, intends to provide a
+    light-weight MiniGUI-based web browser (HTML 3.2 and part JavaScript)
+
+  * mEagle, licensed under GPL 3.0, is an embedded GIS development platform
+    which addresses the needs of map browse, query, analysis, etc
 
 FMSoft had created the public repositories for MiniGUI core, MiniGUI
 components, and other open source apps on GitHub. You can visit them on:
 
-<https://github.com/VincentWei>
+https://github.com/VincentWei
 
-and
+FMSoft also releases miniStudio, which is a WYSIWYG IDE for MiniGUI, as a shareware.
+You can also download it from the official site of MiniGUI.
 
-<https://github.com/FMSoftCN>
-
-We now maintain all documents about MiniGUI on the following public repo:
-
-<https://github.com/VincentWei/minigui-docs>
+http://www.minigui.com/en/download
 
 
 ## A BRIEF BUILDING INSTRUCTION
@@ -139,6 +147,15 @@ For more information, please run
     $ ./configure --help
 
 
+## NEW FEATURES IN VERSION 3.4.x
+
+We introduce some new features in MiniGUI Version 3.4.x:
+
+  * The font and UNICODE related APIs are tuned or enhanced,
+    in order to support HybridOS Foundation C++ Library.
+
+For more information, please refer to RELEASENOTES.md file.
+
 ## NEW FEATURES IN VERSION 3.2.x
 
 We introduce some new features in MiniGUI Version 3.2.x:
@@ -195,7 +212,7 @@ clients and the server.
 
 ## HISTORY
 
-About ten years have pasted since MiniGUI was initially created at
+21 years have pasted since MiniGUI was initially created at
 the end of 1998, and now it becomes much reliable and stable.
 During the past years, many remarkable changes have taken place in
 the MiniGUI project.
@@ -288,6 +305,7 @@ A brief history description of the development progress lay below:
   45) Aug., 2017:     FMSoft released the latest source code of mDolphin under Apache 2.0.
   46) Dec., 2017:     FMSoft updated MiniGUI and miniStudio for latest Linux distributions.
   47) Feb., 2018:     FMSoft released MiniGUI version 3.2.
+  47) Jun., 2019:     FMSoft released MiniGUI version 3.4.
 
 
 ## ABOUT THE AUTHORS
@@ -337,53 +355,36 @@ the commercial license of MiniGUI, please refer to the LICENSE-POLICY file.
 
 We provide you the commercial license of MiniGUI according to the number
 of the run-time binary copies of MiniGUI. If you are interested in
-the commercial license of MiniGUI, please write to <sales@minigui.com>
+the commercial license of MiniGUI, please write to sales@minigui.com.
 
 
 ## COPYING
 
-Copyright (C) 2002 ~ 2019, Beijing FMSoft Technologies Co., Ltd.  
-Copyright (C) 1998 ~ 2002, WEI Yongming
+    Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd.
+    Copyright (C) 1998~2002, WEI Yongming
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-Or,
+    Or,
 
-As this program is a library, any link to this program must follow
-GNU General Public License version 3 (GPLv3). If you cannot accept
-GPLv3, you need to be licensed from FMSoft.
+    As this program is a library, any link to this program must follow
+    GNU General Public License version 3 (GPLv3). If you cannot accept
+    GPLv3, you need to be licensed from FMSoft.
 
-If you have got a commercial license of this program, please use it
-under the terms and conditions of the commercial license.
+    If you have got a commercial license of this program, please use it
+    under the terms and conditions of the commercial license.
 
-For more information about the commercial license, please refer to
-<http://www.minigui.com/blog/minigui-licensing-policy/>.
-
-### Special Statement
-
-The above open source or free software license does
-not apply to any entity in the Exception List published by
-Beijing FMSoft Technologies Co., Ltd.
-
-If you are or the entity you represent is listed in the Exception List,
-the above open source or free software license does not apply to you
-or the entity you represent. Regardless of the purpose, you should not
-use the software in any way whatsoever, including but not limited to
-downloading, viewing, copying, distributing, compiling, and running.
-If you have already downloaded it, you MUST destroy all of its copies.
-
-The Exception List is published by FMSoft and may be updated
-from time to time. For more information, please see
-<https://www.fmsoft.cn/exception-list>.
+    For more information about the commercial license, please refer to
+    <http://www.minigui.com/en/about/licensing-policy/>.
 

RELEASE-NOTES.md

@@ -1,67 +1,178 @@
 # Release Notes
 
-## Version 3.2.3
+## Version 3.4.0
 
-The MiniGUI development team announces the availability of MiniGUI 3.2.3.
+The MiniGUI development team announces the availability of MiniGUI 3.4.0.
 All users of MiniGUI are recommended strongly to use this version.
 Please report any bugs and incompatibilities in
 
-<https://github.com/VincentWei/minigui/tree/rel-3-2>
+    https://github.com/VincentWei/minigui
+
+### What's new in this version
+
+In this version, we mainly enhanced and tuned the APIs of font rendering.
+
+#### Tunning the logical font APIs
+
+The styles of LOGFONT changed.
+
+* Add new rendering style:
+  1. `FS_RENDER_ANY`: Not specified
+  1. `FS_RENDER_MONO`:
+  1. `FS_RENDER_GREY`:
+  1. `FS_RENDER_SUBPIXEL`:
+* Some old styles are deprecated:
+  1. `FS_WEIGHT_BOOK`; use `FS_RENDER_GREY` instead.
+  1. `FS_WEIGHT_SUBPIXEL`; use `FS_RENDER_SUBPIXEL` instead.
+* Introduced or redefined the weight styles to follow OpenType specification:
+  1. `FONT_WEIGHT_ANY`: Not specified
+  1. `FONT_WEIGHT_THIN`: Thin.
+  1. `FONT_WEIGHT_EXTRA_LIGHT`: Extra light (Ultra Light).
+  1. `FONT_WEIGHT_LIGHT`: Light.
+  1. `FONT_WEIGHT_REGULAR`: Regular (Normal).
+  1. `FONT_WEIGHT_MEDIUM`: Medium.
+  1. `FONT_WEIGHT_DEMIBOLD`: Demi Bold (Semi Bold)
+  1. `FONT_WEIGHT_BOLD`: Bold.
+  1. `FONT_WEIGHT_EXTRA_BOLD`: Extra Bold (Ultra Bold).
+  1. `FONT_WEIGHT_BLACK`: Black (Heavy).
+* Introduce the new decoration styles and replace 
+`FONT_UNDERLINE_LINE` and `FONT_STRUCKOUT_LINE` with them:
+  1. `FONT_DECORATE_ANY`: Not specified.
+  1. `FONT_DECORATE_NONE`: None.
+  1. `FONT_DECORATE_UNDERLINE`: glyphs are underscored.
+  1. `FONT_DECORATE_STRUCKOUT`: glyphs are overstruck.
+  1. `FONT_DECORATE_US`: Both `FONT_DECORATE_UNDERLINE` and `FONT_DECORATE_STRUCKOUT`.
+  1. `FONT_DECORATE_OUTLINE`: Outline (hollow) glyphs.
+  1. `FONT_DECORATE_REVERSE`: Reverved for future. Glyphs have their foreground and background reversed.
+* The following style are deprecated:
+  1. `FONT_OTHER_LCDPORTRAIT`
+  1. `FONT_OTHER_LCDPORTRAITKERN`
+
+For a new app, you should use the new function `CreateLogFontEx` to
+create a LOGFONT, and specify the weight and rendering method of the glyph.
+
+For the back-compatibility, you can still use `CreateLogFont` to create a new
+LOGFONT. However, `FS_WEIGHT_BOOK` will be treated `FS_WEIGHT_REGULAR` and
+`FS_RENDER_GREY`, while `FS_WEIGHT_SUBPIXEL` will be treated
+`FS_WEIGHT_REGULAR` and `FS_RENDER_SUBPIXEL`.
+
+You can still use `CreateLogFontByName` to create a new LOGFONT.
+But the style string in the font name changed from
+
+    <weight><slant><flipping><other><underline><struckout>
+
+to
+
+    <weight><slant><flipping><other><decoration><rendering>
+
+Note that `<underline>` and `<struckout>` are merged to `<decoration>`
+in order to keep the style string is still 6-character long.
+
+Consequently, if you want to use the rendering method SUPIXEL for a TTF font,
+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:
+
+    <fonttype>-<family[,aliase]*>-<styles>-<width>-<height>-<charset[,charset]*>
+
+for example:
+
+    ttf-Arial,Sans Serif-rrncnn-8-16-ISO8859-1,UTF-8
+    ttf-courier,monospace,serif-rrncnn-8-16-ISO8859-1,UTF-8
+
+Note that the length of one DEVFONT name can not exceed 255 bytes.
+
+#### Changed APIs
+
+* The fields `height` and `descent` have been removed from GLYPHINFO struct.
+One should get the font metrics information by calling `GetFontMetrics` function
+if you want to get the height and descent data of one font.
+
+* More fields added for GLYPHBITMAP struct in order to return the completed
+rasterized glyph bitmap information.
+
+* `GetGlyphInfo` now can return the basic glyph type and break type of a
+UNICODE character. If the glyph is an ASCII character, the old `MCHAR_TYPE`
+can also be returned.
+
+* Rename `mg_FT_LcdFilter` to `FT2LCDFilter` in order to follow MiniGUI naming
+rules.
+
+* Rename `UChar32` to `Uchar32` and `UChar16` to `Uchar16` in order to
+avoid the conflict with typedef of UChar32 in 'unicode/umachine.h'.
+
+* Redefine `Uchar32` and `Glyph32` as `Uint32` instead of `int`.
+
+#### New APIs
+
+* `GetGlyphsByRules` function calculates and allocates the glyph string from
+a multi-byte string under the specified white space rule and transformation
+rule.
+
+* `GetGlyphsExtentPointEx` function gets the visual extent information
+of a glyph string which can fit in a line with the specified maximal extent.
+
+* `DrawGlyphStringEx` function draws a glyph string to the specific
+positions of a DC.
+
+* `CreateLogFontIndirectEx` creates a new LOGFONT by using the value of
+an existed LOGFONT but with a new rotation value.
+
+#### Others
+
+* Support for FreeType1 removed.
+
+You should always use FreeType2 to support vector fonts, such as TrueType
+fonts (TTF), TrueType collections (TTC), OpenType fonts (OTF, both TrueType
+and CFF variants), OpenType collections (OTC), and Type 1 fonts (PFA and PFB).
+
+### Other Changes
+
+* A new BITMAP type: `BMP_TYPE_REPLACEKEY`. When `bmType` of a BITMAP object
+has this bit set, any pixel which is equal to `bmColorKey` will be replaced by
+`bmColorRep`.
+
+## Version 3.2.1
+
+The MiniGUI development team announces the availability of MiniGUI 3.2.1.
+All users of MiniGUI are recommended strongly to use this version.
+Please report any bugs and incompatibilities in
+
+    https://github.com/VincentWei/minigui
 
 ### What's new in this version
 
 * ENHANCEMENTS:
-   - Support for RTEMS operating system.
-* BUGFIXES:
-   - Fixed errors in makefile.ng files.
-* CLEANUP:
-   - `README.md` for correct markdown tags.
-
-### What's new in this version
-
-## Version 3.2.2
-
-The MiniGUI development team announces the availability of MiniGUI 3.2.2.
-All users of MiniGUI are recommended strongly to use this version.
-Please report any bugs and incompatibilities in
-
-<https://github.com/VincentWei/minigui>
-
-### What's new in this version
-
-* ENHANCEMENTS:
-  1. New API: `SyncUpdateDC`. You can use this function to synchronize
-    the update rectangles of a surface to screen, if the surface
-    represents the shadow frame buffer of the screen.
-    * configure option: `--enable-syncupdate`
-    * macro: `_MGUSE_SYNC_UPDATE`
-  1. New API `UpdateInvalidClient`. You can use this function to update
-    the invalid client region of a window instantly.
-  1. New API `LoadDevFontFromIncoreData`. You can use this function to load
-    a device font from incore data.
-  1. Use different colors for the output of `_DBG_PRINTF` and `_ERR_PRINTF`.
-  1. Add `__mg_save_jpg` function for storing MYBITMAP as JPEG file (10km).
-  1. Modified logic for checking JPEG format (10km).
-  1. Support BIDI for UNICODE charsets and cleanup the implementation.
-    * New API: `GetGlyphBIDIType` to get the glyph type in BIDI.
-    * New DC attribute: BIDI flag.
   1. Add a new key `dpi` for NEWGAL engine to define the DPI of the screen.
      If it is absent, use 96 as the default DPI.
   1. Add an item for `GetGDCapability` to return DPI of the DC.
   1. New API `InitSlaveScreenEx` to specify the DPI of slave screen.
      Define `InitSlaveScreen` as an inline function calling `InitSlaveScreenEx`.
+  1. New API: `SyncUpdateDC`. You can use this function to synchronize
+    the update rectangles of a surface to screen, if the surface
+    represents the shadow frame buffer of the screen.
+    * configure option: `--enable-syncupdate`
+    * macro: `_MGUSE_SYNC_UPDATE`
+  1. New API: `UpdateInvalidClient`. You can use this function to update
+    the invalid client region of a window instantly.
+  1. Use different colors for the output of `_DBG_PRINTF` and `_ERR_PRINTF`.
+  1. Add `__mg_save_jpg` function for storing MYBITMAP as JPEG file (@10km).
+  1. Modified logic for checking JPEG format (@10km).
+  1. Support BIDI for UNICODE charsets and cleanup the implementation.
+    * New API: `GetGlyphBIDIType` to get the glyph type in BIDI.
+    * New DC attribute: BIDI flag.
   1. Enhance commlcd engint to support more pixel type and synchronously update.
   1. New USVFB IAL engine and NEWGAL engine for web display server.
   1. New type: `QDWORD` for a quauter of DWORD. This type is 16-bit long on
-    64-bit architecture, and 8-bit long on 32-bit.
+64-bit architecture, and 8-bit long on 32-bit.
   1. New macros for QDWORD:
     * `MAKEDWORD`: Make a DWROD from four QDWORDs.
     * `FIRST_QDWORD`: get the first (LSB) QDWORD from a DWORD.
     * `SECOND_QDWORD`: get the second (LSB) QDWORD from a DWORD.
     * `THIRD_QDWORD`: get the third (LSB) QDWORD from a DWORD.
     * `FOURTH_QDWORD`: get the fourth (LSB) QDWORD from a DWORD.
-  1. New header for CommLCD NEWGAL engine and COMM IAL engine:
-    `<minigui/exstubs.h>`.
 
 * BUGFIXING:
   1. handle `PNG_COLOR_TYPE_GRAY_ALPHA` color type of PNG files.
@@ -71,8 +182,9 @@ Please report any bugs and incompatibilities in
   1. Skip null pixels for SUBPIXEL glyphs. This bug will always show background
      pixels of one SUBPIXEL glyph.
   1. Fix the bug of wrong bounding box handling for SUBPIXEL rendering of glyph.
-  1. Tune cache implementation of FreeType2 font engine.
-    * Enable cache for rotated LOGFONT.
+
+* TUNNING:
+  1. Tune GLYPHINFO structure and GetGlyphInfo to return BIDI glyph type.
 
 ## Version 3.2.0
 

Version

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

build/buildlib-min

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 ./configure \
-    --with-runmode=ths \
     --disable-dblclk \
     --disable-cursor \
     --disable-mousecalibrate \

build/buildlib-rtems

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-RTEMS_DIR=/home/projects/movidius/m8_gui/tools/18.11.4/linux64/sparc-myriad-rtems-6.3.0
-
-#RTEMS_GLOBAL_CFLAGS="-ffunction-sections -fdata-sections -fno-rtti -fno-exceptions -finit-priority"
-
-rm -f config.cache config.status
-
-CC=${RTEMS_DIR}/bin/sparc-myriad-rtems-gcc \
-CFLAGS="-I${RTEMS_DIR}/sparc-myriad-rtems/include -I${RTEMS_DIR}/pnglib/include -I${RTEMS_DIR}/zlib/include" \
-LDFLAGS="-L${RTEMS_DIR}/lib/gcc/sparc-myriad-rtems/6.3.0 -L${RTEMS_DIR}/pnglib/lib -L${RTEMS_DIR}/zlib/lib" \
-./configure --prefix=/home/projects/movidius/m8_gui/tools/18.11.4/linux64/sparc-myriad-rtems-6.3.0/minigui \
-    --build=i686-linux \
-    --host=sparc-myriad-rtems \
-    --target=sparc-myriad-rtems \
-    --with-osname=rtems \
-	--with-runmode=ths \
-	--enable-miniguientry \
-    --enable-incoreres \
-    --disable-cursor \
-    --disable-videofbcon \
-    --disable-qvfbial \
-    --disable-vbfsupport \
-    --disable-qpfsupport \
-    --disable-latin9support \
-    --enable-gbksupport \
-    --disable-big5support \
-    --enable-unicodesupport \
-    --disable-savebitmap \
-    --disable-jpgsupport \
-    --disable-pngsupport \
-    --disable-aboutdlg \
-    --enable-adv2dapi \
-	--enable-videodummy \
-	--disable-consoleial \
-	--disable-videopcxvfb \
-	--with-targetname=external \
-	--enable-pngsupport \
-	--disable-develmode \
-	--disable-detaildebug \
-	--disable-tracemsg \
-	--enable-videocommlcd \
-	--enable-commial \
-	--disable-splash

build/rules-pc.linux

@@ -1,36 +0,0 @@
-# rules for pc-linux
-
-# set your own targaet_os
-TARGET_OS=linux
-
-##################################################
-# set your compile tool #
-CC=gcc
-CXX=g++
-CPP=g++
-AR=ar
-AS=as
-RANLIB=ranlib
-MAKE=/usr/bin/make
-##################################################
-
-ARFLAGS=-rc
-COFLAG=-c
-
-OBJ=o
-LIBA=a
-
-##################################################
-# if you don't want to create dynamic, delete it # 
-LIBSO=so
-SOFLAGS=-fPIC -shared -o
-##################################################
-
-
-##################################################
-# set your compile flags and install prefix path # 
-PREFIX=/usr/local
-CFLAGS+=-g -Wall -fPIC `pkg-config --cflags freetype2`
-LDFLAGS+=
-##################################################
-

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.60)
-AC_INIT(libminigui, 3.2.3)
+AC_INIT(libminigui, 3.4.0)
 AC_CONFIG_SRCDIR(src/main/main.c)
 
 dnl Set various version strings - taken gratefully from the SDL sources
@@ -15,10 +15,10 @@ dnl Set various version strings - taken gratefully from the SDL sources
 # set MINIGUI_BINARY_AGE and MINIGUI_INTERFACE_AGE to 0.
 #
 MINIGUI_MAJOR_VERSION=3
-MINIGUI_MINOR_VERSION=2
-MINIGUI_MICRO_VERSION=3
+MINIGUI_MINOR_VERSION=4
+MINIGUI_MICRO_VERSION=0
 MINIGUI_INTERFACE_AGE=0
-MINIGUI_BINARY_AGE=3
+MINIGUI_BINARY_AGE=0
 MINIGUI_VERSION=$MINIGUI_MAJOR_VERSION.$MINIGUI_MINOR_VERSION.$MINIGUI_MICRO_VERSION
 
 AC_SUBST(MINIGUI_MAJOR_VERSION)
@@ -62,7 +62,7 @@ dnl ========================================================================
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS(limits.h math.h locale.h unistd.h termio.h sys/types.h sys/time.h)
+AC_CHECK_HEADERS(sys/types.h sys/time.h termio.h unistd.h math.h locale.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -76,7 +76,7 @@ AC_FUNC_ALLOCA
 AC_FUNC_MEMCMP
 AC_FUNC_MMAP
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(time mktime localtime strdup strcasecmp strncasecmp strerror setlocale)
+AC_CHECK_FUNCS(time mktime localtime strdup strcasecmp strncasecmp strerror setlocale getpt)
 
 dnl ========================================================================
 dnl User selectable options
@@ -89,6 +89,8 @@ message_string="no"
 
 runtime_mode="procs"
 
+stand_alone="no"
+
 incore_res="no"
 use_miniguientry="no"
 fixed_math="yes"
@@ -302,6 +304,10 @@ AC_ARG_WITH(runmode,
 [  --with-runmode=procs/ths/sa  the MiniGUI runtime mode <default=procs>],
 runtime_mode=$withval)
 
+AC_ARG_ENABLE(standalone,
+[  --enable-standalone      build MiniGUI-Standalone version <default=no>],
+stand_alone=$enableval)
+
 AC_ARG_ENABLE(incoreres,
 [  --enable-incoreres       use incore resource instead file IO to initialize MiniGUI <default=no>],
 incore_res=$enableval)
@@ -383,7 +389,7 @@ AC_ARG_ENABLE(netial,
 build_net_ial_engine=$enableval)
 
 AC_ARG_ENABLE(cisco_touchpad_ial,
-[  --enable-cisco_touchpad_ial    build the IAL engine for Cisco Touchpad <default=no>],
+[  --enable-cisco_touchpad_ial	build the IAL engine for Cisco Touchpad <default=no>],
 build_cisco_touchpad_ial_engine=$enableval)
 
 AC_ARG_ENABLE(mstar_ial,
@@ -531,7 +537,7 @@ AC_ARG_ENABLE(sefsupport,
 build_sef_support=$enableval)
 
 AC_ARG_WITH(ttfsupport,
-[  --with-ttfsupport=ft1/ft2/none   How to support TrueType font (FreeType 1/FreeType 2/None) <default=none>],
+[  --with-ttfsupport=ft2/none   How to support TrueType font (FreeType 2 or None) <default=ft2>],
 use_ttf_lib=$withval)
 
 AC_ARG_ENABLE(ttfcache,
@@ -726,8 +732,9 @@ AC_ARG_ENABLE(ctrlbidisledit,
 [  --enable-ctrlbidisledit  include Single-Line BIDI EDIT control <default=no>],
 build_ctrl_bidisledit=$enableval)
 
-AC_ARG_ENABLE(ctrlnewtextedit,
-[  --disable-ctrlnewtextedit    include the new implementation of TEXTEDIT control <default=yes>],
+dnl enable new textedit
+AC_ARG_ENABLE(newtextedit,
+[  --enable-ctrlnewtextedit include the new implementation of TEXTEDIT control <default=yes>],
 build_ctrl_textedit_new=$enableval)
 
 AC_ARG_ENABLE(ctrllistbox,
@@ -885,21 +892,21 @@ CheckXVFB()
 [  --enable-videortosxvfb   include RTOS Virtual FrameBuffer NEWGAL engine <default=no>. Please disable pcxvfb to enable rtosxvfb],
     enable_video_rtos_xvfb=$enableval)
 
-    if test "x$enable_video_pc_xvfb" = "xyes"; then
-dnl    CheckPCXVFB
+	if test "x$enable_video_pc_xvfb" = "xyes"; then
+dnl	CheckPCXVFB
         AC_DEFINE(_MGGAL_PCXVFB, 1,
                 [Define if include PC Virtual FrameBuffer NEWGAL engine])
         VIDEO_SUBDIRS="$VIDEO_SUBDIRS pcxvfb"
         VIDEO_DRIVERS="$VIDEO_DRIVERS pcxvfb/libvideo_pcxvfb.la"
-    else     
-        if test "x$enable_video_rtos_xvfb" = "xyes"; then
-dnl    CheckRTOSXVFB
+	else 	
+		if test "x$enable_video_rtos_xvfb" = "xyes"; then
+dnl	CheckRTOSXVFB
         AC_DEFINE(_MGGAL_RTOSXVFB, 1,
                 [Define if include RTOS Virtual FrameBuffer NEWGAL engine])
         VIDEO_SUBDIRS="$VIDEO_SUBDIRS rtos_xvfb"
         VIDEO_DRIVERS="$VIDEO_DRIVERS rtos_xvfb/libvideo_rtos_xvfb.la"
-        fi
-    fi
+		fi
+	fi
 }
 
 
@@ -1397,18 +1404,12 @@ case "$with_libsuffix" in
 esac
 
 AC_ARG_WITH(osname,
-   [  --with-osname=linux/uclinux/ecos/ucos2/swlinux/vxworks/win32/darwin/threadx/cygwin/nucleus/ose/psos/rtems])
+   [  --with-osname=linux/uclinux/ecos/ucos2/swlinux/vxworks/win32/darwin/threadx/cygwin/nucleus/ose/psos])
 
 dnl configure.in file is used only for the following OSes: linux/uclinux/swlinux/ecos/darwin/cygwin
 dnl for other OSes, you should use makefile.ng or else.
 
 case "$with_osname" in
-  rtems)
-    AC_DEFINE(__RTEMS__, 1,
-            [Define if compile for rtems])
-    AC_DEFINE(__NOUNIX__, 1,
-            [Define if compile for non-UNIX like OS])
-    ;;
   uclinux)
     AC_DEFINE(__uClinux__, 1,
             [Define if compile for uClinux])
@@ -1512,17 +1513,13 @@ AC_ARG_WITH(targetname,
                         S3C6410/S3C2440/S3C2410/hi3560a     Define the target board name])
 
 case "$with_targetname" in
-  external)
-    AC_DEFINE(__TARGET_EXTERNAL__, 1,
-        [Define for targets which use GAL and/or IAL engines and define the interfaces externally])
-   ;;
   fmsoft)
     AC_DEFINE(__TARGET_FMSOFT__, 1,
-        [Define for FMSoft internal use])
+	    [Define for FMSoft internal use])
    ;;
   mstudio)
     AC_DEFINE(__TARGET_MSTUDIO__, 1,
-        [Define for FMSoft miniStudio])
+	    [Define for FMSoft miniStudio])
    ;;
   stb810)
     AC_DEFINE(__TARGET_STB810__, 1,
@@ -1550,11 +1547,11 @@ case "$with_targetname" in
     ;;
   bfin)
     AC_DEFINE(__TARGET_BLACKFIN__, 1,
-        [Define for Blackfin run uClinux])
+	    [Define for Blackfin run uClinux])
    ;;
   c33l05)
     AC_DEFINE(__TARGET_C33L05__, 1,
-        [Define for EPSON C33L05 (axLinux)])
+	    [Define for EPSON C33L05 (axLinux)])
    ;;
   S3C6410)
     CFLAGS="$CFLAGS -D_WITH_TARGET_S3C6410"
@@ -1981,17 +1978,20 @@ fi
 
 dnl Check FreeType lib
 case "$use_ttf_lib" in
+  ft2)
+dnl Check for FreeType2 library
+    AC_CHECK_LIB(freetype, FT_Library_Version,
+        DEP_LIBS="$DEP_LIBS -lfreetype",
+        use_ttf_lib="none")
+    ;;
   ft1)
 dnl Check for FreeType1 library
     AC_CHECK_LIB(ttf, TT_FreeType_Version,
             DEP_LIBS="$DEP_LIBS -lttf",
             use_ttf_lib="none")
     ;;
-  ft2)
-dnl Check for FreeType2 library
-    AC_CHECK_LIB(freetype, FT_Library_Version,
-        DEP_LIBS="$DEP_LIBS -lfreetype",
-        use_ttf_lib="none")
+  *)
+    use_ttf_lib="none"
     ;;
 esac
 
@@ -2003,7 +2003,7 @@ case "$use_ttf_lib" in
                   [Define if include ttf cache])
 
         AC_ARG_WITH(ttfcachesize,
-                    [  --with-ttfcachesize=[64/128/256/512/1024]])
+                    [  --with-ttfcachesize=[64/128/256/512/1024/2048]])
 
         case "$with_ttfcachesize" in
             64)
@@ -2026,30 +2026,38 @@ case "$use_ttf_lib" in
                 AC_DEFINE(_MGTTF_CACHE_SIZE, 1024,
                           [Define if compile max ttf cahce size for 1024k])
             ;;
+            2048)
+                AC_DEFINE(_MGTTF_CACHE_SIZE, 2048,
+                          [Define if compile max ttf cahce size for 2048k])
+            ;;
             *)
-                AC_DEFINE(_MGTTF_CACHE_SIZE, 256,
-                          [Define if compile max ttf cahce size for 256k])
+                AC_DEFINE(_MGTTF_CACHE_SIZE, 1024,
+                          [Define if compile max ttf cahce size for 1024k (default value)])
             ;;
         esac
 
         AC_ARG_WITH(ttfcachenum,
-                    [  --with-mttfcachenum=[10/20/40]])
+                    [  --with-mttfcachenum=[16/32/64/128]])
         case "$with_mttfcachenum" in
-            10)
-                AC_DEFINE(_MGMAX_TTF_CACHE, 10,
-                          [Define if compile max ttf cahce number for 10])
+            16)
+                AC_DEFINE(_MGMAX_TTF_CACHE, 16,
+                          [Define if compile max ttf cahce number for 16])
             ;;
-            20)
-                AC_DEFINE(_MGMAX_TTF_CACHE, 20,
-                          [Define if compile max ttf cahce number for 20])
+            32)
+                AC_DEFINE(_MGMAX_TTF_CACHE, 32,
+                          [Define if compile max ttf cahce number for 32])
             ;;
-            40)
-                AC_DEFINE(_MGMAX_TTF_CACHE, 40,
-                          [Define if compile max ttf cahce number for 40])
+            64)
+                AC_DEFINE(_MGMAX_TTF_CACHE, 64,
+                          [Define if compile max ttf cahce number for 64])
+            ;;
+            128)
+                AC_DEFINE(_MGMAX_TTF_CACHE, 128,
+                          [Define if compile max ttf cahce number for 128])
             ;;
             *)
-                AC_DEFINE(_MGMAX_TTF_CACHE, 10,
-                          [Define if compile max ttf cahce number for 10 (default value)])
+                AC_DEFINE(_MGMAX_TTF_CACHE, 32,
+                          [Define if compile max ttf cahce number for 32 (default value)])
             ;;
         esac
     fi
@@ -2433,8 +2441,8 @@ fi
 if test "x$build_ctrl_textedit_new" = "xyes"; then
     AC_DEFINE(_MGCTRL_TEXTEDIT, 1,
             [Define if include TEXTEDIT control])
-    AC_DEFINE(_MGCTRL_TEXTEDIT_USE_NEW_IMPL, 1,
-            [Define if use new implementation of TEXTEDIT control])
+	AC_DEFINE(_MGCTRL_TEXTEDIT_USE_NEW_IMPL, 1,
+			[Define if use new implementation of TEXTEDIT control])
 fi
 
 if test "x$build_splash" = "xyes"; then

doc/articles/minigui-7/index.html

@@ -239,9 +239,9 @@ int GUIAPI GetFirstWord (PLOGFONT log_font, const char* mstr, int len,
  496 static int euckr_is_this_charset (const unsigned char* charset)
  497 {
  498     int i;
- 499     char name [LEN_FONT_NAME + 1];
+ 499     char name [LEN_LOGFONT_NAME_FIELD + 1];
  500 
- 501     for (i = 0; i < LEN_FONT_NAME + 1; i++) {
+ 501     for (i = 0; i < LEN_LOGFONT_NAME_FIELD + 1; i++) {
  502         if (charset [i] == '\0')
  503             break;
  504         name [i] = toupper (charset [i]);
@@ -388,9 +388,9 @@ int GUIAPI GetFirstWord (PLOGFONT log_font, const char* mstr, int len,
 
 <table border="0" cellpadding="0" class="code-sample" width="100%"><tr><td> <pre>
  228 typedef struct _LOGFONT {
- 229     char type [LEN_FONT_NAME + 1];
- 230     char family [LEN_FONT_NAME + 1];
- 231     char charset [LEN_FONT_NAME + 1];
+ 229     char type [LEN_LOGFONT_NAME_FIELD + 1];
+ 230     char family [LEN_LOGFONT_NAME_FIELD + 1];
+ 231     char charset [LEN_LOGFONT_NAME_FIELD + 1];
  232     DWORD style;
  233     int size;
  234     int rotation;

examples/createlogfont.c

@@ -1,14 +1,14 @@
     static LOGFONT  *logfont, *logfontgb12, *logfontbig24;
 
-            logfont = CreateLogFont (NULL, "SansSerif", "ISO8859-1", 
-                        FONT_WEIGHT_REGULAR, FONT_SLANT_ITALIC, FONT_SETWIDTH_NORMAL,
-                        FONT_SPACING_CHARCELL, FONT_UNDERLINE_NONE, FONT_STRUCKOUT_LINE, 
-                        16, 0);
-            logfontgb12 = CreateLogFont (NULL, "song", "GB2312", 
-                        FONT_WEIGHT_REGULAR, FONT_SLANT_ROMAN, FONT_SETWIDTH_NORMAL,
-                        FONT_SPACING_CHARCELL, FONT_UNDERLINE_LINE, FONT_STRUCKOUT_LINE, 
-                        12, 0);
-            logfontbig24 = CreateLogFont (NULL, "ming", "BIG5", 
-                        FONT_WEIGHT_REGULAR, FONT_SLANT_ROMAN, FONT_SETWIDTH_NORMAL,
-                        FONT_SPACING_CHARCELL, FONT_UNDERLINE_LINE, FONT_STRUCKOUT_NONE, 
-                        24, 0);
+    logfont = CreateLogFont (NULL, "SansSerif", "ISO8859-1", 
+                FONT_WEIGHT_REGULAR, FONT_SLANT_ITALIC, FONT_FLIP_NONE,
+                FONT_OTHER_NIL, FONT_UNDERLINE_NONE, FONT_STRUCKOUT_LINE, 
+                16, 0);
+    logfontgb12 = CreateLogFont (NULL, "song", "GB2312", 
+                FONT_WEIGHT_REGULAR, FONT_SLANT_ROMAN, FONT_FLIP_NONE,
+                FONT_OTHER_NIL, FONT_UNDERLINE_LINE, FONT_STRUCKOUT_LINE, 
+                12, 0);
+    logfontbig24 = CreateLogFont (NULL, "ming", "BIG5", 
+                FONT_WEIGHT_REGULAR, FONT_SLANT_ROMAN, FONT_FLIP_NONE,
+                FONT_OTHER_NIL, FONT_UNDERLINE_LINE, FONT_STRUCKOUT_NONE, 
+                24, 0);

examples/createlogfontex.c

@@ -0,0 +1,14 @@
+    static LOGFONT  *logfont, *logfontgb12, *logfontttf;
+
+    logfont = CreateLogFontEx (NULL, "SansSerif", "ISO8859-1", 
+                FONT_WEIGHT_REGULAR, FONT_SLANT_ITALIC, FONT_FLIP_NONE,
+                FONT_OTHER_NIL, FONT_DECORATE_NONE, FONT_RENDER_MONO, 
+                16, 0);
+    logfontgb12 = CreateLogFontEx (NULL, "song", "GB2312", 
+                FONT_WEIGHT_REGULAR, FONT_SLANT_ROMAN, FONT_FLIP_NONE,
+                FONT_OTHER_NIL, FONT_DECORATE_NONE, FONT_RENDER_MONO,
+                12, 0);
+    logfontttf = CreateLogFontEx ("ttf", "Courier", "UTF-8", 
+                FONT_WEIGHT_BLACK, FONT_SLANT_ROMAN, FONT_FLIP_NONE,
+                FS_OTHER_LCDPORTRAIT, FONT_DECORATE_NONE, FONT_RENDER_SUBPIXEL,
+                24, 0);

include/Makefile.am

@@ -11,7 +11,7 @@ COMM_HDRS =     \
     common.h endianrw.h fixedmath.h \
     minigui.h gdi.h window.h control.h \
     own_malloc.h  own_stdio.h \
-    xvfb.h customial.h exstubs.h \
+    xvfb.h customial.h \
     dti.c 
 
 UCOSII_HDRS=ucos2_pthread.h ucos2_semaphore.h

include/common.h

@@ -38,7 +38,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */
@@ -262,8 +262,7 @@ MGUI_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
  */
 #if defined(__i386__) || defined(__ia64__) || defined(__x86_64__) || defined(__amd64) || \
         (defined(__alpha__) || defined(__alpha)) || \
-        defined(__arm__) || defined(__aarch64__) || \
-        defined(__riscv) || \
+        defined(__arm__) || \
         (defined(__CC_ARM) && !defined(__BIG_ENDIAN)) || \
         (defined(__mips__) && defined(__MIPSEL__)) || \
         defined(__LITTLE_ENDIAN__) || \
@@ -695,6 +694,20 @@ typedef UINT_PTR LPARAM;
  */
 #define MAKEWORD16(low, high) ((WORD16)(((BYTE)(low)) | (((WORD16)((BYTE)(high))) << 8)))
 
+/**
+ * \def MAKEWORD32(first, second, third, fourth)
+ * \brief Makes a WORD32 value with four bytes.
+ *
+ * \sa MAKEWORD16, FIRSTBYTE, SECONDBYTE, THIRDBYTE, FOURTHBYTE
+ */
+#define MAKEDWORD32(first, second, third, fourth) \
+    ((DWORD32)( \
+        ((BYTE)(first)) | \
+        (((DWORD32)((BYTE)(second))) << 8) | \
+        (((DWORD32)((BYTE)(third))) << 16) | \
+        (((DWORD32)((BYTE)(fourth))) << 24) \
+    ))
+
 /**
  * \def MAKEWPARAM(first, second, third, fourth)
  * \brief Makes a WPARAM value with four bytes.
@@ -1702,7 +1715,7 @@ typedef struct _GAL_Rect {
 #endif
 
 /* Commonly used definitions */
-#ifdef HAVE_LIMITS_H
+#if !defined(__NOUNIX__) || defined (__ECOS__)
 #include <limits.h>
 #endif
 

include/control.h

@@ -37,7 +37,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/animation.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/button.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/combobox.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/coolbar.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/ctrlhelper.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/edit.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/gridview.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/iconview.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/listbox.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/listview.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */
@@ -871,7 +871,7 @@ typedef LVNM_ITEMRUP *PLVNM_ITEMRUP;
  */
 #define LVM_GETITEMSTATE	0xF128 
 
-/*
+/**
  * \def LVM_GETSELECTEDCOLUMN
  * \brief Retrieves the index of the currently selected column of a listview.
  *

include/ctrl/menubutton.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/monthcal.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/newtoolbar.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/progressbar.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/propsheet.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/scrollbar.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/scrollview.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/spinbox.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/static.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/textedit.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/trackbar.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ctrl/treeview.h

@@ -35,7 +35,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/customial.h

@@ -36,7 +36,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */
@@ -51,6 +51,11 @@
 #ifndef GUI_IAL_CUSTOM_H
     #define GUI_IAL_CUSTOM_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+
 #define IAL_MOUSE_LEFTBUTTON    1
 #define IAL_MOUSE_RIGHTBUTTON   2
 #define IAL_MOUSE_MIDDLEBUTTON  4
@@ -62,12 +67,12 @@
 #define IAL_MOUSEEVENT          1
 #define IAL_KEYEVENT            2
 
-typedef struct tagINPUT {
+typedef struct tagINPUT
+{
     char*   id;
 
     // Initialization and termination
-    BOOL (*init_input) (struct tagINPUT *input, const char* mdev,
-            const char* mtype);
+    BOOL (*init_input) (struct tagINPUT *input, const char* mdev, const char* mtype);
     void (*term_input) (void);
 
     // Mouse operations
@@ -91,22 +96,17 @@ typedef struct tagINPUT {
             fd_set *except, struct timeval *timeout);
 
     char mdev [MAX_PATH + 1];
-} INPUT;
+}INPUT;
 
 #ifdef _MGIAL_CUSTOM
-
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
-BOOL InitCustomInput (INPUT* input, const char* mdev, const char* mtype);
-void TermCustomInput (void);
+extern BOOL InitCustomInput (INPUT* input, const char* mdev, const char* mtype);
+extern void TermCustomInput (void);
+#endif
 
 #ifdef __cplusplus
 }
 #endif  /* __cplusplus */
 
-#endif /* _MGIAL_CUSTOM */
-
 #endif  /* GUI_IAL_CUSTOM_H */
 
+

include/endianrw.h

@@ -40,7 +40,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/exstubs.h

@@ -1,114 +0,0 @@
-/**
- * \file exstubs.h
- * \author Wei Yongming <vincent@minigui.org>
- * \date 2019/04/07
- *
- * \brief This file is the header for NEWGAL/IAL engines which should be
- *  implemented by an external module.
- *
- \verbatim
-
-    This file is part of MiniGUI, a mature cross-platform windowing
-    and Graphics User Interface (GUI) support system for embedded systems
-    and smart IoT devices.
-
-    Copyright (C) 2007~2018, Beijing FMSoft Technologies Co., Ltd.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    Or,
-
-    As this program is a library, any link to this program must follow
-    GNU General Public License version 3 (GPLv3). If you cannot accept
-    GPLv3, you need to be licensed from FMSoft.
-
-    If you have got a commercial license of this program, please use it
-    under the terms and conditions of the commercial license.
-
-    For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
-
- \endverbatim
- */
-
-/*
- *      MiniGUI for Linux/uClinux, eCos, uC/OS-II, VxWorks,
- *      pSOS, ThreadX, NuCleus, OSE, and Win32.
- */
-
-#ifndef GUI_EXSTUBS_H
-    #define GUI_EXSTUBS_H
-
-/* The pixel format defined by depth */
-#define COMMLCD_PSEUDO_RGB332   1
-#define COMMLCD_TRUE_RGB555     2
-#define COMMLCD_TRUE_RGB565     3
-#define COMMLCD_TRUE_RGB888     4
-#define COMMLCD_TRUE_RGB0888    5
-#define COMMLCD_TRUE_ARGB1555   6
-#define COMMLCD_TRUE_ARGB8888   7
-#define COMMLCD_TRUE_ABRG8888   8
-
-#define COMMLCD_UPDATE_NONE     0
-#define COMMLCD_UPDATE_SYNC     1
-#define COMMLCD_UPDATE_ASYNC    2
-
-struct commlcd_info {
-    int     height;         // vertical resolution of the screen
-    int     width;          // horinzontal resolution of the screen
-    int     pitch;          // Length of one scan line in bytes
-    int     bpp;            // Depth (bits-per-pixel)
-    int     type;           // Pixel type
-    int     update_method;  // Update method: none, asynchronously, or synchronously.
-    Uint8*  fb;             // Frame buffer
-};
-
-#define COMM_MOUSEINPUT    0x01
-#define COMM_KBINPUT       0x02
-
-#define COMM_MOUSELBUTTON  0x01
-#define COMM_MOUSERBUTTON  0x04
-
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
-/* external stubs for COMMLCD NEWGAL engine */
-#ifdef _MGGAL_COMMLCD
-
-int __commlcd_drv_init (void);
-int __commlcd_drv_getinfo (struct commlcd_info *li,
-        int width, int height, int depth);
-int __commlcd_drv_release (void);
-int __commlcd_drv_setclut (int firstcolor, int ncolors, GAL_Color *colors);
-int __commlcd_drv_update (const RECT* rc_dirty);
-
-#endif /* _MGGAL_COMMLCD */
-
-#ifdef _MGIAL_COMM
-
-int __comminput_init (void);
-int __comminput_ts_getdata (short *x, short *y, short *button);
-int __comminput_kb_getdata (short *key, short *status);
-int __comminput_wait_for_input (struct timeval *timeout);
-void __comminput_deinit (void);
-
-#endif /* _MGIAL_COMM */
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif /* GUI_EXSTUBS_H */
-

include/fixedmath.h

@@ -37,7 +37,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/minigui.h

@@ -37,7 +37,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */
@@ -2565,6 +2565,10 @@ MG_EXPORT void GUIAPI FreeFixStr (char* str);
      * @{
      */
 
+#ifndef _MGHAVE_CURSOR
+static inline void do_nothing (void) { return; }
+#endif
+
 #ifdef _MGHAVE_CURSOR
 
 /**
@@ -2726,34 +2730,12 @@ MG_EXPORT HCURSOR GUIAPI GetSystemCursor (int csrid);
  * \return Handle to the current system cursor, zero means no current cursor.
  */
 MG_EXPORT HCURSOR GUIAPI GetCurrentCursor (void);
-
 #else
-
-static inline HCURSOR LoadCursorFromFile(const char* filename) {
-    return (HCURSOR)0;
-}
-
-static inline HCURSOR CreateCursor(int xhotspot, int yhotspot, int w, int h,
-               const BYTE* pANDBits, const BYTE* pXORBits, int colornum) {
-    return (HCURSOR)0;
-}
-
-static inline HCURSOR GUIAPI CopyCursor (HCURSOR hcsr) {
-    return (HCURSOR)0;
-}
-
-static inline BOOL DestroyCursor (HCURSOR hcsr) {
-    return TRUE;
-}
-
-static inline HCURSOR GetSystemCursor (int csrid) {
-    return (HCURSOR)0;
-}
-
-static inline HCURSOR GUIAPI GetCurrentCursor (void) {
-    return (HCURSOR)0;
-}
-
+  #define LoadCursorFromFile(filename)    (do_nothing(), 0)
+  #define CreateCursor(x, y, w, h, ANDbs, XORbs, cr) (do_nothing(), 0)
+  #define DestroyCursor(hcsr)             (do_nothing(), 0)
+  #define GetSystemCursor(csrid)          (do_nothing(), 0)
+  #define GetCurrentCursor()              (do_nothing(), 0)
 #endif /* _MGHAVE_CURSOR */
 
 #define MAX_SYSCURSORINDEX    22
@@ -2861,7 +2843,6 @@ MG_EXPORT void GUIAPI GetCursorPos (POINT* ppt);
 MG_EXPORT void GUIAPI SetCursorPos (int x, int y);
 
 #ifdef _MGHAVE_CURSOR
-
 /**
  * \fn HCURSOR GUIAPI SetCursorEx (HCURSOR hcsr, BOOL set_def)
  * \brief Changes the current cursor.
@@ -2880,51 +2861,7 @@ MG_EXPORT void GUIAPI SetCursorPos (int x, int y);
  *
  * \sa SetCursor, SetDefaultCursor, GetDefaultCursor
  */
-MG_EXPORT HCURSOR GUIAPI SetCursorEx (HCURSOR hcsr, BOOL set_def);
-
-/**
- * \fn HCURSOR GUIAPI GetDefaultCursor (void)
- * \brief Gets the default cursor.
- *
- * This function gets the current default cursor.
- *
- * \return The current default cursor handle.
- *
- * \sa SetCursorEx, SetDefaultCursor
- */
-MG_EXPORT  HCURSOR GUIAPI GetDefaultCursor (void);
-
-/**
- * \fn int GUIAPI ShowCursor (BOOL fShow)
- * \brief Shows or hides cursor.
- *
- * This function shows or hides cursor according to the argument \a fShow. 
- * Show cursor when \a fShow is TRUE, and hide cursor when \a fShow is FALSE.
- * MiniGUI maintains a showing count value. Calling \a ShowCursor once, the 
- * count will increase when \a fShow is TRUE, or decrease one when FALSE.
- * When the count is less than 0, the cursor will disapear actually.
- *
- * \param fShow Indicates show or hide the cursor.
- *
- * \return Cursor showing count value. 
- */
-MG_EXPORT int GUIAPI ShowCursor (BOOL fShow);
-
-#else /* _MGHAVE_CURSOR */
-
-static inline HCURSOR SetCursorEx(HCURSOR hcsr, BOOL set_def) {
-    return (HCURSOR)0;
-}
-
-static inline HCURSOR GetDefaultCursor(void) {
-    return (HCURSOR)0;
-}
-
-static inline int GUIAPI ShowCursor (BOOL fShow) {
-    return 0;
-}
-
-#endif /* !_MGHAVE_CURSOR */
+ MG_EXPORT HCURSOR GUIAPI SetCursorEx (HCURSOR hcsr, BOOL set_def);
 
 /**
  * \def SetCursor(hcsr)
@@ -2940,7 +2877,7 @@ static inline int GUIAPI ShowCursor (BOOL fShow) {
  *
  * \sa SetCursorEx, SetDefaultCursor
  */
-#define SetCursor(hcsr) SetCursorEx (hcsr, FALSE)
+  #define SetCursor(hcsr) SetCursorEx (hcsr, FALSE)
 
 /**
  * \def SetDefaultCursor(hcsr)
@@ -2957,7 +2894,47 @@ static inline int GUIAPI ShowCursor (BOOL fShow) {
  *
  * \sa SetCursorEx, SetCursor
  */
-#define SetDefaultCursor(hcsr) SetCursorEx (hcsr, TRUE)
+  #define SetDefaultCursor(hcsr) SetCursorEx (hcsr, TRUE)
+
+/**
+ * \fn HCURSOR GUIAPI GetDefaultCursor (void)
+ * \brief Gets the default cursor.
+ *
+ * This function gets the current default cursor.
+ *
+ * \return The current default cursor handle.
+ *
+ * \sa SetCursorEx, SetDefaultCursor
+ */
+MG_EXPORT  HCURSOR GUIAPI GetDefaultCursor (void);
+
+#else
+  #define SetCursorEx(hcsr, set_def)    (do_nothing(), 0)
+  #define SetCursor(hcsr)               (do_nothing(), 0)
+  #define SetDefaultCursor(hcsr)        (do_nothing(), 0)
+  #define GetDefaultCursor()            (do_nothing(), 0)
+#endif /* _MGHAVE_CURSOR */
+
+#ifdef _MGHAVE_CURSOR
+
+/**
+ * \fn int GUIAPI ShowCursor (BOOL fShow)
+ * \brief Shows or hides cursor.
+ *
+ * This function shows or hides cursor according to the argument \a fShow.
+ * Show cursor when \a fShow is TRUE, and hide cursor when \a fShow is FALSE.
+ * MiniGUI maintains a showing count value. Calling \a ShowCursor once, the
+ * count will increase when \a fShow is TRUE, or decrease one when FALSE.
+ * When the count is less than 0, the cursor will disapear actually.
+ *
+ * \param fShow Indicates show or hide the cursor.
+ *
+ * \return Cursor showing count value.
+ */
+MG_EXPORT int GUIAPI ShowCursor (BOOL fShow);
+#else
+  #define ShowCursor(fShow)             (do_nothing(), 0)
+#endif /* _MGHAVE_CURSOR */
 
     /** @} end of cursor_fns */
 

include/nucleus_pthread.h

@@ -42,7 +42,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/nucleus_semaphore.h

@@ -45,7 +45,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/ose_semaphore.h

@@ -45,7 +45,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */

include/own_stdio.h

@@ -37,7 +37,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/blog/minigui-licensing-policy/>.
+    <http://www.minigui.com/en/about/licensing-policy/>.
 
  \endverbatim
  */