harfbuzzex -> harfbuzz

Fix byte order for aarch64 and riscv

.gitignore

@@ -24,3 +24,7 @@ Makefile.in
 /*config.h.in
 /*config.h.in~
 
+/src/font/utils/emoji/
+/src/font/utils/ucd/
+/src/sysres/font_list
+/src/sysres/license/dat_files/

Doxyfile.procs

@@ -38,7 +38,7 @@ PROJECT_NAME           = "MiniGUI API Reference (MiniGUI-Processes)"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v4.0.1
+PROJECT_NUMBER         = v4.0.7
 
 # 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
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc-api-ref-minigui-procs-4.0.1
+OUTPUT_DIRECTORY       = doc-api-ref-minigui-procs-4.0.7
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -2102,7 +2102,7 @@ PREDEFINED             = _MGRM_PROCESSES \
                          _MGFONT_FT2 \
                          _MGFONT_UPF \
                          _MGFONT_BMPF \
-                         _MGGAL_DRI \
+                         _MGGAL_DRM \
                          _MGGAL_COMMLCD \
                          _MGIAL_COMM
 

Doxyfile.sal

@@ -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         = v4.0.1
+PROJECT_NUMBER         = v4.0.7
 
 # 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
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc-api-ref-minigui-sa-4.0.1
+OUTPUT_DIRECTORY       = doc-api-ref-minigui-sa-4.0.7
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -2102,7 +2102,7 @@ PREDEFINED             = _MGRM_STANDALONE \
                          _MGFONT_FT2 \
                          _MGFONT_UPF \
                          _MGFONT_BMPF \
-                         _MGGAL_DRI \
+                         _MGGAL_DRM \
                          _MGGAL_COMMLCD \
                          _MGIAL_COMM
 

Doxyfile.ths

@@ -38,7 +38,7 @@ PROJECT_NAME           = "MiniGUI API Reference (MiniGUI-Threads)"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v4.0.1
+PROJECT_NUMBER         = v4.0.7
 
 # 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
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc-api-ref-minigui-ths-4.0.1
+OUTPUT_DIRECTORY       = doc-api-ref-minigui-ths-4.0.7
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -2102,7 +2102,7 @@ PREDEFINED             = _MGRM_THREADS \
                          _MGFONT_FT2 \
                          _MGFONT_UPF \
                          _MGFONT_BMPF \
-                         _MGGAL_DRI \
+                         _MGGAL_DRM \
                          _MGGAL_COMMLCD \
                          _MGIAL_COMM
 

GNUmakefile

@@ -1,6 +1,6 @@
-MAJOR_VERSION = 3
+MAJOR_VERSION = 4
 MINOR_VERSION = 0
-MICRO_VERSION = 13
+MICRO_VERSION = 4
 EXTRAVERSION =
 
 MINIGUI_RELEASE=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)$(EXTRAVERSION)

Makefile.am

@@ -2,8 +2,8 @@ SUBDIRS = src 3rd-party include rtos etc m4 cmake build
 
 EXTRA_DIST = minigui.pc.in \
             GNUmakefile makefile.ng makefile.msvc rules.make \
-            Version INSTALL LICENSE \
+            INSTALL LICENSE \
-            README.md RELEASE-NOTES.md \
+            Version.md README.md RELEASE-NOTES.md \
             LICENSE-POLICY-en.md LICENSE-POLICY-zh.md
 
 # The directory where the include files will be installed

README.md

@@ -147,11 +147,11 @@ and MiniGUI components, please fetch one of the following repositories
 from GitHub and follow the instructions to build the samples and
 the demonstration programs:
 
-https://github.com/VincentWei/build-minigui-4.0
+<https://github.com/VincentWei/build-minigui-4.0>
 
 or
 
-https://github.com/VincentWei/build-minigui-3.2
+<https://github.com/VincentWei/build-minigui-3.2>
 
 
 ### Unit Tests
@@ -159,7 +159,7 @@ https://github.com/VincentWei/build-minigui-3.2
 Since MiniGUI 4.0.0, we organize the unit test code of MiniGUI APIs in the
 following repository:
 
-https://github.com/VincentWei/mg-tests
+<https://github.com/VincentWei/mg-tests>
 
 If you are interested in hacking the MiniGUI code, please visit this repository.
 
@@ -386,7 +386,7 @@ 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/en/about/licensing-policy/>.
+<http://www.minigui.com/blog/minigui-licensing-policy/>.
 
 ### Special Statement
 

Version

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

Version.md

@@ -0,0 +1,8 @@
+Version 4.0.7 (2020/03/30)
+
+This release needs the following packages:
+
+- The resource package: `minigui-res-4.0.0.tar.gz`
+- The sample package: `mg-samples-4.0.1.tar.gz`
+- The test cases package: `mg-tests-4.0.7.tar.gz`
+

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.60)
-AC_INIT(libminigui, 4.0.2)
+AC_INIT(libminigui, 4.0.8)
 AC_CONFIG_SRCDIR(src/main/main.c)
 
 dnl Set various version strings - taken gratefully from the SDL sources
@@ -16,9 +16,9 @@ dnl Set various version strings - taken gratefully from the SDL sources
 #
 MINIGUI_MAJOR_VERSION=4
 MINIGUI_MINOR_VERSION=0
-MINIGUI_MICRO_VERSION=2
+MINIGUI_MICRO_VERSION=8
-MINIGUI_INTERFACE_AGE=2
+MINIGUI_INTERFACE_AGE=8
-MINIGUI_BINARY_AGE=2
+MINIGUI_BINARY_AGE=8
 MINIGUI_VERSION=$MINIGUI_MAJOR_VERSION.$MINIGUI_MINOR_VERSION.$MINIGUI_MICRO_VERSION
 
 AC_SUBST(MINIGUI_MAJOR_VERSION)
@@ -120,13 +120,13 @@ build_net_ial_engine="no"
 
 dnl common IAL engines
 build_libinput_ial_engine="yes"
-build_console_ial_engine="no"
+build_console_ial_engine="yes"
 build_console_ps2="no"
-build_console_imps2="no"
+build_console_imps2="yes"
 build_console_ms="no"
 build_console_ms3="no"
 build_console_gpm="no"
-build_text_mode="no"
+build_text_mode="yes"
 
 dnl the customized ial engine
 build_dlcustom_ial_engine="no"
@@ -264,8 +264,8 @@ enable_video_dfb="no"
 enable_video_dfb_st7167="no"
 enable_video_stgfb="no"
 
+enable_video_drm="yes"
 enable_video_fbcon="yes"
-enable_video_dri="yes"
 enable_video_commlcd="no"
 enable_video_shadow="no"
 enable_video_mlshadow="no"
@@ -470,7 +470,7 @@ AC_ARG_ENABLE(libinputial,
 build_libinput_ial_engine=$enableval)
 
 AC_ARG_ENABLE(consoleial,
-[  --enable-consoleial      build the console (Linux console) IAL engine <default=no>],
+[  --enable-consoleial      build the console (Linux console) IAL engine <default=yes>],
 build_console_ial_engine=$enableval)
 
 AC_ARG_ENABLE(consoleps2,
@@ -478,7 +478,7 @@ AC_ARG_ENABLE(consoleps2,
 build_console_ps2=$enableval)
 
 AC_ARG_ENABLE(consoleimps2,
-[  --enable-consoleimps2    build the console engine subdriver for IntelligentMouse (IMPS/2) mouse <default=no>],
+[  --enable-consoleimps2    build the console engine subdriver for IntelligentMouse (IMPS/2) mouse <default=yes>],
 build_console_imps2=$enableval)
 
 AC_ARG_ENABLE(consolems,
@@ -494,7 +494,7 @@ AC_ARG_ENABLE(consolegpm,
 build_console_gpm=$enableval)
 
 AC_ARG_ENABLE(textmode,
-[  --enable-textmode        Linux system have console (text mode) on FrameBuffer <default=no>],
+[  --enable-textmode        Linux system have console (text mode) on FrameBuffer <default=yes>],
 build_text_mode=$enableval)
 
 AC_ARG_ENABLE(rbfsupport,
@@ -885,26 +885,22 @@ CheckFBCON()
 dnl Find the DRM includes
 CheckDRM()
 {
-    if test "x$runtime_mode" = "xprocs"; then
+    AC_ARG_ENABLE(videodrm,
-        enable_video_dri="no; DRI engine does not support MiniGUI-Processes runtime mode currently"
+[  --enable-videodrm      include Linux DRI NEWGAL engine <default=yes>],
-    else
+    enable_video_drm=$enableval)
-        AC_ARG_ENABLE(videodri,
+    if test "x$enable_video_drm" = "xyes"; then
-    [  --enable-videodri      include Linux DRI NEWGAL engine <default=yes>],
+        PKG_CHECK_MODULES(DRM, [libdrm >= 2.4], video_drm="yes",
-        enable_video_dri=$enableval)
+            video_drm="no; Linux DRI NEWGAL engine requires libdrm 2.4+")
-        if test "x$enable_video_dri" = "xyes"; then
+        if test "x$video_drm" = "xyes"; then
-            PKG_CHECK_MODULES(DRM, [libdrm >= 2.4], video_dri="yes",
+            AC_DEFINE(_MGGAL_DRM, 1,
-                video_dri="no; Linux DRI NEWGAL engine requires libdrm 2.4+")
+                [Define if include Linux DRI NEWGAL engine])
-            if test "x$video_dri" = "xyes"; then
+            VIDEO_SUBDIRS="$VIDEO_SUBDIRS drm"
-                AC_DEFINE(_MGGAL_DRI, 1,
+            VIDEO_DRIVERS="$VIDEO_DRIVERS drm/libvideo_drm.la"
-                    [Define if include Linux DRI NEWGAL engine])
+            DEP_LIBS="$DEP_LIBS -ldrm -ldl"
-                VIDEO_SUBDIRS="$VIDEO_SUBDIRS dri"
+            DRM_INC_DIR="`$PKG_CONFIG --variable includedir libdrm`/libdrm"
-                VIDEO_DRIVERS="$VIDEO_DRIVERS dri/libvideo_dri.la"
+            AC_SUBST(DRM_INC_DIR)
-                DEP_LIBS="$DEP_LIBS -ldrm"
+        else
-                DRM_INC_DIR="`$PKG_CONFIG --variable includedir libdrm`/drm"
+            AC_MSG_WARN([$video_drm])
-                AC_SUBST(DRM_INC_DIR)
-            else
-                AC_MSG_WARN([$video_dri])
-            fi
         fi
     fi
 }
@@ -2092,7 +2088,7 @@ if test "x$build_ttf_support" = "xyes"; then
     if test "x$build_complex_scripts" = "xyes"; then
         dnl Check for HarfBuzz library
         AC_CHECK_LIB(harfbuzz, hb_version,
-            DEP_LIBS="$DEP_LIBS -lharfbuzzex -lfreetype",
+            DEP_LIBS="$DEP_LIBS -lharfbuzz -lfreetype",
             build_complex_scripts="no; support for complex scripts requires libharfbuzz")
     else
         DEP_LIBS="$DEP_LIBS -lfreetype",
@@ -2172,7 +2168,7 @@ if test "x$build_complex_scripts" = "xyes"; then
 [  --with-hb-includes=DIR       where the HarfBuzz includes are])
 
     if test "x$with_hb_includes" = "x"; then
-        HB_INC_DIR="-I/usr/local/include/harfbuzz"
+        HB_INC_DIR="-I/usr/include/harfbuzz"
     else
         HB_INC_DIR="-I$with_hb_includes"
     fi
@@ -2636,7 +2632,7 @@ src/font/Makefile
 src/font/in-core/Makefile
 src/newgal/Makefile
 src/newgal/fbcon/Makefile
-src/newgal/dri/Makefile
+src/newgal/drm/Makefile
 src/newgal/qvfb/Makefile
 src/newgal/pcxvfb/Makefile
 src/newgal/wvfb/Makefile
@@ -2713,7 +2709,7 @@ AC_MSG_NOTICE([
   * dummy:              ${enable_video_dummy}
   * pc_xvfb:            ${enable_video_pc_xvfb}
   * usvfb:              ${enable_video_usvfb}
-  * dri:                ${enable_video_dri}
+  * drm:                ${enable_video_drm}
   * fbcon:              ${enable_video_fbcon}
   * commlcd:            ${enable_video_commlcd}
 

etc/MiniGUI.cfg

@@ -22,10 +22,13 @@
 
 [system]
 # GAL engine and default options
+# The equivalent environment variable: MG_GAL_ENGINE
 gal_engine=pc_xvfb
+# The equivalent environment variable: MG_DEFAULTMODE
 defaultmode=800x600-16bpp
 
 # IAL engine
+# The equivalent environment variable: MG_IAL_ENGINE
 ial_engine=pc_xvfb
 mdev=/dev/input/mice
 mtype=IMPS2
@@ -33,8 +36,8 @@ mtype=IMPS2
 # Linux IAL engine based on libinput
 # ial_engine=libinut
 
-#{{ifdef _MGGAL_DRI
+#{{ifdef _MGGAL_DRM
-[dri]
+[drm]
 defaultmode=1024x768-32bpp
 
 # We use DRM fourcc code to defined the pixel format of the video surface.
@@ -44,10 +47,15 @@ pixelformat=XR24
 
 # The DRI device
 device=/dev/dri/card0
+
 # The resolution of the display
 # It is defined in dots (physical pixels) per inch
 # The default value is 96.
 dpi=96
+
+# The filename of the shared library for the external driver.
+# The equivalent environment variable: MG_GAL_DRM_DRIVER
+exdriver=libhidrmdrivers-0.2.so.0
 #}}
 
 #{{ifdef _MGIAL_LIBINPUT

include/common.h

@@ -50,7 +50,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/en/about/licensing-policy/>.
+    <http://www.minigui.com/blog/minigui-licensing-policy/>.
 
  \endverbatim
  */
