4.1.0 -> 4.0.4; release notes

Fix byte order for aarch64 and riscv

.gitignore

@@ -22,4 +22,5 @@ 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.
@@ -4984,11 +4984,11 @@ provide the function whether the file exist or not.(xwyan)
 	* src/server/request.c
 
 10/24. MODIFICATION: Use 1980/01/01 00:00:00 to return the default local time 
-for __mg_localtime.
+for __mg_os_localtime.
 	* src/misc/nposix.c
 
 10/24. MODIFICATION: Use HAVE_TIME, HAVE_MKTIME, and HAVE_LOCALTIME to define 
-__mg_time, __mg_mktime, and __mg_localtime functions.
+__mg_os_time, __mg_os_mktime, and __mg_os_localtime functions.
 	* configure.in
 	* src/misc/nposix.c
 

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         = v3.2.0
+PROJECT_NUMBER         = v4.0.4
 
 # 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
+OUTPUT_DIRECTORY       = doc-api-ref-minigui-procs-4.0.4
 
 # 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
@@ -782,6 +782,7 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ./include
+INPUT                  += README.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -939,7 +940,7 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE =
+USE_MDFILE_AS_MAINPAGE = README.md
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -1288,7 +1289,7 @@ GENERATE_HTMLHELP      = NO
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = 
+CHM_FILE               =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler (hhc.exe). If non-empty,
@@ -2073,6 +2074,7 @@ PREDEFINED             = _MGRM_PROCESSES \
                          _MGMISC_SAVEBITMAP \
                          _MGHAVE_CURSOR \
                          _MGCHARSET_UNICODE \
+                         _MGCOMPLEX_SCRIPTS \
                          _MGCTRL_STATIC \
                          _MGCTRL_SLEDIT \
                          _MGCTRL_BIDISLEDIT \
@@ -2099,7 +2101,10 @@ PREDEFINED             = _MGRM_PROCESSES \
                          _MGCTRL_ANIMATION \
                          _MGFONT_FT2 \
                          _MGFONT_UPF \
-                         _MGFONT_BMPF
+                         _MGFONT_BMPF \
+                         _MGGAL_DRM \
+                         _MGGAL_COMMLCD \
+                         _MGIAL_COMM
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

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         = v3.2.0
+PROJECT_NUMBER         = v4.0.4
 
 # 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
+OUTPUT_DIRECTORY       = doc-api-ref-minigui-sa-4.0.4
 
 # 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
@@ -782,6 +782,7 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ./include
+INPUT                  += README.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -939,7 +940,7 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE =
+USE_MDFILE_AS_MAINPAGE = README.md
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -1288,7 +1289,7 @@ GENERATE_HTMLHELP      = NO
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = 
+CHM_FILE               =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler (hhc.exe). If non-empty,
@@ -2073,6 +2074,7 @@ PREDEFINED             = _MGRM_STANDALONE \
                          _MGMISC_SAVEBITMAP \
                          _MGHAVE_CURSOR \
                          _MGCHARSET_UNICODE \
+                         _MGCOMPLEX_SCRIPTS \
                          _MGCTRL_STATIC \
                          _MGCTRL_SLEDIT \
                          _MGCTRL_BIDISLEDIT \
@@ -2099,7 +2101,10 @@ PREDEFINED             = _MGRM_STANDALONE \
                          _MGCTRL_ANIMATION \
                          _MGFONT_FT2 \
                          _MGFONT_UPF \
-                         _MGFONT_BMPF
+                         _MGFONT_BMPF \
+                         _MGGAL_DRM \
+                         _MGGAL_COMMLCD \
+                         _MGIAL_COMM
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

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         = v3.2.0
+PROJECT_NUMBER         = v4.0.4
 
 # 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
+OUTPUT_DIRECTORY       = doc-api-ref-minigui-ths-4.0.4
 
 # 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
@@ -782,6 +782,7 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ./include
+INPUT                  += README.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -939,7 +940,7 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE =
+USE_MDFILE_AS_MAINPAGE = README.md
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -1288,7 +1289,7 @@ GENERATE_HTMLHELP      = NO
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = 
+CHM_FILE               =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler (hhc.exe). If non-empty,
@@ -2073,6 +2074,7 @@ PREDEFINED             = _MGRM_THREADS \
                          _MGMISC_SAVEBITMAP \
                          _MGHAVE_CURSOR \
                          _MGCHARSET_UNICODE \
+                         _MGCOMPLEX_SCRIPTS \
                          _MGCTRL_STATIC \
                          _MGCTRL_SLEDIT \
                          _MGCTRL_BIDISLEDIT \
@@ -2099,7 +2101,10 @@ PREDEFINED             = _MGRM_THREADS \
                          _MGCTRL_ANIMATION \
                          _MGFONT_FT2 \
                          _MGFONT_UPF \
