fix minor bugs

.gitignore

@@ -4,8 +4,6 @@
 *.al
 *.a
 *.so
-\#
-am--include-marker
 Makefile
 Makefile.in
 .deps/
@@ -25,7 +23,4 @@ Makefile.in
 /*config.h
 /*config.h.in
 /*config.h.in~
-/src/font/utils/emoji/
-/src/font/utils/ucd/
-/src/sysres/font_list
-/src/sysres/license/dat_files/
+

3rd-party/scripteasy/test/font_table.c

@@ -1,89 +1,89 @@
+
+/*
+ * Copyright (C) 2000-2007 Beijing Komoxo Inc.
+ * All rights reserved.
+ */
 
-/*
- * Copyright (C) 2000-2007 Beijing Komoxo Inc.
- * All rights reserved.
- */
-
-#include "se_minigui.h"
+#include "se_minigui.h"
 #include "stdio.h"
 #include "string.h"
 
-#include "kmx_latin1_ttf.h"
+#include "kmx_latin1_ttf.h"
 #include "fzxh_gb2312_ttf.h"
 #include "fzxh_gb18030_1_ttf_stub.h"
 #include "fzxh_gb18030_2_ttf_stub.h"
 
-#define ASSERT(a)
-
-#ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT
-    #define MAX_PATH                256
-    #define MAX_LOGICAL_FONT_SIZE   16  /* Physical font count per logical font */
-#endif
-
-#define MAX_LOGICAL_TABLE_SIZE  256
-
-/* Script Easy font description data definition */
-
-static void* font_table[] =
-{
-    (void*) &kmx_latin1_ttf, 0,
-    (void*) &fzxh_gb2312_ttf, 0,
+#define ASSERT(a)
+
+#ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT
+    #define MAX_PATH                256
+    #define MAX_LOGICAL_FONT_SIZE   16  /* Physical font count per logical font */
+#endif
+
+#define MAX_LOGICAL_TABLE_SIZE  256 
+
+/* Script Easy font description data definition */
+
+static void* font_table[] =
+{
+    (void*) &kmx_latin1_ttf, 0,
+    (void*) &fzxh_gb2312_ttf, 0,
     (void*) &fzxh_gb18030_1_ttf, 0,
     (void*) &fzxh_gb18030_2_ttf, 0,
-
-    0
-};
-
-#define FONT_TABLE_SIZE ((sizeof(font_table) / sizeof(void*) - 1) / 2)
-
-static unsigned char logical_font_table_config[][MAX_LOGICAL_FONT_SIZE] =
-{
-    {4, 0, 1, 2, 3}
-};
-#define LOGICAL_FONT_TABLE_SIZE (sizeof(logical_font_table_config) / (MAX_LOGICAL_FONT_SIZE * sizeof(unsigned char)))
-#define DEFAULT_LOGICAL_FONT_INDEX  0
-
-static unsigned char logical_font_table[MAX_LOGICAL_TABLE_SIZE];
+
+    0
+};
+
+#define FONT_TABLE_SIZE ((sizeof(font_table) / sizeof(void*) - 1) / 2)
+
+static unsigned char logical_font_table_config[][MAX_LOGICAL_FONT_SIZE] = 
+{
+    {4, 0, 1, 2, 3}
+};
+#define LOGICAL_FONT_TABLE_SIZE (sizeof(logical_font_table_config) / (MAX_LOGICAL_FONT_SIZE * sizeof(unsigned char)))
+#define DEFAULT_LOGICAL_FONT_INDEX  0
+
+static unsigned char logical_font_table[MAX_LOGICAL_TABLE_SIZE];
 
 static unsigned int logical_font_table_index_map[LOGICAL_FONT_TABLE_SIZE];
-
-#ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT
-    static const
-    struct {
-        const char    *font_name;
-        int           logical_font_index;
-    }
-    font_name_config[] =
-    {
-        {0, 0},
+
+#ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT
+    static const 
+    struct {
+        const char    *font_name;
+        int           logical_font_index;
+    }
+    font_name_config[] = 
+    {
+        {0, 0},
         {0, 0},
        {"fzxh_gb18030_1_ttf.le", 0},
-       {"fzxh_gb18030_2_ttf.le", 0},
-    };
-#endif /* #ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT */
-
+       {"fzxh_gb18030_2_ttf.le", 0},
+    };
+#endif /* #ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT */
+
 static const se_font_name_map font_name_map[] = {
     /* iso8859-1 */
-    {"ttf-fzxh-rrncnn-0-0-iso8859-1", 0},
+    {"ttf-fzxh-rrncnn-0-0-iso8859-1", 0},
     /* GB2312 */
     {"ttf-fzxh-rrncnn-0-0-GB2312", 0},
     /* utf-8 */
-    {"ttf-fzxh-rrncnn-0-0-utf-8", 0},
-};
+    {"ttf-fzxh-rrncnn-0-0-utf-8", 0},
+};
 
 #define FONT_NAME_MAP_SIZE (sizeof(font_name_map) / sizeof(se_font_name_map))