@@ -306,7 +306,8 @@ 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(__arm__) || defined(__aarch64__) || \
+        defined(__riscv) || \
         (defined(__CC_ARM) && !defined(__BIG_ENDIAN)) || \
         (defined(__mips__) && defined(__MIPSEL__)) || \
         defined(__LITTLE_ENDIAN__) || \
@@ -2317,7 +2318,6 @@ int init_minigui_printf (int (*output_char) (int ch),
         TCS_BROWN (stderr);                    \
         fprintf (stderr, "%s: ", __FUNCTION__); \
         fprintf (stderr, fmt, ##__VA_ARGS__);   \
-        fprintf (stderr, "\n");                 \
         TCS_NONE (stderr);                      \
     } while (0)
 
@@ -2332,11 +2332,12 @@ int init_minigui_printf (int (*output_char) (int ch),
 #   define _DBG_PRINTF(fmt, ...)                \
     do {                                        \
         TCS_YELLOW (stderr);                    \
+        fprintf (stderr, "%s: ", __FUNCTION__); \
         fprintf (stderr, fmt, ##__VA_ARGS__);   \
         TCS_NONE (stderr);                      \
     } while (0)
 # else
-#   define _DBG_PRINTF(fmt, ...)
+#   define _DBG_PRINTF(fmt, ...) do { } while (0)
 #endif
 
 #ifdef _MGRM_THREADS

include/control.h

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

include/ctrl/animation.h

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

include/ctrl/button.h

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

include/ctrl/combobox.h

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

include/ctrl/coolbar.h

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

include/ctrl/ctrlhelper.h

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

include/ctrl/edit.h

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

include/ctrl/gridview.h

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

include/ctrl/iconview.h

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

include/ctrl/listbox.h

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

include/ctrl/listview.h

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

include/ctrl/menubutton.h

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

include/ctrl/monthcal.h

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

include/ctrl/newtoolbar.h

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

include/ctrl/progressbar.h

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

include/ctrl/propsheet.h

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

include/ctrl/scrollbar.h

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

include/ctrl/scrollview.h

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

include/ctrl/spinbox.h

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

include/ctrl/static.h

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

include/ctrl/textedit.h

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

include/ctrl/trackbar.h

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

include/ctrl/treeview.h

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

include/customial.h

@@ -48,7 +48,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/en/about/licensing-policy/>.
+    <http://www.minigui.com/blog/minigui-licensing-policy/>.
 
  \endverbatim
  */
@@ -234,6 +234,9 @@ typedef struct tagINPUT {
     // New wait event method for getting extra input events; since 4.0.0
     int (*wait_event_ex) (int maxfd, fd_set *in, fd_set *out,
             fd_set *except, struct timeval *timeout, EXTRA_INPUT_EVENT* extra);
+
+    /* BUGFIXING (VM 2020-03-12): merged from 5.0.0 */
+    char* mdev;
 } INPUT;
 
 #ifdef __cplusplus

include/dti.c

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

include/endianrw.h

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

include/fixedmath.h

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

include/gdi.h

@@ -23,7 +23,7 @@
     and Graphics User Interface (GUI) support system for embedded systems
     and smart IoT devices.
 
-    Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd.
+    Copyright (C) 2002~2019, Beijing FMSoft Technologies Co., Ltd.
     Copyright (C) 1998~2002, WEI Yongming
 
     This program is free software: you can redistribute it and/or modify
@@ -49,7 +49,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/en/about/licensing-policy/>.
+    <http://www.minigui.com/blog/minigui-licensing-policy/>.
 
  \endverbatim
  */
@@ -1389,6 +1389,48 @@ MG_EXPORT HDC GUIAPI CreateCompatibleDCEx (HDC hdc, int width, int height);
  */
 MG_EXPORT BOOL GUIAPI IsCompatibleDC (HDC hdc1, HDC hdc2);
 
+/**
+ * \fn BOOL GUIAPI IsMemDC (HDC hdc)
+ * \brief Check whether a given DC is a memory DC.
+ *
+ * This function checks whether a give DC \a hdc is a memory DC.
+ *
+ * \param hdc The handle to the DC.
+ *
+ * \return TRUE for memory DC, otherwise FALSE.
+ *
+ * \sa CreateMemDCEx
+ */
+MG_EXPORT BOOL GUIAPI IsMemDC (HDC hdc);
+
+/**
+ * \fn BOOL GUIAPI IsScreenDC (HDC hdc)
+ * \brief Check whether a given DC is a screen DC.
+ *
+ * This function checks whether a give DC \a hdc is a screen DC.
+ *
+ * \param hdc The handle to the DC.
+ *
+ * \return TRUE for screen DC, otherwise FALSE.
+ *
+ * \sa CreateMemDCEx
+ */
+MG_EXPORT BOOL GUIAPI IsScreenDC (HDC hdc);
+
+/**
+ * \fn BOOL GUIAPI IsWindowDC (HDC hdc)
+ * \brief Check whether a given DC is a window DC.
+ *
+ * This function checks whether a give DC \a hdc is a window DC.
+ *
+ * \param hdc The handle to the DC.
+ *
+ * \return TRUE for window DC, otherwise FALSE.
+ *
+ * \sa CreateMemDCEx
+ */
+MG_EXPORT BOOL GUIAPI IsWindowDC (HDC hdc);
+
 /**
  * \fn HDC GUIAPI CreateMemDCEx (int width, int height, int depth, DWORD flags, \
  Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask,
@@ -13646,6 +13688,174 @@ MG_EXPORT int GUIAPI SetUserCompositionOps (HDC hdc,
         CB_COMP_PUTHLINE comp_puthline,
         void* user_comp_ctxt);
 
+/**
+ * This function gets the video handle which corresponds to the given
+ * device context.
+ *
+ * \param hdc The device context.
+ *
+ * \return The handle to the video; NULL on error.
+ *
+ * Since 4.0.4
+ */
+MG_EXPORT GHANDLE GetVideoHandle (HDC hdc);
+
+#ifdef _MGGAL_DRM
+
+/**
+  * \defgroup gdi_drm_fns Functions for Linux DRM integration
+  *
+  * These functions can be used to get the DRM device file descriptor and the
+  * information of the hardware surface corresponding to the DC which is
+  * created by the Linux DRM engine. By using the information, we can
+  * integrate MiniGUI with other graphics libraries, such as Cairo
+  * (vector graphics) and Mesa (3D graphics).
+  *
+  * \note Only available when support for Linuxe DRM NEWGAL engine
+  * (`_MGGAL_DRM`) is enabled.
+  *
+  * Since 4.0.4
+  *
+  * @{
+  */
+
+/**
+ * This function gets the file descriptor opened by the Linux DRM engine.
+ *
+ * \param video The video handle returned by \a GetVideoHandle.
+ *
+ * \return The DRM device file descriptor opened by the Linux DRM engine;
+ *      >= 0 for success and < 0 on error. If \a surface is not a hardware
+ *      surface created by the DRM engine, this function returns -1.
+ */
+MG_EXPORT int drmGetDeviceFD (GHANDLE video);
+
+/**
+ * THe struct type defines the DRM surface information.
+ */
+typedef struct _DrmSurfaceInfo {
+    /** The local handle of the buffer object. */
+    uint32_t handle;
+    /** The prime fd of the buffer object. If it was no exported as a global
+     buffer object, it has the value -1. */
+    int prime_fd;
+    /** The global name of the buffer object. It has the value 0 when it was
+        not expored as global buffer object. */
+    uint32_t name;
+    /** The frame buffer identifier. If the buffer was not added as
+        a frame buffer to the system, it has the value 0. */
+    uint32_t fb_id;
+
+    /** The width of the surface. */
+    uint32_t width;
+    /** The height of the surface. */
+    uint32_t height;
+    /** The row stride of the surface. */
+    uint32_t pitch;
+    /** The DRM pixel format. */
+    uint32_t drm_format;
+    /** Size in bytes of the buffer object. */
+    size_t size;
+    /** The offset from the buffer start to the real pixel data. */
+    off_t offset;
+} DrmSurfaceInfo;
+
+/**
+ * This function gets the DRM surface information from specified device context.
+ *
+ * \param video The handle to the video.
+ * \param hdc The handle to the device context.
+ * \param info The pointer to a DrmSurfaceInfo structure to hold
+ *      the surface information.
+ *
+ * \return TRUE for success, FALSE for failure.
+ */
+MG_EXPORT BOOL drmGetSurfaceInfo (GHANDLE video, HDC hdc, DrmSurfaceInfo* info);
+
+/**
+ * This function creates a memory DC with a DRM surface which is created by
+ * a foreign process and identified by a global name handle.
+ *
+ * \param video The video handle.
+ * \param name The name handle of the DRM surface.
+ * \param drm_format The DRM pixel format.
+ * \param offset The offset from the buffer start to the real pixel data.
+ * \param width The width of the DRM surface.
+ * \param height The height of the DRM surface.
+ * \param pitch The pitch (row stride) of the DRM surface.
+ *
+ * \return The handle to the memory DC for success, HDC_INVALID for failure.
+ */
+MG_EXPORT HDC drmCreateDCFromNameEx (GHANDLE video,
+        uint32_t name, uint32_t drm_format, off_t offset,
+        uint32_t width, uint32_t height, uint32_t pitch);
+
+static inline HDC drmCreateDCFromName (GHANDLE video,
+        uint32_t name, uint32_t drm_format,
+        uint32_t width, uint32_t height, uint32_t pitch)
+{
+    return drmCreateDCFromNameEx (video,
+        name, drm_format, 0, width, height, pitch);
+}
+
+/**
+ * This function creates a memory DC with a DRM surface which is created by
+ * a foreign process and identified by a PRIME file descriptor.
+ *
+ * \param video The video handle.
+ * \param prime_fd The PRIME file descriptor.
+ * \param size The size of the DRM surface in bytes.
+ * \param drm_format The DRM pixel format.
+ * \param offset The offset from the buffer start to the real pixel data.
+ * \param width The width of the DRM surface.
+ * \param height The height of the DRM surface.
+ * \param pitch The pitch (row stride) of the DRM surface.
+ *
+ * \return The handle to the memory DC for success, HDC_INVALID for failure.
+ */
+MG_EXPORT HDC drmCreateDCFromPrimeFdEx (GHANDLE video,
+        int prime_fd, size_t size, uint32_t drm_format, off_t offset,
+        uint32_t width, uint32_t height, uint32_t pitch);
+
+static inline HDC drmCreateDCFromPrimeFd (GHANDLE video,
+        int prime_fd, size_t size, uint32_t drm_format,
+        uint32_t width, uint32_t height, uint32_t pitch)
+{
+    return drmCreateDCFromPrimeFdEx (video,
+        prime_fd, size, drm_format, 0, width, height, pitch);
+}
+
+/**
+ * This function creates a memory DC with a DRM surface which is created by
+ * a foreign graphics component.
+ *
+ * \param video The video handle.
+ * \param handle The handle of the DRM surface.
+ * \param size The size of the DRM surface in bytes.
+ * \param drm_format The DRM pixel format.
+ * \param offset The offset from the buffer start to the real pixel data.
+ * \param width The width of the DRM surface.
+ * \param height The height of the DRM surface.
+ * \param pitch The pitch (row stride) of the DRM surface.
+ *
+ * \return The handle to the memory DC for success, HDC_INVALID for failure.
+ */
+MG_EXPORT HDC drmCreateDCFromHandleEx (GHANDLE video,
+        uint32_t handle, size_t size, uint32_t drm_format, off_t offset,
+        uint32_t width, uint32_t height, uint32_t pitch);
+
+static inline HDC drmCreateDCFromHandle (GHANDLE video,
+        uint32_t handle, size_t size, uint32_t drm_format,
+        uint32_t width, uint32_t height, uint32_t pitch)
+{
+    return drmCreateDCFromHandleEx (video,
+        handle, size, drm_format, 0, width, height, pitch);
+}
+
+/** @} end of gdi_drm_fns */
+
+#endif /* _MGGAL_DRM */
+
     /** @} end of gdi_fns */
 
 #ifdef _MGGAL_HI3560

include/minigui.h

@@ -49,7 +49,7 @@
     under the terms and conditions of the commercial license.
 
     For more information about the commercial license, please refer to
-    <http://www.minigui.com/en/about/licensing-policy/>.
+    <http://www.minigui.com/blog/minigui-licensing-policy/>.
 
  \endverbatim
  */
@@ -274,13 +274,13 @@ extern MG_EXPORT MG_Layer* mgLayers;
      */
 
 /**
-* \fn int GUIAPI InitGUI (int, const char **)
+* \fn int GUIAPI InitGUI (int argc, const char *argv[])
 * \brief Initialize MiniGUI.
 *
 * The meaning of two parameters is same with parameters of main function.
 *
 **/
-MG_EXPORT int GUIAPI InitGUI (int, const char **);
+MG_EXPORT int GUIAPI InitGUI (int argc, const char *argv[]);
 
 /**
 * \fn void GUIAPI TerminateGUI (int not_used)

include/nucleus_pthread.h

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

include/nucleus_semaphore.h

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

include/ose_semaphore.h

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

include/own_stdio.h

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

include/psos.h

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

include/psos_pthread.h

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

include/psos_semaphore.h

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