-                         _MGFONT_BMPF
+                         _MGFONT_BMPF \
+                         _MGGAL_DRM \
+                         _MGGAL_COMMLCD \
+                         _MGIAL_COMM
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

Makefile.am

@@ -1,11 +1,10 @@
 SUBDIRS = src 3rd-party include rtos etc m4 cmake build
 
-EXTRA_DIST = \
+EXTRA_DIST = minigui.pc.in \
-			minigui.pc.in \
             GNUmakefile makefile.ng makefile.msvc rules.make \
             Version INSTALL LICENSE \
             README.md RELEASE-NOTES.md \
-            LICENSE-POLICY-en.md LICENSE-POLICY-zh.md 
+            LICENSE-POLICY-en.md LICENSE-POLICY-zh.md
 
 # The directory where the include files will be installed
 libminiguiincludedir = $(includedir)/minigui
@@ -13,15 +12,17 @@ libminiguiincludedir = $(includedir)/minigui
 # Which header files to install
 libminiguiinclude_HEADERS = mgconfig.h
 
-docs:
-	doxygen Doxyfile.procs Doxyfile.ths Doxyfile.sa
-
-dist-nolicense: dist
-	./clean_license.sh $(DIST_ARCHIVES)
-
-dist:
-distcheck-nolicense:dist-nolicense distcheck
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = minigui.pc
 
+docs:
+	doxygen Doxyfile.procs
+	doxygen Doxyfile.ths
+	doxygen Doxyfile.sal
+
+#dist-nolicense: dist
+#	./clean_license.sh $(DIST_ARCHIVES)
+#
+#dist:
+#distcheck-nolicense:dist-nolicense distcheck
+

Version

@@ -1,9 +0,0 @@
-Version 3.2.0 (2018/02/10)
-
-This release needs the following resource packages:
-
-    * minigui-res-3.0.13.tar.gz
-
-The latest samples package is:
-
-    * mg-samples-3.2.0.tar.gz

Version.md

@@ -0,0 +1,8 @@
+Version 4.0.4 (2019/12/24)
+
+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 package: `mg-test-4.0.4.tar.gz`
+

build/rules-pc.linux

@@ -0,0 +1,36 @@
+# 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` -I/usr/local/include/harfbuzz
+LDFLAGS+=
+##################################################
+

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];
+ 229     char type [LEN_LOGFONT_NAME_FIELD + 1];
- 230     char family [LEN_FONT_NAME + 1];
+ 230     char family [LEN_LOGFONT_NAME_FIELD + 1];
- 231     char charset [LEN_FONT_NAME + 1];
+ 231     char charset [LEN_LOGFONT_NAME_FIELD + 1];
  232     DWORD style;
  233     int size;
  234     int rotation;

etc/MiniGUI.cfg

@@ -1,38 +1,74 @@
-# This configuration file is for MiniGUI V3.x.x
+# This configuration file is for MiniGUI V4.0.x or later
 #
-# Copyright (C) 2002~2018 FMSoft
+# Copyright (C) 2002~2019 FMSoft
 # Copyright (C) 1998~2002 Wei Yongming.
 #
 # Web: http://www.minigui.com
 #
 # This configuration file must be installed in /etc,
-# /usr/local/etc or your home directory. When you install it in your
+# /usr/local/etc, your home directory, or the current working direcotry.
-# home directory, it should be named ".MiniGUI.cfg".
+# When you install it in your home directory, it should be named
-# 
+# ".MiniGUI.cfg".
-# The priority of above configruation files is ~/.MiniGUI.cfg, 
-# /usr/local/etc/MiniGUI.cfg, and then /etc/MiniGUI.cfg.
 #