-
-const se_font_description se_font_desc = {
+
+const se_font_description se_font_desc = {
     FONT_TABLE_SIZE,
-    FONT_NAME_MAP_SIZE,
-    (const se_font_name_map*)font_name_map,
-    (const void **)font_table,
-    logical_font_table
+    FONT_NAME_MAP_SIZE,
+    (const se_font_name_map*)font_name_map,
+    (const void **)font_table,
+    logical_font_table
 };
 
 /* The following is the scripteasy mem pool definition */
 
-#define SE_MEM_POOL_SIZE            (64 * 1024)
+#define SE_MEM_POOL_SIZE	        (64 * 1024)
 #define SE_CACHE_MEM_POOL_SIZE      (256 * 1024)
 
 int   se_minigui_mem_pool[SE_MEM_POOL_SIZE];
@@ -92,139 +92,139 @@ int   se_minigui_cache_mem_pool[SE_CACHE_MEM_POOL_SIZE];
 int   se_minigui_cache_mem_pool_size = SE_CACHE_MEM_POOL_SIZE * sizeof(int);
 
 
-/* The Following is for initializing font */
-
-#ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT
-    static const char * se_minigui_get_font_dir(void)
-    {
-        /* TO BE CUSTOMIZED */
-        static char font_dir[MAX_PATH + 1] = "/usr/minigui/se_new/minigui/src/fonts/";
-
-        return font_dir;
-    }
-
-    static FILE* se_minigui_open_font_file(const char *name)
-    {
-        static char     path[MAX_PATH + 1];
-        const char      *font_dir;
-        FILE            *handle = 0;
-
-        font_dir = se_minigui_get_font_dir();
-
-        if(!font_dir)
-        {
-            return 0;
-        }
-
-        strcpy(path, font_dir);
-        strcat(path, name);
-
-        handle = fopen(path, "rb");
-
-        return handle;
-    }
-
-    unsigned int se_minigui_read_font(
-        void*           name,
-        void*           buffer,
-        unsigned int    offset,
-        unsigned int    size)
-    {
-        FILE*           handle = (FILE*) name;
-        unsigned int    read = 0;
-        int             result = 0;
-
-        if(!handle)
-            return 0;
-
-        fseek(handle, offset, SEEK_SET);
-        printf("In se_minigui_read_font...\n");
-        return fread(buffer, 1, size, handle);
-    }
-
-#endif /* #ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT */
-
-static int append_logical_font(int pos, const unsigned char *logical_font)
-{
-    memcpy (logical_font_table + pos, logical_font, logical_font[0] + 1);
-    return logical_font[0] + 1;
-}
-
-static void build_logical_font_table (void)
-{
-    unsigned int i = 0;
-    int          pos = 0;
-    for (; i < LOGICAL_FONT_TABLE_SIZE; ++i)
-    {
-        pos += append_logical_font (pos, logical_font_table_config[logical_font_table_index_map[i]]);
-    }
-
-    logical_font_table[pos] = (unsigned char) 0;
-}
-
-static void init_logical_font_map(void)
-{
-    unsigned int i = 0;
-
-    for (; i < LOGICAL_FONT_TABLE_SIZE; ++i)
-    {
-        logical_font_table_index_map[i] = i;
-    }
-}
-
-void se_minigui_destroy_fonts(void)
-{
-#ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT
-    int i = 0;
-    for(; i < FONT_TABLE_SIZE; ++i)
-    {
-        if(font_table[i * 2 + 1])
-        {
-            fclose((FILE*) font_table[i * 2 + 1]);
-            font_table[i * 2 + 1] = 0;
-        }
-    }
-#endif
-}
-
-void se_minigui_init_fonts(void)
-{
-    int i = 0;
-    int pos = 0;
-
-    ASSERT (DEFAULT_LOGICAL_FONT_INDEX >= 0 &&
-            DEFAULT_LOGICAL_FONT_INDEX < LOGICAL_FONT_TABLE_SIZE);
-
-    se_minigui_destroy_fonts();
-
-    init_logical_font_map();
-
-#ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT
-    for(; i < FONT_TABLE_SIZE; ++i)
-    {
-        if(font_name_config[i].font_name)
-        {
-            FILE* handle;
-
-            handle = se_minigui_open_font_file(font_name_config[i].font_name);
-
-            ASSERT (font_table[i * 2 + 1] == 0);
-
-            if (handle)
-            {
-                font_table[i * 2 + 1] = (void*)handle;
-            }
-            else
-            {
-                ASSERT (font_name_config[i].logical_font_index >= 0 &&
-                        font_name_config[i].logical_font_index < LOGICAL_FONT_TABLE_SIZE);
-                ASSERT (logical_font_table_index_map[font_name_config[i].logical_font_index] == font_name_config[i].logical_font_index);
-
-                logical_font_table_index_map[font_name_config[i].logical_font_index] = DEFAULT_LOGICAL_FONT_INDEX;
-            }
-        }
-    }
-#endif
-
-    build_logical_font_table();
-}
+/* The Following is for initializing font */
+
+#ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT
+    static const char * se_minigui_get_font_dir(void)
+    {
+        /* TO BE CUSTOMIZED */
+        static char font_dir[MAX_PATH + 1] = "/usr/minigui/se_new/minigui/src/fonts/";
+        
+        return font_dir;
+    }
+
+    static FILE* se_minigui_open_font_file(const char *name)
+    {
+        static char     path[MAX_PATH + 1];
+        const char      *font_dir;
+        FILE            *handle = 0;
+
+        font_dir = se_minigui_get_font_dir();
+
+        if(!font_dir)
+        {
+            return 0;
+        }
+
+        strcpy(path, font_dir);
+        strcat(path, name);
+
+        handle = fopen(path, "rb");
+
+        return handle;
+    }
+
+    unsigned int se_minigui_read_font(
+        void*           name,
+        void*           buffer,
+        unsigned int    offset,
+        unsigned int    size)
+    {
+        FILE*           handle = (FILE*) name;
+        unsigned int    read = 0;
+        int             result = 0;
+    
+        if(!handle)
+            return 0;
+    
+        fseek(handle, offset, SEEK_SET);
+        printf("In se_minigui_read_font...\n");
+        return fread(buffer, 1, size, handle);
+    }
+
+#endif /* #ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT */
+
+static int append_logical_font(int pos, const unsigned char *logical_font)
+{
+    memcpy (logical_font_table + pos, logical_font, logical_font[0] + 1);
+    return logical_font[0] + 1;
+}
+
+static void build_logical_font_table (void)
+{
+    unsigned int i = 0;
+    int          pos = 0;
+    for (; i < LOGICAL_FONT_TABLE_SIZE; ++i)
+    {
+        pos += append_logical_font (pos, logical_font_table_config[logical_font_table_index_map[i]]);
+    }
+
+    logical_font_table[pos] = (unsigned char) 0;
+}
+
+static void init_logical_font_map(void)
+{
+    unsigned int i = 0;
+
+    for (; i < LOGICAL_FONT_TABLE_SIZE; ++i)
+    {
+        logical_font_table_index_map[i] = i;
+    }
+}
+
+void se_minigui_destroy_fonts(void)
+{
+#ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT
+    int i = 0;
+    for(; i < FONT_TABLE_SIZE; ++i)
+    {
+        if(font_table[i * 2 + 1])
+        {
+            fclose((FILE*) font_table[i * 2 + 1]);
+            font_table[i * 2 + 1] = 0;
+        }
+    }
+#endif
+}
+
+void se_minigui_init_fonts(void)
+{
+    int i = 0;
+    int pos = 0;
+    
+    ASSERT (DEFAULT_LOGICAL_FONT_INDEX >= 0 && 
+            DEFAULT_LOGICAL_FONT_INDEX < LOGICAL_FONT_TABLE_SIZE);
+
+    se_minigui_destroy_fonts();
+    
+    init_logical_font_map();
+
+#ifdef SE_FONT_DYNAMIC_LOADING_SUPPORT
+    for(; i < FONT_TABLE_SIZE; ++i)
+    {
+        if(font_name_config[i].font_name)
+        {
+            FILE* handle;
+            
+            handle = se_minigui_open_font_file(font_name_config[i].font_name);
+            
+            ASSERT (font_table[i * 2 + 1] == 0);
+
+            if (handle)
+            {
+                font_table[i * 2 + 1] = (void*)handle;
+            }
+            else
+            {
+                ASSERT (font_name_config[i].logical_font_index >= 0 && 
+                        font_name_config[i].logical_font_index < LOGICAL_FONT_TABLE_SIZE);
+                ASSERT (logical_font_table_index_map[font_name_config[i].logical_font_index] == font_name_config[i].logical_font_index);
+                
+                logical_font_table_index_map[font_name_config[i].logical_font_index] = DEFAULT_LOGICAL_FONT_INDEX;
+            }
+        }
+    }
+#endif
+
+    build_logical_font_table();
+}

3rd-party/scripteasy/test/sample.c

@@ -1,4 +1,4 @@
-/*
+/* 
 ** $Id: sample.c,v 1.38 2009-01-15 07:56:45 houhuihua Exp $
 **
 ** sample.c: Sample program for komoxo scripteasy font.
@@ -35,7 +35,7 @@ static void make_welcome_text (void)
     SetRect (&welcome_rc,  10, 20, g_rcScr.right - 10, g_rcScr.bottom / 1.5 - 10);
     SetRect (&msg_rc, 10, welcome_rc.bottom + 10, g_rcScr.right - 10, g_rcScr.bottom - 20);
 
-    if (strcmp (sys_charset, FONT_CHARSET_GB2312_0) == 0
+    if (strcmp (sys_charset, FONT_CHARSET_GB2312_0) == 0 
             || strcmp (sys_charset, FONT_CHARSET_GBK) == 0) {
         format = "昨天,市工商局局长张志宽在市工商局工作会上透露,本市工商系统今年将推出一系列促进经济发展、保护消费者权益的监管措施。其中,将会把B2B交易平台中的网店、专业门户网站和综合门户网站中的经营主体纳入监控,重点监控网上传销、无照经营、售假和网上欺诈等4种行为。张志宽说,2008年网上违法情况主要表现在虚假宣传、网上欺诈、销售假冒产品等。针对这些违法行为,今年本市将把B2B交易平台上的网店、专业门户网站和综合门户网站中的经营主体信息,全部纳入监控。其中,网上传销、无照经营、销售假冒伪劣商品和网上欺诈等4种行为,将成为打击的重点,工商将研究推出新的监管手段。据了解,目前国务院已经将网上交易监管交由国家工重点打击无照经营商总局负责,工商总局正在研究监管意见。本市工商局将根据工商总局的监管意见,相应地完善监管制度。\
             \nA proprietary protocol VOIP system built using Peer-to-peer (P2P) techniques.Free for non commercial use when using softphones (PC to PC).Offers toll access to PSTN via SkypeOut and SkypeIn.\nFrom the company that created KaZaA Licenses the Global IP Sound VoiceEngine suite of codecs and related software including their wideband codecs (double the width of regular pstn.) If you find yourself asking, 'why does Skype sound so good?', the answer is primarily this wideband ability.";
@@ -88,12 +88,12 @@ static int HelloWinProc(HWND hWnd, int message, WPARAM wParam, LPARAM lParam)
             break;
 
         case MSG_TIMER:
-            sprintf (msg_text, "Timer expired, current tick count: %ul.",
+            sprintf (msg_text, "Timer expired, current tick count: %ul.", 
                             GetTickCount ());
             //InvalidateRect (hWnd, &msg_rc, TRUE);
             InvalidateRect (hWnd, NULL, TRUE);
             break;
-
+            
         case MSG_LBUTTONDOWN:
             strcpy (msg_text, "The left button pressed.");
             InvalidateRect (hWnd, &msg_rc, TRUE);
@@ -119,23 +119,23 @@ static int HelloWinProc(HWND hWnd, int message, WPARAM wParam, LPARAM lParam)
                 PLOGFONT logfont;
                 PLOGFONT bklogfont;
 #ifdef UTF_8
-                logfont = CreateLogFont("sef",
-                        "fzxhgb_yh",
-                        "UTF-8",
+                logfont = CreateLogFont("sef", 
+                        "fzxhgb_yh", 
+                        "UTF-8", 
                         FONT_WEIGHT_BOOK,
-                        FONT_SLANT_ROMAN,
-                        0,
+                        FONT_SLANT_ROMAN, 
+                        0, 
                         0,
                         FONT_UNDERLINE_NONE,
                         FONT_STRUCKOUT_NONE,
                         16, 0);
 #else
-                logfont = CreateLogFont("sef",
-                        "fzxhgb_yh",
+                logfont = CreateLogFont("sef", 
+                        "fzxhgb_yh", 
                         "GB2312",
                         FONT_WEIGHT_BOOK,
-                        FONT_SLANT_ROMAN,
-                        0,
+                        FONT_SLANT_ROMAN, 
+                        0, 
                         0,
                         FONT_UNDERLINE_NONE,
                         FONT_STRUCKOUT_NONE,
@@ -166,7 +166,7 @@ static int HelloWinProc(HWND hWnd, int message, WPARAM wParam, LPARAM lParam)
                 last_key = wParam;
                 last_key_count = 1;
             }
-            sprintf (msg_text, "The %d %skey pressed %d times",
+            sprintf (msg_text, "The %d %skey pressed %d times", 
                             wParam, syskey, last_key_count);
             InvalidateRect (hWnd, &msg_rc, TRUE);
             return 0;
@@ -210,9 +210,9 @@ int MiniGUIMain (int argc, const char* argv[])
     CreateInfo.iBkColor = COLOR_lightwhite;
     CreateInfo.dwAddData = 0;
     CreateInfo.hHosting = HWND_DESKTOP;
-
+    
     hMainWnd = CreateMainWindow (&CreateInfo);
-
+    
     if (hMainWnd == HWND_INVALID)
         return -1;
 

AUTHORS

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

AUTHORS.md

@@ -1,16 +0,0 @@
-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_char_type to return
+08/24: ENHANCEMENT #1: Add a new method for FONTOPS: get_glyph_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_os_localtime.
+for __mg_localtime.
 	* src/misc/nposix.c
 
 10/24. MODIFICATION: Use HAVE_TIME, HAVE_MKTIME, and HAVE_LOCALTIME to define 
-__mg_os_time, __mg_os_mktime, and __mg_os_localtime functions.
+__mg_time, __mg_mktime, and __mg_localtime functions.
 	* configure.in
 	* src/misc/nposix.c
 

GNUmakefile

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

Makefile.am

@@ -1,10 +1,11 @@
 SUBDIRS = src 3rd-party include rtos etc m4 cmake build
 
-EXTRA_DIST = minigui.pc.in \
+EXTRA_DIST = \
+			minigui.pc.in \
             GNUmakefile makefile.ng makefile.msvc rules.make \
-            INSTALL LICENSE \
-            Version.md README.md RELEASE-NOTES.md \
-            LICENSE-POLICY-en.md LICENSE-POLICY-zh.md
+            Version INSTALL LICENSE \
+            README.md RELEASE-NOTES.md \
+            LICENSE-POLICY-en.md LICENSE-POLICY-zh.md 
 
 # The directory where the include files will be installed
 libminiguiincludedir = $(includedir)/minigui
@@ -12,17 +13,15 @@ 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

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

Version.md

@@ -1,16 +0,0 @@
-Version 5.0.8 (2021/10/25)
-
-This is a minor enhancement and bugfix release of MiniGUI 5.0.x, the stable version.
-
-Other packages for MiniGUI resource, tools, components, and samples:
-
-- GVFB: `gvfb-1.2.5.tar.gz`
-- The resource package: `minigui-res-5.0.6.tar.gz`
-- mGUtils component: `libmgutils-1.5.0.tar.gz`
-- mGPlus component: `libmgplus-1.5.0.tar.gz`
-- mGEff component: `libmgeff-1.5.0.tar.gz`
-- mGNCS component: `libmgncs-1.5.0.tar.gz`
-- mGNCS4Touch component: `libmgncs4touch-1.5.0.tar.gz`
-- The test cases package: `mg-tests-5.0.0.tar.gz`
-- The sample package: `mg-samples-5.0.0.tar.gz`
-

build/buildlib-freertos

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-rm config.cache config.status -f
-
-./configure \
---disable-shared                           \
---enable-static                            \
---with-osname=freertos                     \
---with-targetname=external                 \
---with-runmode=sa                          \
---enable-mgslicefallback                   \
---disable-videopcxvfb                      \
---disable-videoqvfb                        \
---disable-videodrm                         \
---disable-videofbcon                       \
---enable-videocommlcd                      \
---enable-dummyial                          \
---disable-consoleial                       \
---disable-libinputial                      \
---enable-commial                           \
---disable-consoleimps2                     \
---disable-mousecalibrate                   \
---enable-incoreres                         \
---disable-cursor                           \
---disable-clipboard                        \
---disable-adv2dapi                         \
---disable-savebitmap                       \
---disable-savescreen                       \
---disable-dblclk                           \
---disable-splash                           \
---disable-latin9support                    \
---disable-fullunicode                      \
---disable-rbfsupport                       \
---disable-vbfsupport                       \
---disable-upfsupport                       \
---disable-qpfsupport                       \
---disable-ttfsupport                       \
---disable-complexscripts                   \
---disable-ttfcache                         \
---disable-jpgsupport                       \
---disable-pngsupport                       \
---disable-flatlf                           \
---disable-textmode                         \
---disable-shmopen                          

build/buildlib-linux-minimal

@@ -1,41 +0,0 @@
-#!/bin/sh
-
-rm config.cache config.status -f
-
-./configure \
---disable-shared                           \
---enable-static                            \
---with-osname=linux                        \
---with-targetname=external                 \
---with-runmode=sa                          \
---enable-mgslicefallback                   \
---disable-videopcxvfb                      \
---disable-videoqvfb                        \
---disable-videodrm                         \
---disable-videofbcon                       \
---enable-videocommlcd                      \
---enable-dummyial                          \
---disable-consoleial                       \
---disable-libinputial                      \
---enable-commial                           \
---disable-consoleimps2                     \
---disable-mousecalibrate                   \
---enable-incoreres                         \
---disable-cursor                           \
---disable-savebitmap                       \
---disable-savescreen                       \
---disable-dblclk                           \
---disable-splash                           \
---disable-latin9support                    \
---disable-fullunicode                      \
---disable-rbfsupport                       \
---disable-vbfsupport                       \
---disable-upfsupport                       \
---disable-qpfsupport                       \
---disable-ttfsupport                       \
---disable-complexscripts                   \
---disable-ttfcache                         \
---disable-jpgsupport                       \
---disable-pngsupport                       \
---disable-flatlf                           \
---disable-textmode

build/buildlib-min

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

build/buildlib-rtems

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

build/config-mgdemo-win.h

@@ -130,9 +130,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
 /* Define to 1 if you have the ANSI C header files. */

build/config-nucleus-mnt.h

@@ -130,9 +130,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
 /* Define to 1 if you have the ANSI C header files. */

build/config-nucleus-monaco.h

@@ -130,9 +130,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
 /* Define to 1 if you have the ANSI C header files. */

build/config-nucleus-null.h

@@ -366,7 +366,7 @@
 /* #undef _MGINCOREFONT_VGAS */
 
 /* Define if include in-core font: 12x12 RBF for GB2312 */
-#define    _MGINCORERBF_GB12 1
+#define	_MGINCORERBF_GB12 1
 /* Define if include in-core font: 16x16 RBF for GB2312 */
 /* #undef _MGINCORERBF_GB16 */
 

build/config-ose-mx21.h

@@ -269,7 +269,7 @@
 /*#define _MGHAVE_MOUSECALIBRATE 1*/
 
 /* Define if include skin support */
-#define _EXT_SKIN 1
+#define _EXT_SKIN 1  
 
 /* Define if include 16BPP FB subdriver */
 /* #undef _MGFONT_FBLIN16 */

build/config-threadx-null.h

@@ -377,7 +377,7 @@
 /* #undef _MGINCOREFONT_VGAS */
 
 /* Define if include in-core font: 12x12 RBF for GB2312 */
-#define    _MGINCORERBF_GB12 1
+#define	_MGINCORERBF_GB12 1
 /* Define if include in-core font: 16x16 RBF for GB2312 */
 #define _MGINCORERBF_GB16 1
 

build/config-threadx-vfanvil.h

@@ -377,7 +377,7 @@
 /* #undef _MGINCOREFONT_VGAS */
 
 /* Define if include in-core font: 12x12 RBF for GB2312 */
-#define    _MGINCORERBF_GB12 1
+#define	_MGINCORERBF_GB12 1
 /* Define if include in-core font: 16x16 RBF for GB2312 */
 #define _MGINCORERBF_GB16 1
 

build/config-vxworks-i386.h

@@ -156,7 +156,7 @@
 /* Define if include the automatic IAL engine */
 //#define _MGIAL_AUTO 1
 /* Define if include the COMM input engine */
-#define _MGIAL_COMM 1
+#define _MGIAL_COMM 1 
 
 /* Define if support BIG5 charset */
 /* #undef _MGCHARSET_BIG5 */
@@ -259,11 +259,11 @@
 
 /* Define if include full gif support */
 #define _MGHAVE_MOUSECALIBRATE 1
-#define _EXT_FULLGIF 1
+#define _EXT_FULLGIF 1 
 #define _MGCTRL_GRIDVIEW 1
 #define _MGCTRL_ICONVIEW 1
 /* Define if include skin support */
-#define _EXT_SKIN 1
+#define _EXT_SKIN 1  
 
 /* Define if include 16BPP FB subdriver */
 /* #undef _MGFONT_FBLIN16 */

build/config-vxworks-ppc.h

@@ -156,7 +156,7 @@
 /* Define if include the automatic IAL engine */
 #define _MGIAL_AUTO 1
 /* Define if include the COMM input engine */
-#define _MGIAL_COMM 1
+#define _MGIAL_COMM 1 
 
 /* Define if support BIG5 charset */
 /* #undef _MGCHARSET_BIG5 */
@@ -259,11 +259,11 @@
 
 /* Define if include full gif support */
 #define _MGHAVE_MOUSECALIBRATE 1
-#define _EXT_FULLGIF 1
+#define _EXT_FULLGIF 1 
 #define _MGCTRL_GRIDVIEW 1
 #define _MGCTRL_ICONVIEW 1
 /* Define if include skin support */
-#define _EXT_SKIN 1
+#define _EXT_SKIN 1  
 
 /* Define if include 16BPP FB subdriver */
 /* #undef _MGFONT_FBLIN16 */
@@ -573,7 +573,7 @@
 /* #define _MGIAL_UCOSII 1 */
 
 /* Define if support UNICODE */
-#define _MGCHARSET_UNICODE 1
+#define _MGCHARSET_UNICODE 1 
 
 /* Define if use own implementation of malloc functions */
 /* #define _MGUSE_OWN_MALLOC 1 */

build/rules-arm.freertos

@@ -1,36 +0,0 @@
-
-
-# set your own targaet_os
-TARGET_OS=freertos
-
-##################################################
-# set your compile tool #
-CC=arm-linux-gnueabihf-gcc
-CXX=arm-linux-gnueabihf-g++
-CPP=arm-linux-gnueabihf-g++
-AR=arm-linux-gnueabihf-ar
-AS=arm-linux-gnueabihf-as
-RANLIB=arm-linux-gnueabihf-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 
-LDFLAGS+=
-##################################################
-

build/rules-pc.linux

@@ -30,7 +30,7 @@ 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
+CFLAGS+=-g -Wall -fPIC `pkg-config --cflags freetype2`
 LDFLAGS+=
 ##################################################
 

build/win32/config-win32.h

@@ -91,12 +91,12 @@
 /* Define to 1 if you have the `tmpfile' function. */
 #define HAVE_TMPFILE 1
 
-/*#define HAVE_MODE_T    1*/
+/*#define HAVE_MODE_T	1*/
 /* Define to 1 if you have the `mktime' function. */
 #define HAVE_MKTIME 1
 
 /* Define to 1 if you have the `time' function. */
-#define HAVE_TIME        1
+#define HAVE_TIME		1
 
 /* Define to 1 if you have the `localtime' function. */
 #define HAVE_LOCALTIME 1
@@ -140,9 +140,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
 /* Define to 1 if you have the ANSI C header files. */

build/win32/msvc_recommended_pragmas.h

@@ -24,5 +24,5 @@
 #pragma warning(disable:4101) /* unreferenced local variable */
 #pragma warning(error:4150)
 
-#pragma warning(disable:4244)    /* No possible loss of data warnings */
+#pragma warning(disable:4244)	/* No possible loss of data warnings */
 #pragma warning(disable:4305)   /* No truncation from int to char warnings */

clean_license.sh

@@ -1,15 +1,15 @@
 #! /bin/bash
 
 keyword_list="
-__mg_license_create
-__mg_license_destroy
-__mg_screensaver_create
-__mg_screensaver_destroy
-__mg_splash_draw_framework
-__mg_splash_progress
-__mg_splash_delay
-__mg_license_on_input
-__mg_license_on_timeout
+license_create
+license_destroy
+screensaver_create
+screensaver_destroy
+splash_draw_framework
+splash_progress
+splash_delay
+license_on_input
+license_on_timeout
 license_get_processor_id
 #\s*include.*license\/c_files.*
 #\s*include.*license\.h

cleanup-code.sh

@@ -1,181 +0,0 @@
-#!/bin/bash
-
-tab2space() {
-    sed -i 's/\t/    /g' `find . -name '*.c'`
-    sed -i 's/\t/    /g' `find . -name '*.h'`
-
-    sed -i 's/\s\+$//g' `find . -name '*.c'`
-    sed -i 's/\s\+$//g' `find . -name '*.h'`
-}
-
-# tab2space
-
-# templates
-# sed -i 's/\<AAA\>/__AAA/g' `grep '\<AAA\>' -rl include/ src/`
-# sed -i 's/\<AAA\>/__mgAAA/g' `grep '\<AAA\>' -rl include/ src/`
-# sed -i 's/\<AAA\>/__gdiAAA/g' `grep '\<AAA\>' -rl include/ src/`
-# sed -i 's/\<AAA\>/__mg_AAA/g' `grep '\<AAA\>' -rl include/ src/`
-# sed -i 's/\<AAA\>/dbg_AAA/g' `grep '\<AAA\>' -rl include/ src/`
-
-# sed -i 's/\<kernel_alloc_z_order_info\>/__kernel_alloc_z_order_info/g' `grep kernel_alloc_z_order_info -rl include/ src/`
-# sed -i 's/\<kernel_free_z_order_info\>/__kernel_free_z_order_info/g' `grep kernel_free_z_order_info -rl include/ src/`
-# sed -i 's/\<kernel_change_z_order_mask_rect\>/__kernel_change_z_order_mask_rect/g' `grep kernel_change_z_order_mask_rect -rl include/ src/`
-# sed -i 's/\<kernel_get_window_region\>/__kernel_get_window_region/g' `grep kernel_get_window_region -rl include/ src/`
-# sed -i 's/\<kernel_get_next_znode\>/__kernel_get_next_znode/g' `grep kernel_get_next_znode -rl include/ src/`
-# sed -i 's/\<kernel_get_prev_znode\>/__kernel_get_prev_znode/g' `grep kernel_get_prev_znode -rl include/ src/`
-
-# sed -i 's/\<gui_open_ime_window\>/__gui_open_ime_window/g' `grep gui_open_ime_window -rl include/ src/`
-
-# sed -i 's/\<_begin_fill_bitmap\>/__mg_begin_fill_bitmap/g' `grep _begin_fill_bitmap -rl include/ src/`
-# sed -i 's/\<_fill_bitmap_scanline\>/__mg_fill_bitmap_scanline/g' `grep _fill_bitmap_scanline -rl include/ src/`
-# sed -i 's/\<_end_fill_bitmap\>/__mg_end_fill_bitmap/g' `grep _end_fill_bitmap -rl include/ src/`
-# sed -i 's/\<DumpCtrlClassInfoTable\>/dbg_DumpCtrlClassInfoTable/g' `grep DumpCtrlClassInfoTable -rl include/ src/`
-# sed -i 's/\<GetPixelUnderCursor\>/kernel_GetPixelUnderCursor/g' `grep GetPixelUnderCursor -rl include/ src/`
-# sed -i 's/\<update_secondary_dc\>/__mg_update_secondary_dc/g' `grep update_secondary_dc -rl include/ src/`
-
-# sed -i 's/\<initialize_scripteasy\>/font_InitializeScripteasy/g' `grep initialize_scripteasy -rl include/ src/`
-# sed -i 's/\<uninitialize_scripteasy\>/font_UninitializeScripteasy/g' `grep uninitialize_scripteasy -rl include/ src/`
-
-# sed -i 's/\<free_window_element_data\>/__mg_free_window_element_data/g' `grep free_window_element_data -rl include/ src/`
-# sed -i 's/\<append_window_element_data\>/__mg_append_window_element_data/g' `grep append_window_element_data -rl include/ src/`
-# sed -i 's/\<set_window_element_data\>/__mg_set_window_element_data/g' `grep set_window_element_data -rl include/ src/`
-# sed -i 's/\<__compsor_check_znodes\>/__mg_composite_dirty_znodes/g' `grep __compsor_check_znodes -rl include/ src/`
-
-# sed -i 's/\<mg_linux_tty_init\>/__mg_linux_tty_init/g' `grep mg_linux_tty_init -rl include/ src/`
-# sed -i 's/\<mg_linux_tty_enable_vt_switch\>/__mg_linux_tty_enable_vt_switch/g' `grep mg_linux_tty_enable_vt_switch -rl include/ src/`
-# sed -i 's/\<mg_linux_tty_disable_vt_switch\>/__mg_linux_tty_disable_vt_switch/g' `grep mg_linux_tty_disable_vt_switch -rl include/ src/`
-# sed -i 's/\<mg_linux_tty_switch_vt\>/__mg_linux_tty_switch_vt/g' `grep mg_linux_tty_switch_vt -rl include/ src/`
-# sed -i 's/\<mg_linux_tty_fini\>/__mg_linux_tty_fini/g' `grep mg_linux_tty_fini -rl include/ src/`
-
-# sed -i 's/\<DumpMenu\>/dbg_DumpMenu/g' `grep DumpMenu -rl include/ src/`
-
-# sed -i 's/\<sysres_init_inner_resource\>/__sysres_init_inner_resource/g' `grep sysres_init_inner_resource -rl include/ src/`
-# sed -i 's/\<sysres_get_system_res_path\>/__sysres_get_system_res_path/g' `grep sysres_get_system_res_path -rl include/ src/`
-
-# sed -i 's/\<_set_pixel_helper\>/_gdi_set_pixel_helper/g' `grep _set_pixel_helper -rl src/`
-
-# sed -i 's/\<err_dump\>/__mg_err_dump/g' `grep err_dump -rl src/`
-# sed -i 's/\<err_msg\>/__mg_err_msg/g' `grep err_msg -rl src/`
-# sed -i 's/\<err_quit\>/__mg_err_quit/g' `grep err_quit -rl src/`
-# sed -i 's/\<err_ret\>/__mg_err_ret/g' `grep err_ret -rl src/`
-# sed -i 's/\<err_sys\>/__mg_err_sys/g' `grep err_sys -rl src/`
-# sed -i 's/\<mg_dispatch_timer_message\>/__mg_dispatch_timer_message/g' `grep mg_dispatch_timer_message -rl src/`
-# sed -i 's/\<mgDeleteObject\>/mg_DeleteObject/g' `grep mgDeleteObject -rl src/`
-
-# sed -i 's/\<init_arabic_kbd_layout\>/__mg_init_arabic_kbd_layout/g' `grep init_arabic_kbd_layout -rl src/`
-# sed -i 's/\<init_default_kbd_layout\>/__mg_init_default_kbd_layout/g' `grep init_default_kbd_layout -rl src/`
-# sed -i 's/\<init_de_kbd_layout\>/__mg_init_de_kbd_layout/g' `grep init_de_kbd_layout -rl src/`
-# sed -i 's/\<init_delatin1_kbd_layout\>/__mg_init_delatin1_kbd_layout/g' `grep init_delatin1_kbd_layout -rl src/`
-# sed -i 's/\<init_escp850_kbd_layout\>/__mg_init_escp850_kbd_layout/g' `grep init_escp850_kbd_layout -rl src/`
-# sed -i 's/\<init_es_kbd_layout\>/__mg_init_es_kbd_layout/g' `grep init_es_kbd_layout -rl src/`
-# sed -i 's/\<init_fr_kbd_layout\>/__mg_init_fr_kbd_layout/g' `grep init_fr_kbd_layout -rl src/`
-# sed -i 's/\<init_frpc_kbd_layout\>/__mg_init_frpc_kbd_layout/g' `grep init_frpc_kbd_layout -rl src/`
-# sed -i 's/\<init_it_kbd_layout\>/__mg_init_it_kbd_layout/g' `grep init_it_kbd_layout -rl src/`
-# sed -i 's/\<init_hebrew_kbd_layout\>/__mg_init_hebrew_kbd_layout/g' `grep init_hebrew_kbd_layout -rl src/`
-
-# sed -i 's/\<InitAutoInput\>/ial_InitAutoInput/g' `grep InitAutoInput -rl src/`
-# sed -i 's/\<InitDummyInput\>/ial_InitDummyInput/g' `grep InitDummyInput -rl src/`
-# sed -i 's/\<InitLibInput\>/ial_InitLibInput/g' `grep InitLibInput -rl src/`
-# sed -i 's/\<InitNetInput\>/ial_InitNetInput/g' `grep InitNetInput -rl src/`
-# sed -i 's/\<InitPCXVFBInput\>/ial_InitPCXVFBInput/g' `grep InitPCXVFBInput -rl src/`
-# sed -i 's/\<InitRandomInput\>/ial_InitRandomInput/g' `grep InitRandomInput -rl src/`
-
-# sed -i 's/\<InitializeResManager\>/mg_InitResManager/g' `grep InitializeResManager -rl src/`
-# sed -i 's/\<InitTextBitmapBuffer\>/gdi_InitTextBitmapBuffer/g' `grep InitTextBitmapBuffer -rl src/`
-
-# sed -i 's/\<clipboard_op\>/__mg_clipboard_op/g' `grep clipboard_op -rl src/`
-
-# sed -i 's/\<mg_miFreeArcCache\>/miFreeArcCache/g' `grep mg_miFreeArcCache -rl src/`
-# sed -i 's/\<mgNewObject\>/mgNewObjectEx/g' `grep mgNewObject -rl src/`
-# sed -i 's/\<mg_newObject\>/mgNewObject/g' `grep mg_newObject -rl src/`
-# sed -i 's/\<mg_remove_timers_by_msg_queue\>/__mg_remove_timers_by_msg_queue/g' `grep mg_remove_timers_by_msg_queue -rl src/`
-
-# sed -i 's/\<mg_DeleteObject\>/mgDeleteObject/g' `grep mg_DeleteObject -rl src/`
-
-# sed -i 's/\<GetMsgQueueThisThread\>/getMsgQueueThisThread/g' `grep GetMsgQueueThisThread -rl src/`
-
-# sed -i 's/\<pMessages\>/pMsgQueue/g' `grep pMessages -rl src/`
-
-# sed -i 's/\<mg_InitMsgQueueThisThread\>/mg_AllocMsgQueueThisThread/g' `grep mg_InitMsgQueueThisThread -rl include/ src/`
-
-# sed -i 's/\<mg_AllocMsgQueueThisThread\>/mg_AllocMsgQueueForThisThread/g' `grep mg_AllocMsgQueueThisThread -rl src/`
-# sed -i 's/\<mg_FreeMsgQueueThisThread\>/mg_FreeMsgQueueForThisThread/g' `grep mg_FreeMsgQueueThisThread -rl src/`
-
-# sed -i 's/\<GetMsgQueueThisThread\>/mg_GetMsgQueueForThisThread/g' `grep GetMsgQueueThisThread -rl src/`
-
-# sed -i 's/\<kernel_GetMsgQueue\>/getMsgQueue/g' `grep kernel_GetMsgQueue -rl src/`
-
-# sed -i 's/\<BE_THIS_THREAD\>/isWindowInThisThread/g' `grep BE_THIS_THREAD -rl src/`
-
-# sed -i 's/\<SetMsgQueueTimerFlag\>/setMsgQueueTimerFlag/g' `grep SetMsgQueueTimerFlag -rl src/`
-# sed -i 's/\<RemoveMsgQueueTimerFlag\>/removeMsgQueueTimerFlag/g' `grep RemoveMsgQueueTimerFlag -rl src/`
-
-# sed -i 's/\<getMsgQueueByWindowInThisThread\>/getMsgQueueIfWindowInThisThread/g' `grep getMsgQueueByWindowInThisThread -rl include/ src/`
-
-# sed -i 's/\<FirstTimerSlot\>/first_time_slot/g' `grep FirstTimerSlot -rl src/`
-# sed -i 's/\<TimerMask\>/expired_timer_mask/g' `grep TimerMask -rl src/`
-
-# sed -i 's/\<first_time_slot\>/first_timer_slot/g' `grep first_time_slot -rl src/`
-# sed -i 's/\<__mg_dispatch_timer_message\>/__mg_check_expired_timers/g' `grep __mg_dispatch_timer_message -rl src/`
-
-# sed -i 's/\<4\.2\.0\>/5.0.0/g' `grep '4\.2\.0' -rl include/ src/`
-
-# sed -i 's/\<__mg_check_hook_func\>/____mg_check_hook_event/g' `grep __mg_check_hook_func -rl src/`
-# sed -i 's/\<____mg_check_hook_event\>/__mg_check_hook_event/g' `grep ____mg_check_hook_event -rl src/`
-
-# sed -i 's/\<__mg_capture_wnd\>/_captured_wnd/g' `grep __mg_capture_wnd -rl include/ src/`
-
-# sed -i 's/\<_captured_wnd\>/__mg_captured_wnd/g' `grep _captured_wnd -rl include/ src/`
-
-# sed -i 's/\<__mg_check_hook_event\>/__mg_check_hook_func/g' `grep __mg_check_hook_event -rl include/ src/`
-
-# sed -i 's/\<DEF_NR_FIXEDZNODES\>/NR_FIXED_ZNODES/g' `grep DEF_NR_FIXEDZNODES -rl src/`
-
-#sed -i 's/\<ZOF_TYPE_TOPMOST\>/__ZOF_TYPE_HIGHER/g' `grep ZOF_TYPE_TOPMOST -rl include/ src/`
-
-# sed -i 's/\<__ZOF_TYPE_HIGHER\>/ZOF_TYPE_HIGHER/g' `grep __ZOF_TYPE_HIGHER -rl include/ src/`
-
-# sed -i 's/\<SetDesktopTimerFlag\>/AlertDesktopTimerEvent/g' `grep SetDesktopTimerFlag -rl include/ src/`
-
-# sed -i 's/\<__mg_update_timer_count\>/__mg_update_tick_count/g' `grep __mg_update_timer_count -rl include/ src/`
-
-# sed -i 's/\<__mg_timer_counter\>/__mg_tick_counter/g' `grep __mg_timer_counter -rl include/ src/`
-
-# sed -i 's/\<pAdd\>/pSyncMsg/g' `grep '\<pAdd\>' -rl include/ src/`
-
-# sed -i 's/\<isWindowInThisThread\>/getMainWinIfWindowInThisThread/g' `grep '\<isWindowInThisThread\>' -rl include/ src/`
-
-# sed -i 's/\<GetMainVirtWindowById\>/GetHostedById/g' `grep '\<GetMainVirtWindowById\>' -rl include/ src/`
-
-# sed -i 's/\<__mg_os_start_time_ms\>/__mg_os_start_time/g' `grep '\<__mg_os_start_time_ms\>' -rl include/ src/`
-
-# sed -i 's/\<Gets\>/Get/g' `grep '\<Gets\>' -rl include/ src/`
-# sed -i 's/\<Sets\>/Set/g' `grep '\<Sets\>' -rl include/ src/`
-# sed -i 's/\<Retrieves\>/Retrieve/g' `grep '\<Retrieves\>' -rl include/ src/`
-
-# sed -i 's/\<Determines\>/Determine/g' `grep '\<Determines\>' -rl include/ src/`
-# sed -i 's/\<Checks\>/Check/g' `grep '\<Checks\>' -rl include/ src/`
-
-#sed -i 's/\<SetWindowExStyle\>/gui_SetWindowExStyle/g' `grep '\<SetWindowExStyle\>' -rl include/ src/`
-#sed -i 's/\<AddNewControlClass\>/gui_AddNewControlClass/g' `grep '\<AddNewControlClass\>' -rl include/ src/`
-#sed -i 's/\<SetCtrlClassAddData\>/gui_SetCtrlClassAddData/g' `grep '\<SetCtrlClassAddData\>' -rl include/ src/`
-#sed -i 's/\<GetCtrlClassAddData\>/gui_GetCtrlClassAddData/g' `grep '\<GetCtrlClassAddData\>' -rl include/ src/`
-
-# sed -i 's/\<get_valid_dc\>/get_effective_dc/g' `grep '\<get_valid_dc\>' -rl include/ src/`
-# sed -i 's/\<release_valid_dc\>/release_effective_dc/g' `grep '\<release_valid_dc\>' -rl include/ src/`
-
-# sed -i 's/\<gui_GetMainWindowPtrOfControl\>/checkAndGetMainWindowPtrOfControl/g' `grep '\<gui_GetMainWindowPtrOfControl\>' -rl include/ src/`
-# sed -i 's/\<gui_CheckAndGetMainWindowPtr\>/checkAndGetMainWindowPtrOfMainWin/g' `grep '\<gui_CheckAndGetMainWindowPtr\>' -rl include/ src/`
-
-# sed -i 's/\<GetSubDCInSecondaryDC\>/GetDCInSecondarySurface/g' `grep '\<GetSubDCInSecondaryDC\>' -rl include/ src/`
-
-# sed -i 's/\<checkAndGetMainWindowPtrOfMainWin\>/checkAndGetMainWinIfMainWin/g' `grep '\<checkAndGetMainWindowPtrOfMainWin\>' -rl include/ src/`
-# sed -i 's/\<checkAndGetMainWindowPtrOfControl\>/checkAndGetMainWinIfWindow/g' `grep '\<checkAndGetMainWindowPtrOfControl\>' -rl include/ src/`
-
-# sed -i 's/\<mg_GetMsgQueueForThisThread\>/getMsgQueueForThisThread/g' `grep '\<mg_GetMsgQueueForThisThread\>' -rl include/ src/`
-
-# sed -i 's/\<IS_SHAREDFB_SCHEMA\>/IS_SHAREDFB_SCHEMA_PROCS/g' `grep '\<IS_SHAREDFB_SCHEMA\>' -rl include/ src/`
-
-sed -i 's/\<REQID_GETWPSURFACE\>/REQID_GETSHAREDSURFACE/g' `grep '\<REQID_GETWPSURFACE\>' -rl include/ src/`
-
-exit 0

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_LOGFONT_NAME_FIELD + 1];
+ 499     char name [LEN_FONT_NAME + 1];
  500 