-# If you change the install path of MiniGUI resource, you should 
+# The priority of above configruation files is ./MiniGUI.cfg,
+# ~/.MiniGUI.cfg, /usr/local/etc/MiniGUI.cfg, and then /etc/MiniGUI.cfg.
+#
+# NOTE that the one in the current working directory will have
+# always have the highest priority.
+#
+# If you change the install path of MiniGUI resource, you should
 # modify this file to meet your configuration.
 #
 
 [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
 
-[fbcon]
+# Linux IAL engine based on libinput
-defaultmode=1024x768-16bpp
+# ial_engine=libinut
+
+#{{ifdef _MGGAL_DRM
+[drm]
+defaultmode=1024x768-32bpp
+
+# We use DRM fourcc code to defined the pixel format of the video surface.
+# For more information, please see <drm/drm_fourcc.h> header file.
+# Note that only 8/16/24/32 bpp RGB formats are supported.
+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.so.0
+#}}
+
+#{{ifdef _MGIAL_LIBINPUT
+[libinput]
+seat=seat0
+#}}
+
+#{{ifdef _MGGAL_FBCON
+[fbcon]
+defaultmode=1024x768-16bpp
+dpi=96
+#}}
+
 #{{ifdef _MGGAL_PCXVFB
 [pc_xvfb]
 defaultmode=800x600-16bpp
@@ -58,7 +94,19 @@ def_bgcolor=0x00FF00
 double_buffer=enable
 #}}
 
+#{{ifdef _MGIAL_RANDOM
+[random]
+logfile=/dev/null
+eventtypes=mouse-keyboard-button-gesture
+minkeycode=1
+maxkeycode=128
+minbtncode=0x100
+maxbtncode=0x1ff
+#}}
+
 # The first system font must be a logical font using RBF device font.
+# NOTE that the maxiaml number of system logfonts is 6. You should not
+# set `font_number` in this section to be a number larger than 6.
 [systemfont]
 font_number=5
 font0=rbf-FixedSys-rrncnn-8-16-ISO8859-1
@@ -88,6 +136,10 @@ font_number=0
 
 [truetypefonts]
 font_number=0
+# The devfont now supports multiple font family names since V4.0.0.
+name0=ttf-Source Sans Pro,SansSerif-rrncnn-0-0-ISO8859-1,UTF-8
+# The path of font file can be relative to the current working directory.
+fontfile0=font/SourceSansPro-Regular.ttf
 
 [mouse]
 dblclicktime=300
@@ -126,7 +178,7 @@ cursor22=ve_split.cur
 
 [resinfo]
 respath=/usr/local/share/minigui/res/
- 
+
 [classic]
 # Note that max number defined in source code is 5.
 iconnumber=5

examples/createlogfont.c

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

@@ -10,9 +10,9 @@ libminiguiincludedir = $(includedir)/minigui
 COMM_HDRS =     \
     common.h endianrw.h fixedmath.h \
     minigui.h gdi.h window.h control.h \
-    own_malloc.h  own_stdio.h \
+    own_malloc.h own_stdio.h \
-    xvfb.h customial.h \
+    xvfb.h customial.h exstubs.h \
-    dti.c 
+    dti.c
 
 UCOSII_HDRS=ucos2_pthread.h ucos2_semaphore.h
 THREADX_HDRS=threadx_pthread.h threadx_semaphore.h
@@ -23,12 +23,12 @@ OSE_HDRS=ose_semaphore.h
 PSOS_HDRS=psos_pthread.h psos_semaphore.h
 
 EXTRA_DIST=$(UCOSII_HDRS) $(THREADX_HDRS) $(NUCLEUS_HDRS) $(VXWORKS_HDRS) \
-           $(OSE_HDRS) $(PSOS_HDRS) $(WIN32_HDRS) makefile.ng makefile.msvc
+            $(OSE_HDRS) $(PSOS_HDRS) $(WIN32_HDRS) makefile.ng makefile.msvc
 
 #CLEANFILES=pthread.h semaphore.h
 
 libminiguiinclude_HEADERS=$(COMM_HDRS) $(UCOSII_HDRS) $(THREADX_HDRS) \
-				$(NUCLEUS_HDRS) $(VXWORKS_HDRS) $(OSE_HDRS) $(PSOS_HDRS) $(WIN32_HDRS)
+            $(NUCLEUS_HDRS) $(VXWORKS_HDRS) $(OSE_HDRS) $(PSOS_HDRS) $(WIN32_HDRS)
 
 if MGUSE_OWN_PTHREAD
 install-data-local:

include/control.h

@@ -1,13 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file control.h
  * \author Wei Yongming <vincent@minigui.org>
  * \date 2001/12/29
- * 
+ *
  * \brief This file includes interfaces of standard controls of MiniGUI.
  *
  \verbatim
 
-    This file is part of MiniGUI, a mature cross-platform windowing 
+    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.
 
@@ -37,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
  */
@@ -45,7 +57,7 @@
 /*
  * $Id: control.h 11349 2009-03-02 05:00:43Z weiym $
  *
- *      MiniGUI for Linux/uClinux, eCos, uC/OS-II, VxWorks, 
+ *      MiniGUI for Linux/uClinux, eCos, uC/OS-II, VxWorks,
  *      pSOS, ThreadX, NuCleus, OSE, and Win32.
  *
  */

include/ctrl/animation.h

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file animation.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file button.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file combobox.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file coolbar.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file ctrlhelper.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file edit.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file gridview.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file iconview.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file listbox.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file listview.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file menubutton.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file monthcal.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file newtoolbar.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file progressbar.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file propsheet.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file scrollbar.h
  * \author wangjian 
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file scrollview.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file spinbox.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file static.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file textedit.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file trackbar.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file treeview.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -35,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

@@ -1,13 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file customial.h
  * \author Wei Yongming <vincent@minigui.org>
  * \date 2007/06/06
- * 
+ *
  * \brief This file is the head file for Custom IAL Engine.
  *
  \verbatim
 
-    This file is part of MiniGUI, a mature cross-platform windowing 
+    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.
 
@@ -36,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
  */
@@ -44,31 +56,155 @@
 /*
  * $Id: customial.h 11349 2009-03-02 05:00:43Z weiym $
  *
- *      MiniGUI for Linux/uClinux, eCos, uC/OS-II, VxWorks, 
+ *      MiniGUI for Linux/uClinux, eCos, uC/OS-II, VxWorks,
  *      pSOS, ThreadX, NuCleus, OSE, and Win32.
  */
 
 #ifndef GUI_IAL_CUSTOM_H
     #define GUI_IAL_CUSTOM_H
 
-#ifdef __cplusplus
+#define IAL_MOUSE_LEFTBUTTON    (1 << 0)
-extern "C" {
+#define IAL_MOUSE_RIGHTBUTTON   (1 << 1)
-#endif  /* __cplusplus */
+#define IAL_MOUSE_MIDDLEBUTTON  (1 << 2)
 
+/* deprecated since 4.0.0
+#define IAL_MOUSE_FOURTHBUTTON  (1 << 3)
+#define IAL_MOUSE_FIFTHBUTTON   (1 << 4)
+#define IAL_MOUSE_SIXTHBUTTON   (1 << 5)
+#define IAL_MOUSE_SEVENTHBUTTON (1 << 6)
+#define IAL_MOUSE_EIGHTHBUTTON  (1 << 7)
 
-#define IAL_MOUSE_LEFTBUTTON    1
+#define IAL_MOUSE_SIDEBUTTON    IAL_MOUSE_FOURTHBUTTON
-#define IAL_MOUSE_RIGHTBUTTON   2
+#define IAL_MOUSE_EXTRABUTTON   IAL_MOUSE_FIFTHBUTTON
-#define IAL_MOUSE_MIDDLEBUTTON  4
+#define IAL_MOUSE_FORWARDBUTTON IAL_MOUSE_SIXTHBUTTON
-#define IAL_MOUSE_FOURTHBUTTON  8
+#define IAL_MOUSE_BACKBUTTON    IAL_MOUSE_SEVENTHBUTTON
-#define IAL_MOUSE_FIFTHBUTTON   16
+#define IAL_MOUSE_TASKBUTTON    IAL_MOUSE_EIGHTHBUTTON
-#define IAL_MOUSE_SIXTHBUTTON   32
+#define IAL_MOUSE_RESETBUTTON   IAL_MOUSE_EIGHTHBUTTON
-#define IAL_MOUSE_RESETBUTTON   64
+*/
 
-#define IAL_MOUSEEVENT          1
+#define IAL_EVENT_MOUSE         (1 << 0)
-#define IAL_KEYEVENT            2
+    #define IAL_MOUSEEVENT          IAL_EVENT_MOUSE
+#define IAL_EVENT_KEY           (1 << 1)
+    #define IAL_KEYEVENT            IAL_EVENT_KEY
 
-typedef struct tagINPUT
+#define IAL_EVENT_EXTRA         (1 << 2)
-{
+
+/* The event identifiers, should keep sync with MSG_EXIN_XXX */
+#ifndef AXIS_SCROLL_INVALID
+    #define AXIS_SCROLL_INVALID     0
+    #define AXIS_SCROLL_VERTICAL    1
+    #define AXIS_SCROLL_HORIZONTAL  2
+
+    #define AXIS_SOURCE_INVALID     0
+    #define AXIS_SOURCE_WHEEL       1
+    #define AXIS_SOURCE_FINGER      2
+    #define AXIS_SOURCE_CONTINUOUS  3
+    #define AXIS_SOURCE_WHEEL_TILT  4
+#endif
+
+#define IAL_EVENT_AXIS                   0x0070
+#define IAL_EVENT_BUTTONDOWN             0x0071
+#define IAL_EVENT_BUTTONUP               0x0072
+
+#define IAL_EVENT_TOUCH_DOWN             0x0073
+#define IAL_EVENT_TOUCH_UP               0x0074
+#define IAL_EVENT_TOUCH_MOTION           0x0075
+#define IAL_EVENT_TOUCH_CANCEL           0x0076
+#define IAL_EVENT_TOUCH_FRAME            0x0077
+
+#ifndef SWITCH_INVALID
+    #define SWITCH_INVALID                  0
+    #define SWITCH_LID                      1
+    #define SWITCH_TABLET_MODE              2
+
+    #define SWITCH_STATE_INVALID            0
+    #define SWITCH_STATE_ON                 1
+    #define SWITCH_STATE_OFF                2
+#endif
+
+#define IAL_EVENT_SWITCH_TOGGLE          0x007A
+
+#define IAL_EVENT_GESTURE_SWIPE_BEGIN    0x0080
+#define IAL_EVENT_GESTURE_SWIPE_UPDATE   0x0081
+#define IAL_EVENT_GESTURE_SWIPE_END      0x0082
+#define IAL_EVENT_GESTURE_PINCH_BEGIN    0x0083
+#define IAL_EVENT_GESTURE_PINCH_UPDATE   0x0084
+#define IAL_EVENT_GESTURE_PINCH_END      0x0085
+
+#ifndef TABLET_TOOL_X
+    #define TABLET_TOOL_PROXIMITY_STATE_INVALID 0
+    #define TABLET_TOOL_PROXIMITY_STATE_OUT     1
+    #define TABLET_TOOL_PROXIMITY_STATE_IN      2
+
+    #define TABLET_TOOL_TIP_INVALID         0
+    #define TABLET_TOOL_TIP_UP              1
+    #define TABLET_TOOL_TIP_DOWN            2
+
+    #define TABLET_BUTTON_STATE_INVALID     0
+    #define TABLET_BUTTON_STATE_RELEASED    1
+    #define TABLET_BUTTON_STATE_PRESSED     2
+
+    #define TABLET_PAD_RING_SOURCE_UNKNOWN  0
+    #define TABLET_PAD_RING_SOURCE_FINGER   1
+
+    #define TABLET_PAD_STRIP_SOURCE_UNKNOWN 0
+    #define TABLET_PAD_STRIP_SOURCE_FINGER  1
+
+    #define TABLET_TOOL_CHANGED_X           (1 << 0)
+    #define TABLET_TOOL_CHANGED_Y           (1 << 1)
+    #define TABLET_TOOL_CHANGED_PRESSURE    (1 << 2)
+    #define TABLET_TOOL_CHANGED_DISTANCE    (1 << 3)
+    #define TABLET_TOOL_CHANGED_TILT_X      (1 << 4)
+    #define TABLET_TOOL_CHANGED_TILT_Y      (1 << 5)
+    #define TABLET_TOOL_CHANGED_ROTATION    (1 << 6)
+    #define TABLET_TOOL_CHANGED_SLIDER      (1 << 7)
+    #define TABLET_TOOL_CHANGED_SIZE_MAJOR  (1 << 8)
+    #define TABLET_TOOL_CHANGED_SIZE_MINOR  (1 << 9)
+    #define TABLET_TOOL_CHANGED_WHEEL       (1 << 10)
+
+    #define TABLET_TOOL_X                   0
+    #define TABLET_TOOL_Y                   1
+    #define TABLET_TOOL_PRESSURE            2
+    #define TABLET_TOOL_DISTANCE            3
+    #define TABLET_TOOL_TILT_X              4
+    #define TABLET_TOOL_TILT_Y              5
+    #define TABLET_TOOL_ROTATION            6
+    #define TABLET_TOOL_SLIDER              7
+    #define TABLET_TOOL_SIZE_MAJOR          8
+    #define TABLET_TOOL_SIZE_MINOR          9
+    #define TABLET_TOOL_WHEEL               10
+
+#endif
+
+#define IAL_EVENT_TABLET_TOOL_AXIS       0x0090
+#define IAL_EVENT_TABLET_TOOL_PROXIMITY  0x0091
+#define IAL_EVENT_TABLET_TOOL_TIP        0x0092
+#define IAL_EVENT_TABLET_TOOL_BUTTON     0x0093
+
+#define IAL_EVENT_TABLET_PAD_BUTTON      0x0094
+#define IAL_EVENT_TABLET_PAD_RING        0x0095
+#define IAL_EVENT_TABLET_PAD_STRIP       0x0096
+
+#define IAL_EVENT_USER_BEGIN             0x009A
+#define IAL_EVENT_USER_UPDATE            0x009B
+#define IAL_EVENT_USER_END               0x009C
+
+#define NR_PACKED_SUB_EVENTS            16
+
+typedef struct _EXTRA_INPUT_EVENT {
+    int event;
+    WPARAM wparam;
+    LPARAM lparam;
+
+    // for tablet tool messages
+    unsigned int    params_mask;
+    WPARAM          wparams[NR_PACKED_SUB_EVENTS];
+    LPARAM          lparams[NR_PACKED_SUB_EVENTS];
+} EXTRA_INPUT_EVENT;
+
+#define IAL_LEN_MDEV            127
+
+typedef struct tagINPUT {
     char*   id;
 
     // Initialization and termination
@@ -91,12 +227,18 @@ typedef struct tagINPUT
     int (*resume_keyboard) (void);
     void (*set_leds) (unsigned int leds);
 
-    // Event
+    // Event loop
-    int (*wait_event) (int which, int maxfd, fd_set *in, fd_set *out, 
+    int (*wait_event) (int which, int maxfd, fd_set *in, fd_set *out,
             fd_set *except, struct timeval *timeout);
 
-    char mdev [MAX_PATH + 1];
+    // New wait event method for getting extra input events; since 4.0.0
-}INPUT;
+    int (*wait_event_ex) (int maxfd, fd_set *in, fd_set *out,
+            fd_set *except, struct timeval *timeout, EXTRA_INPUT_EVENT* extra);
+} INPUT;
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
 
 #ifdef _MGIAL_CUSTOM
 extern BOOL InitCustomInput (INPUT* input, const char* mdev, const char* mtype);

include/dti.c

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /*
  * \file dti.c
  * \author Wei Yongming <vincent@minigui.org>
@@ -5,13 +17,37 @@
  *
  \verbatim
 
-    Copyright (C) 2002-2018 FMSoft
+    This file is part of MiniGUI, a mature cross-platform windowing
-    Copyright (C) 1999-2002 Wei Yongming.
+    and Graphics User Interface (GUI) support system for embedded systems
-  
+    and smart IoT devices.
-    All rights reserved by Feynman Software.
 
-    This file is part of MiniGUI, a compact cross-platform Graphics 
+    Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd.
-    User Interface (GUI) support system for real-time embedded systems.
+    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 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
  */

include/endianrw.h

@@ -1,3 +1,15 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file endianrw.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -40,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

@@ -1,13 +1,25 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          IMPORTANT NOTICE
+//
+// The following open source license statement does not apply to any
+// entity in the Exception List published by FMSoft.
+//
+// For more information, please visit:
+//
+// https://www.fmsoft.cn/exception-list
+//
+//////////////////////////////////////////////////////////////////////////////
 /**
  * \file fixedmath.h
  * \author Wei Yongming <vincent@minigui.org>
  * \date 2002/01/12
- * 
+ *
  * \brief This file includes fixed point and three-dimension math routines.
  *
  \verbatim
 
-    This file is part of MiniGUI, a mature cross-platform windowing 
+    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.
 
@@ -37,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
  */
@@ -45,7 +57,7 @@
 /*
  * $Id: fixedmath.h 12154 2009-10-15 07:21:34Z weiym $
  *
- *      MiniGUI for Linux/uClinux, eCos, uC/OS-II, VxWorks, 
+ *      MiniGUI for Linux/uClinux, eCos, uC/OS-II, VxWorks,
  *      pSOS, ThreadX, NuCleus, OSE, and Win32.
  *
  *      Fixed-point math routins come from Allegro (a gift software)
@@ -79,21 +91,21 @@ extern "C" {
 
     /**
      * \defgroup fixed_math_fns Fixed point math functions
-     * 
+     *
      * You know that the float point mathematics routines are very
-     * expensive. If you do not want precision mathematics result, 
+     * expensive. If you do not want precision mathematics result,
      * you can use fixed point. MiniGUI uses a double word (32-bit)
-     * integer to represent a fixed point ranged from -32767.0 to 
+     * integer to represent a fixed point ranged from -32767.0 to
-     * 32767.0, and defines some fixed point mathematics routines for 
+     * 32767.0, and defines some fixed point mathematics routines for
-     * your application. Some GDI functions need fixed point 
+     * your application. Some GDI functions need fixed point
      * math routines, like \a Arc.
      *
      * Example 1:
-     * 
+     *
      * \include fixed_point.c
      *
      * Example 2:
-     * 
+     *
      * \include fixedpoint.c
      * @{
      */
@@ -112,9 +124,9 @@ MG_EXPORT fixed fixsqrt (fixed x);
 /**
  * \fn fixed fixhypot (fixed x, fixed y)
  * \brief Returns the Euclidean distance from the origin.
- * 
+ *
- * The function returns the \a sqrt(x*x+y*y). This is the length of 
+ * The function returns the \a sqrt(x*x+y*y). This is the length of
- * the hypotenuse of a right-angle triangle with sides of length \a x and \a y, 
+ * the hypotenuse of a right-angle triangle with sides of length \a x and \a y,
  * or the distance of the point \a (x,y) from the origin.
  *
  * \sa fixsqrt
@@ -125,10 +137,10 @@ MG_EXPORT fixed fixhypot (fixed x, fixed y);
  * \fn fixed fixatan (fixed x)
  * \brief Calculates the arc tangent of a fixed point value.
  *
- * This function calculates the arc tangent of \a x; that is the value 
+ * This function calculates the arc tangent of \a x; that is the value
  * whose tangent is \a x.
  *
- * \return Returns the arc tangent in radians and the value is 
+ * \return Returns the arc tangent in radians and the value is
  *         mathematically defined to be between -PI/2 and PI/2 (inclusive).
  *
  * \sa fixatan2
@@ -140,20 +152,20 @@ MG_EXPORT fixed fixatan (fixed x);
  * \brief Calculates the arc tangent of two fixed point variables.
  *
  *  This function calculates the arc tangent of the two variables \a x and \a y.
- *  It is similar to calculating the arc tangent of \a y / \a x, except that 
+ *  It is similar to calculating the arc tangent of \a y / \a x, except that
- *  the signs of both arguments are used to determine the quadrant of the 
+ *  the signs of both arguments are used to determine the quadrant of the
  *  result.
  *
- * \return Returns the result in radians, which is between -PI and PI 
+ * \return Returns the result in radians, which is between -PI and PI
  *         (inclusive).
  *
  * \sa fixatan
  */
 MG_EXPORT fixed fixatan2 (fixed y, fixed x);
 
-extern MG_EXPORT fixed _cos_tbl[];
+extern MG_EXPORT const fixed __mg_cos_tbl[];
-extern MG_EXPORT fixed _tan_tbl[];
+extern MG_EXPORT const fixed __mg_tan_tbl[];
-extern MG_EXPORT fixed _acos_tbl[];
+extern MG_EXPORT const fixed __mg_acos_tbl[];
 
 /************************** inline fixed point math functions *****************/
 /* ftofix and fixtof are used in generic C versions of fixmul and fixdiv */
@@ -162,7 +174,7 @@ extern MG_EXPORT fixed _acos_tbl[];
  * \fn fixed ftofix (double x)
  * \brief Converts a float point value to a fixed point value.
  *
- * This function converts the specified float point value \a x to 
+ * This function converts the specified float point value \a x to
  * a fixed point value.
  *
  * \note The float point should be ranged from -32767.0 to 32767.0.
@@ -171,7 +183,7 @@ extern MG_EXPORT fixed _acos_tbl[];
  * \sa fixtof
  */
 static inline fixed ftofix (double x)
-{ 
+{
    if (x > 32767.0) {
       errno = ERANGE;
       return 0x7FFFFFFF;
@@ -182,21 +194,21 @@ static inline fixed ftofix (double x)
       return -0x7FFFFFFF;
    }
 
-   return (long)(x * 65536.0 + (x < 0 ? -0.5 : 0.5)); 
+   return (long)(x * 65536.0 + (x < 0 ? -0.5 : 0.5));
 }
 
 /**
  * \fn double fixtof (fixed x)
  * \brief Converts a fixed point value to a float point value.
  *
- * This function converts the specified fixed point value \a x to 
+ * This function converts the specified fixed point value \a x to
  * a float point value.
  *
  * \sa ftofix
  */
 static inline double fixtof (fixed x)
-{ 
+{
-   return (double)x / 65536.0; 
+   return (double)x / 65536.0;
 }
 
 
@@ -209,7 +221,7 @@ static inline double fixtof (fixed x)
  *
  * \param x x,y: Two addends.
  * \param y x,y: Two addends.
- * \return The sum. If the result runs out of range of fixed point, 
+ * \return The sum. If the result runs out of range of fixed point,
  *         this function sets \a errno to \a ERANGE.
  *
  * \sa fixsub
@@ -220,19 +232,19 @@ static inline fixed fixadd (fixed x, fixed y)
 
    if (result >= 0) {
       if ((x < 0) && (y < 0)) {
-	 errno = ERANGE;
+         errno = ERANGE;
-	 return -0x7FFFFFFF;
+         return -0x7FFFFFFF;
       }
       else
-	 return result;
+         return result;
    }
    else {
       if ((x > 0) && (y > 0)) {
-	 errno = ERANGE;
+         errno = ERANGE;
-	 return 0x7FFFFFFF;
+         return 0x7FFFFFFF;
       }
       else
-	 return result;
+         return result;
    }
 }
 
@@ -240,13 +252,13 @@ static inline fixed fixadd (fixed x, fixed y)
  * \fn fixed fixsub (fixed x, fixed y)
  * \brief Subtract a fixed point value from another.
  *
- * This function subtracts the fixed point values \a y from the fixed 
+ * This function subtracts the fixed point values \a y from the fixed
  * point value \a x, and returns the difference.
  *
  * \param x The minuend.
  * \param y The subtrahend.
  *
- * \return The difference. If the result runs out of range of fixed point, 
+ * \return The difference. If the result runs out of range of fixed point,
  *         this function sets \a errno to \a ERANGE.
  *
  * \sa fixadd
@@ -257,33 +269,33 @@ static inline fixed fixsub (fixed x, fixed y)
 
    if (result >= 0) {
       if ((x < 0) && (y > 0)) {
-	 errno = ERANGE;
+         errno = ERANGE;
-	 return -0x7FFFFFFF;
+         return -0x7FFFFFFF;
       }
       else
-	 return result;
+         return result;
    }
    else {
       if ((x > 0) && (y < 0)) {
-	 errno = ERANGE;
+         errno = ERANGE;
-	 return 0x7FFFFFFF;
+         return 0x7FFFFFFF;
       }
       else
-	 return result;
+         return result;
    }
 }
 
 /**
  * \fn fixed fixmul (fixed x, fixed y)
  * \brief Returns the product of two fixed point values.
- * 
+ *
  * This function returns the product of two fixed point values \a x and \a y.
  *
  * \param x The faciend.
  * \param y The multiplicato.
- * \return The prodcut. If the result runs out of range of fixed point, 
+ * \return The prodcut. If the result runs out of range of fixed point,
  *         this function sets \a errno to \a ERANGE.
- * 
+ *
  * \sa fixdiv
  */
 MG_EXPORT fixed fixmul (fixed x, fixed y);
@@ -291,14 +303,14 @@ MG_EXPORT fixed fixmul (fixed x, fixed y);
 /**
  * \fn fixed fixdiv (fixed x, fixed y)
  * \brief Returns the quotient of two fixed point values.
- * 
+ *
  * This function returns the quotient of two fixed point values \a x and \a y.
  *
  * \param x The dividend.
  * \param y The divisor.
- * \return The quotient. If the result runs out of range of fixed point, 
+ * \return The quotient. If the result runs out of range of fixed point,
  *         this function sets \a errno to \a ERANGE.
- * 
+ *
  * \sa fixmul
  */
 MG_EXPORT fixed fixdiv (fixed x, fixed y);
@@ -336,7 +348,7 @@ static inline int fixceil (fixed x)
  * \sa fixtoi
  */
 static inline fixed itofix (int x)
-{ 
+{
    return x << 16;
 }
 
@@ -349,61 +361,61 @@ static inline fixed itofix (int x)
  * \sa itofix
  */
 static inline int fixtoi (fixed x)
-{ 
+{
-   return (x >> 16) + ((x & 0x8000) >> 15);
+    return (x >> 16) + ((x & 0x8000) >> 15);
 }
 
 /**
  * \fn fixed fixcos (fixed x)
  * \brief Returns the cosine of a fixed point.
  *
- * This function returns the cosine of the fixed point \a x, 
+ * This function returns the cosine of the fixed point \a x,
  * where \a x is given in radians.
  *
  * \sa fixacos
  */
 static inline fixed fixcos (fixed x)
 {
-   return _cos_tbl[((x + 0x4000) >> 15) & 0x1FF];
+    return __mg_cos_tbl[((x + 0x4000) >> 15) & 0x1FF];
 }
 
 /**
  * \fn fixed fixsin (fixed x)
  * \brief Returns the sine of a fixed point.
  *
- * This function returns the sine of the fixed point \a x, 
+ * This function returns the sine of the fixed point \a x,
  * where \a x is given in radians.
  *
  * \sa fixasin
  */
 static inline fixed fixsin (fixed x)
-{ 
+{
-   return _cos_tbl[((x - 0x400000 + 0x4000) >> 15) & 0x1FF];
+    return __mg_cos_tbl[((x - 0x400000 + 0x4000) >> 15) & 0x1FF];
 }
 
 /**
  * \fn fixed fixtan (fixed x)
  * \brief Returns the tangent of a fixed point.
  *
- * This function returns the tangent of the fixed point \a x, 
+ * This function returns the tangent of the fixed point \a x,
  * where \a x is given in radians.
  *
  * \sa fixcos, fixsin
  */
 static inline fixed fixtan (fixed x)
-{ 
+{
-   return _tan_tbl[((x + 0x4000) >> 15) & 0xFF];
+    return __mg_tan_tbl[((x + 0x4000) >> 15) & 0xFF];
 }
 
 /**
  * \fn fixed fixacos (fixed x)
  * \brief Calculates and returns the arc cosine of a fixed point.
  *
- * This function calculates the arc cosine of the fixed point \a x; 
+ * This function calculates the arc cosine of the fixed point \a x;
  * that is the value whose cosine is \a x. If \a x falls outside
  * the range -1 to 1, this function fails and \a errno is set to EDOM.
  *
- * \return Returns the arc cosine in radians and the value is mathematically 
+ * \return Returns the arc cosine in radians and the value is mathematically
  *         defined to be between 0 and PI (inclusive).
  *
  * \sa fixcos
@@ -415,30 +427,30 @@ static inline fixed fixacos (fixed x)
       return 0;
    }
 
-   return _acos_tbl[(x+65536+127)>>8];
+   return __mg_acos_tbl[(x+65536+127)>>8];
 }
 
 /**
  * \fn fixed fixasin (fixed x)
  * \brief Calculates and returns the arc sine of a fixed point.
  *
- * This function calculates the arc sine of the fixed point \a x; 
+ * This function calculates the arc sine of the fixed point \a x;
  * that is the value whose sine is \a x. If \a x falls outside
  * the range -1 to 1, this function fails and \a errno is set to EDOM.
  *
- * \return Returns the arc sine in radians and the value is mathematically 
+ * \return Returns the arc sine in radians and the value is mathematically
  *         defined to be between -PI/2 and PI/2 (inclusive).
  *
  * \sa fixsin
  */
 static inline fixed fixasin (fixed x)
-{ 
+{
    if ((x < -65536) || (x > 65536)) {
       errno = EDOM;
       return 0;
    }
 
-   return 0x00400000 - _acos_tbl[(x+65536+127)>>8];
+   return 0x00400000 - __mg_acos_tbl[(x+65536+127)>>8];
 }
 
     /** @} end of fixed_math_fns */