- 501     for (i = 0; i < LEN_LOGFONT_NAME_FIELD + 1; i++) {
+ 501     for (i = 0; i < LEN_FONT_NAME + 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_LOGFONT_NAME_FIELD + 1];
- 230     char family [LEN_LOGFONT_NAME_FIELD + 1];
- 231     char charset [LEN_LOGFONT_NAME_FIELD + 1];
+ 229     char type [LEN_FONT_NAME + 1];
+ 230     char family [LEN_FONT_NAME + 1];
+ 231     char charset [LEN_FONT_NAME + 1];
  232     DWORD style;
  233     int size;
  234     int rotation;

etc/MiniGUI.cfg

@@ -1,112 +1,38 @@
-# This configuration file is for MiniGUI V4.2.x or later
+# This configuration file is for MiniGUI V3.x.x
 #
-# Copyright (C) 2002~2020 FMSoft
+# Copyright (C) 2002~2018 FMSoft
 # Copyright (C) 1998~2002 Wei Yongming.
 #
 # Web: http://www.minigui.com
 #
 # This configuration file must be installed in /etc,
-# /usr/local/etc, your home directory, or the current working direcotry.
-# When you install it in your home directory, it should be named
-# ".MiniGUI.cfg".
+# /usr/local/etc or your home directory. 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.
 #
-# 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
+# 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
 
-# Linux IAL engine based on libinput
-# ial_engine=libinut
-
-#{{ifdef _MGSCHEMA_COMPOSITING
-# Options for compositing schema
-[compositing_schema]
-# The size of wallpaper pattern surface (the fake screen for clients).
-# Optional values: <w>x<h>, full, half, quarter, octant, and empty.
-# Default value is empty.
-wallpaper_pattern_size=full
-# wallpaper_pattern_size=half
-# wallpaper_pattern_size=quarter
-# wallpaper_pattern_size=octant
-# wallpaper_pattern_size=empty
-# wallpaper_pattern_size=32x32
-
-# The shared object name of the default compositor. If it is not defined
-# or failed to load, MiniGUI will use the built-in fallback compositor.
-# The equivalent environment variable: MG_DEF_COMPOSITOR_SO
-# def_compositor_so=
-#}}
-
-#{{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
-
+[fbcon]
+defaultmode=1024x768-16bpp
 # The resolution of the display
 # It is defined in dots (physical pixels) per inch
 # The default value is 96.
 dpi=96
 
-# Whether double buffering is enabled.
-# Use `true` or `yes` for enabled, anything else for disabled.
-# Note that under compositing schema, double buffering is always enabled.
-# Since 5.0.0.
-double_buffering=true
-
-# 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_SINGLETOUCHKEY
-[singletouchkey]
-# The touch device; use none to disable touch event.
-touch_dev=/dev/input/event0
-# The key device; use none to disable key event.
-key_dev=none
-# The number of keys; only valid if the key device is not `none` and can be opened.
-nr_keys=2
-# The maps from Linux keycode to MiniGUI scancode; only valid if `nr_keys` > 0.
-keycode2scancode0=20,1
-keycode2scancode1=50,2
-#}}
-
-#{{ifdef _MGIAL_LIBINPUT
-[libinput]
-seat=seat0
-#}}
-
-#{{ifdef _MGGAL_FBCON
-[fbcon]
-defaultmode=1024x768-16bpp
-dpi=96
-#}}
-
 #{{ifdef _MGGAL_PCXVFB
 [pc_xvfb]
 defaultmode=800x600-16bpp
@@ -132,19 +58,7 @@ 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
@@ -174,10 +88,6 @@ 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
@@ -214,15 +124,9 @@ cursor20=h_select.cur
 cursor21=ho_split.cur
 cursor22=ve_split.cur
 
-# Under compositing schema, you can specify a PNG file as the cursor.
-# You should use a 'hotspotN' key to specify the hotspot coordinates
-# of a PNG cursor. For example:
-# cursor23=foo.png
-# hotspot23=32,32
-
 [resinfo]
 respath=/usr/local/share/minigui/res/
-
+ 
 [classic]
 # Note that max number defined in source code is 5.
 iconnumber=5

examples/activemenu.c

@@ -5,11 +5,11 @@
  */
         case MSG_ACTIVEMENU:
             if (wParam == 2) {
-                CheckMenuRadioItem ((HMENU)lParam,
-                    IDM_40X15, IDM_CUSTOMIZE,
+                CheckMenuRadioItem ((HMENU)lParam, 
+                    IDM_40X15, IDM_CUSTOMIZE, 
                     pConInfo->termType, MF_BYCOMMAND);
-                CheckMenuRadioItem ((HMENU)lParam,
-                    IDM_DEFAULT, IDM_BIG5,
+                CheckMenuRadioItem ((HMENU)lParam, 
+                    IDM_DEFAULT, IDM_BIG5, 
                     pConInfo->termCharset, MF_BYCOMMAND);
             }
         break;

examples/buttondown.c

@@ -1,6 +1,6 @@
 
 /*
- * This example trys to handle the event when the user presses
+ * This example trys to handle the event when the user presses 
  * left button and right button of the mouse at the same time.
  */
 LRESULT MyWinProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

examples/circlegenerator.c

@@ -16,6 +16,6 @@ void DrawMyCircle (HDC hdc, int x, int y, int r, gal_pixel pixel)
     old_bursh = SetBrushColor (hdc, pixle);
 
     CircleGenerator ((void*)hdc, x, y, r, draw_circle_pixel);
-
+    
     SetBrushColor (hdc, old_brush);
 }

examples/client_startup.c

@@ -1,4 +1,4 @@
-/*
+/* 
  * This program tries to create a new layer named "vcongui" if
  * there is no such layer. If there is already a layer named "vcongui",
  * this program brings the layer to be the topmost one.

examples/createlogfont.c

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

examples/createlogfontex.c

@@ -1,14 +0,0 @@
-    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);