update version to 5.0.11

when creating system logfonts, but the orientation is ignored for the system logfont.

.gitignore

@@ -29,3 +29,4 @@ Makefile.in
 /src/font/utils/ucd/
 /src/sysres/font_list
 /src/sysres/license/dat_files/
+/configure~

README.md

@@ -1,14 +1,14 @@
 # MiniGUI
 
-A mature and proven cross-platform GUI system for embedded and smart IoT devices.
+A modern and proven cross-platform window system for embedded systems or smart IoT devices.
 
 
-## TABLE OF CONTENTS
+_TABLE OF CONTENTS_
 
+- [TABLE OF CONTENTS](#table-of-contents)
 - [INTRODUCTION](#introduction)
    + [What's MiniGUI](#whats-minigui)
-   + [MiniGUI Components](#minigui-components)
-   + [Open Source Apps Based-on MiniGUI](#open-source-apps-based-on-minigui)
+   + [HVML App Framework on MiniGUI](#hvml-app-framework-on-minigui)
    + [MiniGUI and HybridOS](#minigui-and-hybridos)
    + [Source Code Repositories](#source-code-repositories)
 - [NEW FEATURES IN VERSION 5.0.x](#new-features-in-version-50x)
@@ -23,6 +23,9 @@ A mature and proven cross-platform GUI system for embedded and smart IoT devices
    + [Building Whole MiniGUI](#building-whole-minigui)
    + [Building MiniGUI Core](#building-minigui-core)
    + [Unit Tests](#unit-tests)
+- [Othere Resources](#othere-resources)
+   + [MiniGUI Components](#minigui-components)
+   + [Open Source Apps Based-on MiniGUI](#open-source-apps-based-on-minigui)
 - [HISTORY](#history)
 - [AUTHORS AND COPYING](#authors-and-copying)
    + [Special Statement](#special-statement)
@@ -34,86 +37,45 @@ A mature and proven cross-platform GUI system for embedded and smart IoT devices
 
 ### What's MiniGUI
 
-MiniGUI is a mature cross-platform windowing system and a GUI (Graphics
-User Interface) support system for embedded systems and smart IoT devices.
-This is the version 5.0.x of MiniGUI maintained by WEI Yongming.
+MiniGUI aims to provide a fast, stable, full-featured, and cross-platform windowing and GUI support system,
+        which is especially fit for embedded systems or smart IoT devices based-on Linux/uClinux, eCos,
+        and other traditional RTOSes, such as RT-Thread, FreeRTOS, RTEMS, VxWorks, ThreadX, Nucleus, pSOS, uC/OS-II, OSE, and others.
 
-MiniGUI is released under GPLv3 and the dual-licensing applies to commercial
-use.
+This is the source tree of MiniGUI Core, which provides the windowing and graphics interfaces as well as a lot of standard controls (toolkit).
 
-MiniGUI aims to provide a fast, stable, full-featured, and cross-platform
-windowing and GUI support system, which is especially fit for
-embedded systems or smart IoT devices based-on Linux/uClinux, eCos, and other
-traditional RTOSes, such as RT-Thread, FreeRTOS, RTEMS, VxWorks, ThreadX,
-Nucleus, pSOS, uC/OS-II, and OSE.
+MiniGUI is released under GPLv3 and the dual-licensing applies to commercial use.
+In December 1998, the initiator of FMSoft, [Vincent Wei], began to develop MiniGUI under the GNU General Public License (GPL).
+In September 2002, the core developers of MiniGUI founded [FMSoft] and started the commercial marketing with the free software.
+By now, FMSoft still continues to release MiniGUI as a free software project.
 
-This is the source tree of MiniGUI Core, which provides the windowing
-and graphics interfaces as well as a lot of standard controls (toolkit).
-
-### MiniGUI Components
-
-Besides MiniGUI Core, FMSoft also provides some components
-for the developers to develop app much easier:
-
-* mGUtils: A MiniGUI component which contains miscellaneous utilities
-  like `ColorSelectionDialogBox`, `FileOpenDialogBox`, and so on.
-* mGPlus: A MiniGUI component which provides support for advanced graphics
-  functions like path, gradient, anti-aliased stretch, and color combination.
-* mGEff: mGEff provides an animation framework for MiniGUI app.
-  It also provides some popular UI/UE special effects.
-* mGNCS: This component provides a new control set for MiniGUI app.
-* mGNCS4Touch: This component provides some new controls, which are
-  compliant to the new control API spec of mGNCS, for devices with
-  touch screens.
-
-There are also some legacy MiniGUI components. But we will not maintain these
-components since MiniGUI v3.2.0:
-
-* mGi: An input method component for MiniGUI. This component provides
-  some typical input methods (such as soft keyboard, hand-writing, and predict
-  text input for mobile phone) for MiniGUI apps.
-* mGp: A printing component for MiniGUI. By using mGp, you can print
-  out the graphics created by MiniGUI app to general-purpose printers.
-* mG3d: A simple three-dimension component for MiniGUI. This component
-  provides a simple 3D API for app. You can use mG3d to create simple
-  3D UI.
-
-MiniGUI is a free software project. In December 1998, the initiator of
-FMSoft, Wei Yongming, began to develop MiniGUI under the GNU General Public
-License (GPL). In September 2002, the core developers of
-MiniGUI founded FMSoft and started the commercial marketing with
-the free software. By now, FMSoft still continues to release MiniGUI
-as a free software project.
-
-You can download the source code tarball of MiniGUI and the dependent libraries
-from the download zone of the site:
+For the live demos, source tarballs, and cases of MiniGUI, you can refer to the following website:
 
 <http://www.minigui.com>
 
-### Open Source Apps Based-on MiniGUI
+### HVML App Framework on MiniGUI
 
-FMSoft also releases some open source apps for MiniGUI on the site above,
-for examples:
+MiniGUI and its components provide a lot of controls/widgets to help your develop GUI apps in C/C++ programming language.
+However, alternatively, you can use the following software to develop your apps in an easy-to-use programming language [HVML].
 
-* `mDolphin`, licensed under Apache 2.0, is a full-featured
-  WEB/WAP browser, which is developed based on the open source browser
-  core WebKit and uses MiniGUI as its underlying graphics support system.
-* `mGallery`, licensed under Apache 2.0, intends to
-  provide a total solution for PMP (Portable Multimedia Player),
-  which uses MiniGUI as the graphics platform.
-* `mSpider`, licensed under GPL 3.0, intends to provide a
-  light-weight MiniGUI-based web browser (HTML 3.2 and part JavaScript)
-* `mEagle`, licensed under GPL 3.0, is an embedded GIS development platform
-  which addresses the needs of map browse, query, analysis, etc
+* [HVML] is a descriptive programming language proposed and designed by [Vincent Wei].
+* [PurC] is the prime interpreter of HVML written in C lauguage.
+* [xGUI Pro] is a full-featured HVML renderer based on the tailored WebKit engine.
+
+In short, the above software suite provides an Electron-like solution that can help people develop cross-platform applications using web front-end technology.
+The difference is that the solution replaces JavaScript with HVML and Node.JS with PurC.
+It provides an entirely new application framework that isolates the interpreter and renderer from running in separate processes, which brings several benefits.
+It greatly reduces the size and resource consumption of the entire solution, improves the overall performance, promotes the interactive responsiveness,
+   and provides a simpler mechanism to integrate existing C/C++ code modules.
 
 ### MiniGUI and HybridOS
 
-HybridOS is another large open source project initiated by FMSoft. It is
-a totally new open source operating system designed for smart IoT devices
-and cloud computing environment.
+[HybridOS] is another large open source project initiated by FMSoft.
+It is an open source operating system designed for embedded/AIoT devices and cloud computing environment.
 
-In practice, MiniGUI and the software which are used to integrated with GPU
-constitute the graphics stack of HybridOS.
+HybridOS provides the complete software stack and the app framework based on HVML for embedded systems.
+You can easily develop your products which has rich functions and excellent expressiveness by using HybridOS.
+
+In practice, MiniGUI and the software which are used to integrated with GPU constitute the graphics stack of HybridOS.
 
 HybridOS uses MiniGUI as the underlying windowing system, and the members of
 HybridOS project are now maintaining the whole graphics stack.
@@ -121,7 +83,7 @@ The following chart shows the graphics stack of HybridOS:
 
 ```
   -----------------------------------------------
- |           MiniGUI/HybridOS Apps               |
+ |               MiniGUI/HVML Apps               |
  |-----------------------------------------------|
  |           |         (Graphics Stack)          |
  |           |              ---------------------|
@@ -137,8 +99,7 @@ The following chart shows the graphics stack of HybridOS:
   -----------------------------------------------
 ```
 
-As shown in the chart above, the HybridOS graphics stack consists of
-the following software:
+As shown in the chart above, the HybridOS graphics stack consists of the following software:
 
 - `libDRM` provides some user land APIs for Linux Direct Rendering Infrastructure.
 - `hiDRMDrivers` contains the drivers (user land drivers, not kernel drivers) for
@@ -167,17 +128,18 @@ them on:
 
 <https://github.com/VincentWei>
 
-and
-
-<https://github.com/FMSoftCN>
-
 We now maintain all documents about MiniGUI on the following public repo:
 
 <https://github.com/VincentWei/minigui-docs>
 
+You can download the source code tarballs of MiniGUI Core, MiniGUI
+components, and the dependent libraries from the download zone of the site:
+
+<http://www.minigui.com/download>
+
 ## NEW FEATURES IN VERSION 5.0.x
 
-In version 5.0.0, we introduced some new and exciting features, and refactored
+In version 5.0.0, we introduced some exciting new features, and refactored
 a lot basic modules of MiniGUI Core.
 
 ### Compositing Schema
@@ -392,15 +354,16 @@ and MiniGUI components, please fetch one of the following repositories
 from GitHub and follow the instructions to build MiniGUI Core,
 MiniGUI components, the samples, and the demonstration programs:
 
-<https://github.com/VincentWei/build-minigui-5.0>
+[Build MiniGUI 5.0](https://github.com/VincentWei/build-minigui-5.0)
 
 or
 
-<https://github.com/VincentWei/build-minigui-4.0>
+[Build MiniGUI 4.0](https://github.com/VincentWei/build-minigui-4.0)
 
 or
 
-<https://github.com/VincentWei/build-minigui-3.2>
+[Build MiniGUI 3.2](https://github.com/VincentWei/build-minigui-3.2)
+
 
 ### Building MiniGUI Core
 
@@ -445,6 +408,52 @@ following repository:
 If you are interested in hacking the MiniGUI code, please visit this repository.
 
 
+## Othere Resources
+
+### MiniGUI Components
+
+Besides MiniGUI Core, FMSoft also provides some components
+for the developers to develop app much easier:
+
+* mGUtils: A MiniGUI component which contains miscellaneous utilities
+  like `ColorSelectionDialogBox`, `FileOpenDialogBox`, and so on.
+* mGPlus: A MiniGUI component which provides support for advanced graphics
+  functions like path, gradient, anti-aliased stretch, and color combination.
+* mGEff: mGEff provides an animation framework for MiniGUI app.
+  It also provides some popular UI/UE special effects.
+* mGNCS: This component provides a new control set for MiniGUI app.
+* mGNCS4Touch: This component provides some new controls, which are
+  compliant to the new control API spec of mGNCS, for devices with
+  touch screens.
+
+There are also some legacy MiniGUI components. But we will not maintain these
+components since MiniGUI v3.2.0:
+
+* mGi: An input method component for MiniGUI. This component provides
+  some typical input methods (such as soft keyboard, hand-writing, and predict
+  text input for mobile phone) for MiniGUI apps.
+* mGp: A printing component for MiniGUI. By using mGp, you can print
+  out the graphics created by MiniGUI app to general-purpose printers.
+* mG3d: A simple three-dimension component for MiniGUI. This component
+  provides a simple 3D API for app. You can use mG3d to create simple
+  3D UI.
+
+### Open Source Apps Based-on MiniGUI
+
+FMSoft also releases some open source apps for MiniGUI on the site above,
+for examples:
+
+* `mDolphin`, licensed under Apache 2.0, is a full-featured
+  WEB/WAP browser, which is developed based on the open source browser
+  core WebKit and uses MiniGUI as its underlying graphics support system.
+* `mGallery`, licensed under Apache 2.0, intends to
+  provide a total solution for PMP (Portable Multimedia Player),
+  which uses MiniGUI as the graphics platform.
+* `mSpider`, licensed under GPL 3.0, intends to provide a
+  light-weight MiniGUI-based web browser (HTML 3.2 and part JavaScript)
+* `mEagle`, licensed under GPL 3.0, is an embedded GIS development platform
+  which addresses the needs of map browse, query, analysis, etc
+
 ## HISTORY
 
 21 years have pasted since MiniGUI was initially created at
@@ -549,15 +558,17 @@ A brief history description of the development progress is listed as follow:
 1. Apr., 2019:     FMSoft released MiniGUI version 3.2.2.
 1. Jul., 2019:     FMSoft released MiniGUI version 4.0.0.
 1. Mar., 2020:     FMSoft released MiniGUI version 5.0.0.
+1. May., 2021:     FMSoft released MiniGUI version 5.0.6.
+1. Jan., 2022:     FMSoft released MiniGUI version 5.0.9.
+1. Sep., 2022:     FMSoft released MiniGUI version 5.0.10.
 
 ## AUTHORS AND COPYING
 
-The original author of MiniGUI is WEI Yongming, and now MiniGUI is
-maintained by FMSoft. For more information, please refer to
-<http://www.fmsoft.cn>.
+The original author of MiniGUI is Vincent Wei, and now MiniGUI is maintained by FMSoft.
+For more information, please refer to <http://www.fmsoft.cn>.
 
-Copyright (C) 2002 ~ 2020, Beijing FMSoft Technologies Co., Ltd.  
-Copyright (C) 1998 ~ 2002, WEI Yongming
+Copyright (C) 2002 ~ 2022, Beijing FMSoft Technologies Co., Ltd.  
+Copyright (C) 1998 ~ 2002, Vincent Wei
 
 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
@@ -629,3 +640,20 @@ Q: Can I get the tech support from MiniGUI team?
 A: Yes, FMSoft can provide you with guaranteed commercial technical
    support services. Please send messages to <sales@minigui.com>.
 
+
+[Beijing FMSoft Technologies Co., Ltd.]: https://www.fmsoft.cn
+[FMSoft Technologies]: https://www.fmsoft.cn
+[FMSoft]: https://www.fmsoft.cn
+[HybridOS Official Site]: https://hybridos.fmsoft.cn
+[MiniGUI Official Site]: https://hvml.fmsoft.cn
+[HVML Official Site]: https://hvml.fmsoft.cn
+[Vincent Wei]: https://github.com/VincentWei
+
+[MiniGUI]: https://github.com/VincentWei/MiniGUI
+[HybridOS]: https://github.com/FMSoftCN/HybridOS
+
+[HVML]: https://github.com/HVML
+[PurC]: https://github.com/HVML/PurC
+[xGUI Pro]: https://github.com/HVML/xGUI-Pro
+[WebKit]: https://webkit.org
+

RELEASE-NOTES.md

@@ -1,5 +1,19 @@
 # Release Notes
 
+- [Version 5.0.11](#version-5011)
+   + [What's new in version 5.0.11](#whats-new-in-version-5011)
+- [Version 5.0.10](#version-5010)
+   + [What's new in version 5.0.10](#whats-new-in-version-5010)
+- [Version 5.0.9](#version-508)
+   + [What's new in version 5.0.9](#whats-new-in-version-508)
+- [Version 5.0.8](#version-508)
+   + [What's new in version 5.0.8](#whats-new-in-version-508)
+- [Version 5.0.6](#version-506)
+   + [What's new in version 5.0.6](#whats-new-in-version-506)
+- [Version 5.0.5](#version-505)
+   + [What's new in version 5.0.5](#whats-new-in-version-505)
+- [Version 5.0.4](#version-504)
+   + [What's new in version 5.0.4](#whats-new-in-version-504)
 - [Version 5.0.3](#version-503)
    + [What's new in version 5.0.3](#whats-new-in-version-503)
 - [Version 5.0.2](#version-502)
@@ -14,6 +28,158 @@
    + [Changes leading to incompatibility](#changes-leading-to-incompatibility)
    + [Deprecated APIs](#deprecated-apis)
 
+## Version 5.0.11
+
+On Dec. 31, 2022, FMSoft announces the availability of MiniGUI 5.0.11,
+which is a bug fixing release with bug fixes and some minor enhancements
+of MiniGUI 5.0.x.
+
+### What's new in version 5.0.11
+
+In this version, we made some enhancements
+
+* ENHANCEMENTS:
+* BUGFIXING:
+   - Fix a bug reported in https://github.com/VincentWei/minigui/issues/94
+   - Fix a bug reported in https://github.com/VincentWei/minigui/issues/96
+   - Fix a bug reported in https://github.com/VincentWei/minigui/issues/105
+   - Fix a bug reported in https://github.com/VincentWei/minigui/issues/106
+* OPTIMIZATIONS:
+   - Optimize the refresh of scrolled.
+* TUNING:
+   - Call `mg_FreeMsgQueueForThisThread` immediately in `TerminateGUI()`.
+   - Use `CreateLogFontEx` instead of `CreateLogFont` to follow the new style convention of font name when creating the system logfonts,
+     but the orientation is ignored for the system logfont.
+
+## Version 5.0.10
+
+On Sep. 30, 2022, FMSoft announces the availability of MiniGUI 5.0.10,
+which is a bug fixing release with bug fixes and some minor enhancements
+of MiniGUI 5.0.x.
+
+### What's new in version 5.0.10
+
+In this version, we made some enhancements
+
+* ENHANCEMENTS:
+   - Enhance `fbcon` engine to support double buffering for Threads and Standalone mode. (Runtime option: `fbcon.double_buffering`).
+   - Cleanup and enhance `shadow` engine to use `SyncUpdate` method.
+   - Relaying `MSG_IDLE` messages to the active descendant controls in every 0.5s.
+* BUGFIXING:
+   - Fix a bug reported in https://github.com/VincentWei/minigui/issues/83
+   - Fix a bug reported in https://github.com/VincentWei/minigui/issues/87
+   - Fix bugs reported in https://github.com/VincentWei/minigui/issues/89
+   - Fix some bugs when virtual window enabled under Standalone and Processes runtime modes.
+* OPTIMIZATIONS:
+* TUNING:
+   - Fix some warnings reported by GCC 12.
+   - Use inline functions for SetCursor and SetDefaultCursor instead of macros.
+
+## Version 5.0.9
+
+On Jan. 14, 2022, FMSoft announces the availability of MiniGUI 5.0.9,
+which is a bug fixing release with minor enhancements of MiniGUI 5.0.x.
+
+### What's new in version 5.0.9
+
+In this version, we fixed some bugs:
+
+* BUGFIXING:
+   - Fix a crash bug in `InitSubDC()` of `src/newgdi/gdi.c`.
+* ENHANCEMENTS:
+* OPTIMIZATIONS:
+* TUNING:
+   - Change copyright year to 2022.
+
+## Version 5.0.8
+
+The MiniGUI development team announces the availability of MiniGUI 5.0.8,
+which is a bug fixing release with minor enhancements of MiniGUI 5.0.x.
+
+### What's new in version 5.0.8
+
+In this version, we fixed some bugs and made some optimizations and enhancements:
+
+* BUGFIXING:
+* ENHANCEMENTS:
+   - Support for WebP image format based on `libwebp`.
+   - Support for two ARM64-based hardware platforms: PX30 and R818.
+   - New surface pixel format for main window: `ST_PIXEL_XRGB565` under compositing schema.
+* OPTIMIZATIONS:
+   - Shrink heap size for fixed string.
+   - Optimize the memory use of blitting context.
+* TUNING:
+   - Tune code of fbcon video engine for compositing schema.
+   - Fix warnings and errors for conditional compilation.
+
+## Version 5.0.6
+
+The MiniGUI development team announces the availability of MiniGUI 5.0.6,
+which is the bug fixing release of MiniGUI 5.0.x.
+
+### What's new in version 5.0.6
+
+In this version, we fixed some bugs and made some optimizations and enhancements:
+
+* BUGFIXING:
+   - Fix bugs of switching layers under MiniGUI-Processes.
+   - Fix bugs of `FBCon` and `PC_XVFB` engines: the dirty rectangles are
+     not set empty after calling `SyncUpdate`.
+   - Fix memory leaks when using block heap.
+   - Fix a bug in ServerGetWinZNodeRegion.
+* ENHANCEMENTS:
+   - Enhance `GetGlyphInfo` to return the FreeType face, font file path, and glyph
+     index.
+   - NEW API `StretchBltEx` to support different scaling filters and rotation.
+   - Use Pixman to support color blending methods for `BitBlt` and `StretchBlt`.
+   - Enhance fallback compositor to support animation when switching among layers.
+   - New API `SetMainWindowGestureFlags` and `MSG_GESTURETEST` message for
+     gesture test and setting the gesture flags of a specific main window.
+   - Tune implementation of Tooltip window.
+* OPTIMIZATIONS:
+   - Optimize the fallback compositor for lucent windows.
+   - Use Pixman to optimize `FillBox`, `BitBlt`, and `StretchBlt`.
+   - Optimize the management of BLOCKHEAP.
+   - Optimize the `__mg_lookfor_unused_slot`.
+
+Note that the binary backward-compatibility was broken, two operations added to
+`CompositorOps`. You should rebuild all MiniGUI applications.
+
+Also note that the compositing schema is now enabled by default.
+
+## Version 5.0.5
+
+The MiniGUI development team announces the availability of MiniGUI 5.0.5,
+which is the bug fixing release of MiniGUI 5.0.x.
+
+### What's new in version 5.0.5
+
+In this version, we fixed some bugs and made some minor enhancements:
+
+* BUGFIXING:
+   - Adjust the constants for `WS_XXXX` macros to avoid duplicated values.
+
+Note that the binary backward-compatibility was broken. You should
+rebuild all MiniGUI applications.
+
+## Version 5.0.4
+
+The MiniGUI development team announces the availability of MiniGUI 5.0.4,
+which is the bug fixing release of MiniGUI 5.0.x.
+
+### What's new in version 5.0.4
+
+In this version, we fixed some bugs and made some minor enhancements:
+
+* BUGFIXING:
+   - Fix bugs in ServerGetWinZNodeRegion: must check for possible empty mask rect
+     and bad assignment of maskrect
+   - Fix a potential bug: only increase `nr_mask_rects` for not empty mask rectangle.
+   - Fix a bug: update surface of controls surface in `travel_children_with_priv_cdc`.
+* ENHANCEMENTS:
+  - New IAL engine: `--enable-singletouchkeyial` to build the IAL engine for
+    single touch screen and key buttons.
+
 ## Version 5.0.3
 
 The MiniGUI development team announces the availability of MiniGUI 5.0.3,

Version.md

@@ -1,11 +1,11 @@
-Version 5.0.0 (2019/03/30)
+Version 5.0.11 (2022/12/31)
 
-This is the first official release of MiniGUI 5.0.x, the stable version.
+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.0.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`

etc/MiniGUI.cfg

@@ -83,6 +83,19 @@ double_buffering=true
 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
@@ -92,6 +105,12 @@ seat=seat0
 [fbcon]
 defaultmode=1024x768-16bpp
 dpi=96
+
+# Whether double buffering is enabled (only for threads and standalone runmodes).
+# Use `true` or `yes` for enabled, anything else for disabled.
+# Note that under compositing schema, double buffering is always enabled.
+# Since 5.0.10.
+double_buffering=true
 #}}
 
 #{{ifdef _MGGAL_PCXVFB
@@ -108,7 +127,7 @@ defaultmode=800x600-16bpp
 [shadow]
 real_engine=pc_xvfb
 defaultmode=800x600-16bpp
-rotate_screen=normal
+rotate_screen=ccw
 #}}
 
 #{{ifdef _MGGAL_MLSHADOW

include/common.h

@@ -311,6 +311,7 @@ MGUI_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
         defined(__amd64) || \
         (defined(__alpha__) || defined(__alpha)) || \
         defined(__arm__) || defined(__aarch64__) || \
+        defined(__loongarch__) || \
         defined(__riscv) || \
         (defined(__CC_ARM) && !defined(__BIG_ENDIAN)) || \
         (defined(__mips__) && defined(__MIPSEL__)) || \

include/ctrl/ctrlhelper.h

@@ -237,7 +237,6 @@ MG_EXPORT void GUIAPI NotifyParentEx (HWND hwnd, LINT id, int code,
                 NotifyParentEx(hwnd, id, code, 0)
 
 /**
- * \var typedef int (*STRCMP) (const char* s1, const char* s2, size_t n)
  * \brief Type of general strncmp function.
  *
  * The function compares the two strings \a s1 and \a s2. It returns

include/ctrl/edit.h

@@ -698,7 +698,6 @@ extern "C" {
 #define EM_SETREADONLY          0xF0CF
 
 /**
- * \var typedef int (*ED_DRAWSEL_FUNC) (HWND hWnd, HDC hdc, int startx, int starty, const char* content, int len, int selout)
  * \brief Type of the edit control callback function on drawing selected strings.
  *
  * \param hWnd Handle of the edit control.

include/customial.h

@@ -131,7 +131,31 @@
 #define IAL_EVENT_GESTURE_PINCH_UPDATE   0x0084
 #define IAL_EVENT_GESTURE_PINCH_END      0x0085
 
+#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)
+
 #ifndef TABLET_TOOL_X
+    #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
+
     #define TABLET_TOOL_PROXIMITY_STATE_INVALID 0
     #define TABLET_TOOL_PROXIMITY_STATE_OUT     1
     #define TABLET_TOOL_PROXIMITY_STATE_IN      2
@@ -149,31 +173,6 @@
 
     #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

include/minigui.h

@@ -82,10 +82,16 @@ extern "C" {
 #define ZOF_MAXIMIZED           0x00000004  // Since 5.0.0
 #define ZOF_MINIMIZED           0x00000008  // Since 5.0.0
 
+/* Since 5.0.6 */
+#define ZOF_GESTURE_FLAGS_MASK  0X000000F0
+#define ZOF_GF_SWIPE_HORZ       0x00000010
+#define ZOF_GF_SWIPE_VERT       0x00000020
+
 /* Since 5.0.0 */
 #define ZOF_INTERNAL_FLAGS_MASK 0X000F0000
 #define ZOF_IF_REFERENCE        0x00010000
 #define ZOF_IF_ALWAYSTOP        0x00020000
+#define ZOF_IF_SPECIAL          0x00040000  // Since 5.0.6
 
 #define ZOF_TW_FLAG_MASK        0x00F00000
 #define ZOF_TW_TROUNDCNS        0x00100000
@@ -351,9 +357,17 @@ extern MG_EXPORT MG_Client* mgClients;
  */
 extern MG_EXPORT MG_Layer* mgTopmostLayer;
 
+/**
+ * \var MG_Layer* mgDefaultLayer
+ * \brief The pointer to the default layer.
+ *
+ * \sa MG_Layer
+ */
+extern MG_EXPORT MG_Layer* mgDefaultLayer;
+
 /**
  * \var MG_Layer* mgLayers
- * \brief The pointer to the array of layers.
+ * \brief The pointer to the layer list.
  *
  * \sa MG_Layer
  */
@@ -562,6 +576,8 @@ MG_EXPORT BOOL GUIAPI DeleteLayer (BOOL handle_name,
  *
  * \return TRUE on success, otherwise FALSE.
  *
+ * \note Only one client which has no any window can be moved.
+ *
  * \note The client which created a fixed main window
  * (a main window acts as the screen lock, the docker, or the launcher) will
  * be moved to the topmost layer automatically.
@@ -1491,7 +1507,9 @@ MG_EXPORT BOOL GUIAPI ServerDoZNodeOperation (MG_Layer* layer, int idx_znode,
  *
  * \return TRUE on success, otherwise FALSE.
  *
- * \note Server-only function. The client which created a fixed main window
+ * \note Server-only function. Only one client which has no any window can be moved.
+ *
+ * \note The client which created a fixed main window
  * (a main window acts as the screen lock, the docker, or the launcher) will
  * be moved to the topmost layer automatically.
  *
@@ -1600,7 +1618,7 @@ typedef struct _CompositorOps {
      * a main window with the extended style WS_EX_AUTOPOSITION.
      */
     void (*calc_mainwin_pos) (CompositorCtxt* ctxt, MG_Layer* layer,
-            DWORD zt_type, int first_for_type, CALCPOSINFO* info);
+            DWORD zt_type, int first_for_type, int cli, CALCPOSINFO* info);
 
     /**
      * This operation will be called when there was a layer operation.
@@ -1729,6 +1747,20 @@ typedef struct _CompositorOps {
     void (*on_moved_win) (CompositorCtxt* ctxt, MG_Layer* layer,
             int zidx, const RECT* rc_org);
 
+    /**
+     * This operation will composite multiple layers on the screen at the same
+     * time by using the combining paramemters.
+     */
+    unsigned int (*composite_layers) (CompositorCtxt* ctxt, MG_Layer* layers[],
+            int nr_layers, void* combine_param);
+
+    /**
+     * This operation will be called when transiting to a new topmost layer.
+     * The compositor can play an animation to transit from the current
+     * topmost layer to the new topmost layer.
+     */
+    void (*transit_to_layer) (CompositorCtxt* ctxt, MG_Layer* to_layer);
+
     /**
      * This operation will be called when the system is maximizing a window.
      * The compositor can play an animation in this operation.
@@ -1743,12 +1775,35 @@ typedef struct _CompositorOps {
 
 } CompositorOps;
 
+#define FCM_HORIZONTAL      0x0000
+#define FCM_VERTICAL        0x0001
+#define FCM_METHOD_MASK     0x00FF
+#define FCM_SCALE           0x0100
+
+/** The combining parameters for the callback compositor. */
+typedef struct _CombParamsFallback {
+    /**
+     * The combining method, can be one of the following values:
+     *  - FCM_HORIZONTAL
+     *  - FCM_VERTICAL
+     * and/or OR'd with the following value:
+     *  - FCM_SCALE
+     */
+    unsigned int method;
+
+    /** The percentage of the screen occupied by the first layer. */
+    float percent;
+
+    /** The scale factor of non-global z-nodes. */
+    float scale;
+} COMBPARAMS_FALLBACK;
+
 /**
  * \brief Get the operations of a specific compositor.
  *
  * This function gets the operations of a specific compositor.
  *
- * \param name The name of the compositor. MiniGUI reserved `default`
+ * \param name The name of the compositor. MiniGUI reserved `fallback`
  *      as the default compositor which is implemented in MiniGUI Core.
  *      You can use some operations of the default compositor as the
  *      corresponding operations for your own compositor.
@@ -1808,7 +1863,7 @@ MG_EXPORT BOOL GUIAPI ServerUnregisterCompositor (const char* name);
  * \brief Select a compositor as the current compositor.
  *
  * This function selects a compositor as the current compositor
- * and returns the compositor object.
+ * and returns the compositor operations.
  * It also destroies the old compositor object if there is old one.
  *
  * \param name The name of the compositor. If the argument is NULL,
@@ -1826,7 +1881,25 @@ MG_EXPORT BOOL GUIAPI ServerUnregisterCompositor (const char* name);
 MG_EXPORT const CompositorOps* GUIAPI ServerSelectCompositor (
             const char* name, CompositorCtxt** ctxt);
 
-#define COMPSOR_OPS_VERSION  1
+/**
+ * \brief Get the name and the context of the current compositor.
+ *
+ * This function gets the name and the context of the current
+ * compositor.
+ *
+ * \param ops The buffer used to return the compositor operations.
+ * \param ctxt The buffer used to return the compositor context.
+ *
+ * \return The name of the current compositor; NULL for error.
+ *
+ * \note Only called by the server.
+ *
+ * Since 5.0.6.
+ */
+MG_EXPORT const char* GUIAPI ServerGetCurrentCompositor (
+        const CompositorOps** ops, CompositorCtxt** ctxt);
+
+#define COMPSOR_OPS_VERSION  2
 
 /**
   * Implement this stub to return the compositor operations
@@ -4024,7 +4097,7 @@ static inline int GUIAPI ShowCursor (BOOL fShow) {
 #endif /* !_MGHAVE_CURSOR */
 
 /**
- * \def SetCursor(hcsr)
+ * \fn HCURSOR SetCursor(HCURSOR hcsr)
  * \brief Changes the current cursor.
  *
  * This function changes the current cursor to be \a hcsr.
@@ -4037,10 +4110,12 @@ static inline int GUIAPI ShowCursor (BOOL fShow) {
  *
  * \sa SetCursorEx, SetDefaultCursor
  */
-#define SetCursor(hcsr) SetCursorEx (hcsr, FALSE)
+static inline HCURSOR SetCursor(HCURSOR hcsr) {
+    return SetCursorEx (hcsr, FALSE);
+}
 
 /**
- * \def SetDefaultCursor(hcsr)
+ * \fn HCURSOR SetDefaultCursor(HCURSOR hcsr)
  * \brief Changes the current cursor, and set it as the default cursor.
  *
  * This function changes the current cursor to be \a hcsr, and set it as
@@ -4054,7 +4129,9 @@ static inline int GUIAPI ShowCursor (BOOL fShow) {
  *
  * \sa SetCursorEx, SetCursor
  */
-#define SetDefaultCursor(hcsr) SetCursorEx (hcsr, TRUE)
+static inline HCURSOR SetDefaultCursor(HCURSOR hcsr) {
+    return SetCursorEx (hcsr, TRUE);
+}
 
     /** @} end of cursor_fns */
 

include/window.h

@@ -1448,6 +1448,17 @@ extern DWORD __mg_interval_time;
  */
 #define MSG_HELP            0x006A
 
+/**
+ * \def MSG_GESTURETEST
+ * \brief This message will be sent to a main window for gesture test.
+ *
+ * The client should call \a SetMainWindowGestureFlags to set the gesture flags
+ * for a main window after got this message.
+ *
+ * Since 5.0.6.
+ */
+#define MSG_GESTURETEST     0x006B
+
 #define MSG_LASTCREATEMSG   0x006F
 
     /** @} end of creation_msgs */
@@ -2463,6 +2474,9 @@ typedef struct _COMPOSITINGINFO {
 /* Since 5.0.0 */
 #define MSG_SETAUTOREPEAT   0x0107
 
+/* Since 5.0.6 */
+#define MSG_SETGESTUREFLAGS 0x0108
+
 #define MSG_SHOWGLOBALCTRL  0x010A
 #define MSG_HIDEGLOBALCTRL  0x010B
 
@@ -2891,6 +2905,9 @@ typedef struct _WINMASKINFO {
  *
  * This message is sent to the all main windows when the system
  * enters idle loop.
+ *
+ * Since 5.0.10, this messasge will be relayed to the active child control
+ * if the main window is currently active.
  */
 #define MSG_IDLE            0x0142
 
@@ -2983,6 +3000,9 @@ typedef struct _WINMASKINFO {
 /* Since 5.0.0: for calculating the default position */
 #define MSG_CALC_POSITION       0x014B
 
+/* Since 5.0.6: for waking up the client */
+#define MSG_WAKEUP_CLIENT       0x014C
+
 /**
  * \def MSG_DOESNEEDIME
  * \brief Send to a window to query whether the window needs to open
@@ -4280,39 +4300,62 @@ MG_EXPORT SRVEVTHOOK GUIAPI SetServerEventHook (SRVEVTHOOK SrvEvtHook);
  */
 #define WS_DISABLED         0x04000000L
 
-/* Main window states -- reserved for future use. */
-#define WS_MINIMIZE         0x02000000L
-#define WS_MAXIMIZE         0x01000000L
+/**
+ * \def WS_VSCROLL
+ * \brief Creates a window with vertical scroll bar.
+ */
+#define WS_VSCROLL          0x02000000L
 
-/* bits in this mask are reuse for main windows and controls;
-   bits have different meanings for main windows and controls.*/
-#define WS_REUSE_MASK           0x00E00000L
+/**
+ * \def WS_HSCROLL
+ * \brief Creates a window with horizontal scroll bar.
+ */
+#define WS_HSCROLL          0x01000000L
+
+/* bits in this mask are both for main window and controls */
+#define WS_BORDER_MASK      0x00F00000L
 
 /**
  * \def WS_DLGFRAME
  * \brief The main window has a fixed frame, i.e. user can not
  *        drag the border of the window.
  */
-#define WS_DLGFRAME             0x00800000L
+#define WS_DLGFRAME         0x00800000L
 
 /**
  * \def WS_THICKFRAME
  * \brief Creates a main window with thick frame.
  */
-#define WS_THICKFRAME           0x00400000L
+#define WS_THICKFRAME       0x00400000L
 
 /**
  * \def WS_THINFRAME
  * \brief Creates a main window with thin frame.
  */
-#define WS_THINFRAME            0x00200000L
+#define WS_THINFRAME        0x00200000L
+
+/**
+ * \def WS_BORDER
+ * \brief Creates a window with border.
+ */
+#define WS_BORDER           0x00100000L
+
+/* bits in this mask are reuse for main windows and controls;
+   bits have different meanings for main windows and controls.*/
+#define WS_MISC_MASK        0x000F0000L
+
+/**
+ * \def WS_CHILD
+ * \brief Indicates the window is a child.
+ */
+#define WS_CHILD            0x00080000L
 
 /**
  * \def WS_GROUP
  * \brief Indicates the control is the leader of a group.
  * \note This style is valid only for controls.
  */
-#define WS_GROUP                0x00800000L
+#define WS_GROUP            0x00040000L
 
 /**
  * \def WS_TABSTOP
@@ -4320,7 +4363,11 @@ MG_EXPORT SRVEVTHOOK GUIAPI SetServerEventHook (SRVEVTHOOK SrvEvtHook);
  *        using Tab key.
  * \note This style is valid only for controls.
  */
-#define WS_TABSTOP              0x00400000L
+#define WS_TABSTOP          0x00020000L
+
+/* Main window states -- reserved for future use. */
+#define WS_MINIMIZE         0x00040000L
+#define WS_MAXIMIZE         0x00020000L
 
 /**
  * \def WS_ALWAYSTOP
@@ -4328,38 +4375,11 @@ MG_EXPORT SRVEVTHOOK GUIAPI SetServerEventHook (SRVEVTHOOK SrvEvtHook);
  *
  * Since 5.0.0.
  */
-#define WS_ALWAYSTOP            0x00100000L
-
-/* bits in this mask are both for main windows and controls */
-#define WS_MISC_MASK            0x000F0000L
-
-/**
- * \def WS_CHILD
- * \brief Indicates the window is a child.
- */
-#define WS_CHILD                0x00080000L
-
-/**
- * \def WS_VSCROLL
- * \brief Creates a window with vertical scroll bar.
- */
-#define WS_VSCROLL              0x00040000L
-
-/**
- * \def WS_HSCROLL
- * \brief Creates a window with horizontal scroll bar.
- */
-#define WS_HSCROLL              0x00020000L
-
-/**
- * \def WS_BORDER
- * \brief Creates a window with border.
- */
-#define WS_BORDER               0x00010000L
+#define WS_ALWAYSTOP        0x00010000L
 
 /* Obsolete styles, back-compatibility definitions. */
-#define WS_OVERLAPPED           0x00000000L
-#define WS_ABSSCRPOS            0x00000000L
+#define WS_OVERLAPPED       0x00000000L
+#define WS_ABSSCRPOS        0x00000000L
 
 #define WS_MAINWIN_ONLY_MASK    (WS_CAPTIONBAR_MASK | WS_ALWAYSTOP)
 #define WS_CONTROL_ONLY_MASK    (WS_CTRLMASK)
@@ -4433,16 +4453,12 @@ MG_EXPORT SRVEVTHOOK GUIAPI SetServerEventHook (SRVEVTHOOK SrvEvtHook);
 
 /**
  * \def WS_EX_WINTYPE_TOOLTIP
- * \brief The type for a system/global main window.
+ * \brief The type for a tooltip main window.
  *
  * Use this style when you want to create a tooltip main window.
  * A tooltip main window will be shown above other types of main windows.
  *
- * \note Under MiniGUI-Processes runtime mode, only the client which creates
- *      the first main window in the tooltip level can create other main
- *      windows in this level. For other clients, a main window in the higher
- *      level will be created.
- * \note The maximal number of all main windows in the tooltip level is 8.
+ * \note The maximal number of all main windows in the tooltip level is 16.
  *      MiniGUI will create a main windows in higher level if there is no room
  *      in the tooltip level.
  *
@@ -4458,8 +4474,12 @@ MG_EXPORT SRVEVTHOOK GUIAPI SetServerEventHook (SRVEVTHOOK SrvEvtHook);
  * A system/global main window will be shown above other types of main windows.
  *
  * \note Under MiniGUI-Processes runtime mode, only the server (`mginit`) can
- *      create main windows in the system level, and any main windows created
- *      by the server is a system main window.
+ *  create main windows in the system level, and any main windows created
+ *  by the server is a system main window.
+ *
+ *
+ * \note Under MiniGUI-Processes runtime mode, the windows in this level will be kept
+ *  visible on all layers.
  *
  * Since 5.0.0.
  */
@@ -4473,13 +4493,18 @@ MG_EXPORT SRVEVTHOOK GUIAPI SetServerEventHook (SRVEVTHOOK SrvEvtHook);
  * screen lock level. A main window in the screen lock level will
  * be shown below the system main windows and above the other main windows.
  *
- * \note Under MiniGUI-Processes runtime mode, only the client which creates
- *      the first main window in the screen lock level can create other
- *      main windows in the this level. For other clients, a main window in
- *      the higher level will be created.
+ * \note Under MiniGUI-Processes runtime mode, only clients on the default (`mginit`)
+ *  layer can create a main window in this level, and only the client which creates
+ *  the first main window in the screen lock level can create other
+ *  main windows in the this level. For other clients, a main window in
+ *  the higher level will be created.
+ *
+ * \note Under MiniGUI-Processes runtime mode, the windows in this level will be kept
+ *  visible on all layers.
+ *
  * \note The maximal number of all main windows in the screen lock level is 8.
- *      MiniGUI will create a main windows in higher level if there is no room
- *      in the screen lock level.
+ *  MiniGUI will create a main windows in higher level if there is no room
+ *  in the screen lock level.
  * 
  * Since 5.0.0.
  */
@@ -4494,13 +4519,18 @@ MG_EXPORT SRVEVTHOOK GUIAPI SetServerEventHook (SRVEVTHOOK SrvEvtHook);
  * be shown below the main windows in the screen lock level and
  * above the main windows in the higher level.
  *
- * \note Under MiniGUI-Processes runtime mode, only the client which creates
- *      the first main window in the docker level can create other main windows
- *      in the docker level. For other clients, a main window in the higher
- *      level will be created.
+ * \note Under MiniGUI-Processes runtime mode, only clients on the default (`mginit`)
+ *  layer can create a main window in this levele, and only the client which creates
+ *  the first main window in the docker level can create other main windows
+ *  in the docker level. For other clients, a main window in the higher
+ *  level will be created.
+ *
+ * \note Under MiniGUI-Processes runtime mode, the windows in this level will be kept
+ *  visible on all layers.
+ *
  * \note The maximal number of all main windows in the docker level is 8.
- *      MiniGUI will create a main windows in higher level if there is no room
- *      in the docker level.
+ *  MiniGUI will create a main windows in higher level if there is no room
+ *  in the docker level.
  *
  * Since 5.0.0.
  */
@@ -4549,13 +4579,18 @@ MG_EXPORT SRVEVTHOOK GUIAPI SetServerEventHook (SRVEVTHOOK SrvEvtHook);
  * be shown below the main windows in the normal level and
  * above the wallpaper.
  *
- * \note Under MiniGUI-Processes runtime mode, only the client which creates
- *      the first main window in the launcher level can create other
- *      main windows in the launcher level. For other clients, a main window
- *      in the normal level will be created.
+ * \note Under MiniGUI-Processes runtime mode, only clients on the default (`mginit`)
+ *  layer can create a main window in this levele, and only the client which creates
+ *  the first main window in the launcher level can create other
+ *  main windows in the launcher level. For other clients, a main window
+ *  in the normal level will be created.
+ *
+ * \note Under MiniGUI-Processes runtime mode, the windows in this level will be kept
+ *  visible on all layers.
+ *
  * \note The maximal number of all main windows in the launcher level is 8.
- *      MiniGUI will create a main windows in normal level if there is no room
- *      in the launcher level.
+ *  MiniGUI will create a main windows in normal level if there is no room
+ *  in the launcher level.
  *
  * Since 5.0.0.
  */
@@ -6884,13 +6919,14 @@ static inline BOOL MainWindowThreadCleanup (HWND hMainWnd)
 #define ST_PIXEL_ARGB4444       0x0001
 #define ST_PIXEL_ARGB1555       0x0002
 #define ST_PIXEL_ARGB8888       0x0003
+#define ST_PIXEL_XRGB565        0x0004
 
 /* other flags for future use */
 
 /* for default surface flags */
 #define ST_DEFAULT              (ST_PIXEL_DEFAULT)
 
-#define CT_SYSTEM_MASK          0X0000FF
+#define CT_SYSTEM_MASK          0x0000FF
 #define CT_OPAQUE               0x000000
 #define CT_COLORKEY             0x000001
 #define CT_ALPHACHANNEL         0x000002
@@ -7158,7 +7194,7 @@ MG_EXPORT BOOL GUIAPI SetWindowMaskEx (HWND hWnd, HDC hdc, const BITMAP* mask);
  * \param hWnd The handle to the window.
  * \param fSet Set or cancel the always top style; TRUE to set, FALSE to cancel.
  *
- * \return return TRUE on success, otherwise FALSE.
+ * \return TRUE on success, otherwise FALSE.
  *
  * \sa GetWindowStyle, WS_ALWAYSTOP
  *
@@ -7166,6 +7202,39 @@ MG_EXPORT BOOL GUIAPI SetWindowMaskEx (HWND hWnd, HDC hdc, const BITMAP* mask);
  */
 MG_EXPORT BOOL GUIAPI SetMainWindowAlwaysTop (HWND hWnd, BOOL fSet);
 
+#define GF_SWIPE_HORZ   ZOF_GF_SWIPE_HORZ
+#define GF_SWIPE_VERT   ZOF_GF_SWIPE_VERT
+
+/**
+ * \fn BOOL GUIAPI SetMainWindowGestureFlags (HWND hWnd, DWORD dwFlags)
+ * \brief Set the gesture flags of a main window.
+ *
+ * This function sets the gesture flags of a specific main window.
+ *
+ * Generally, a main window which needs a specific gesture should handle
+ * \a MSG_GESTURETEST and call this function to set the correct gesture flags for
+ * the main window.
+ *
+ * The MiniGUI Core will send the MSG_GESTURETEST message as a notification
+ * to a main window when it tries to handle a gesture globally. If the main window
+ * sets the flag of the gesture in a specific time, e.g. 100ms, MiniGUI Core will
+ * pass the gesture events to the main window other than handle the gesture by itself.
+ *
+ * \param hWnd The handle to the main window.
+ * \param dwFlags The new gesture flags, can be OR'd with the following values:
+ *  - GF_SWIPE_HORZ\n
+ *      The main window handles horizontal swipe gesture.
+ *  - GF_SWIPE_VERT\n
+ *      The main window handles vertical swipe gesture.
+ *
+ * \return TRUE on success, otherwise FALSE.
+ *
+ * \sa MSG_GESTURETEST
+ *
+ * Since 5.0.6
+ */
+MG_EXPORT BOOL GUIAPI SetMainWindowGestureFlags (HWND hWnd, DWORD dwFlags);
+
 #ifdef _MGSCHEMA_COMPOSITING
 
 /**
@@ -7189,14 +7258,14 @@ MG_EXPORT BOOL GUIAPI SetMainWindowAlwaysTop (HWND hWnd, BOOL fSet);
  *      the alpha channel value (0~255) along with the parameter \a arg.
  *  - CT_LOGICALPIXEL\n
  *      Do the given color logical operation. You should specify the color
- *      logical raster operation along with the pararmeter \a arg. See \a BitBlt.
+ *      logical raster operation along with the pararmeter \a arg. See \a ColorLogicalOp.
  *  - CT_ALPHAPIXEL\n
  *      The alpha component value of the source and/or the destination pixel go
  *      into effect. You can specify the color blend method along
  *      with the pararmeter \a arg. See \a ColorBlendMethod. Note that a specific
  *      compositor may not support this compositing type. The built-in `fallback`
- *      compositor ignores the blend mode argument and only always uses the
- *      Porter Duff blend mode: source over destination (COLOR_BLEND_PD_SRC_OVER).
+ *      compositor uses the blend mode argument when using Pixman, otherwise,
+ *      uses the Porter Duff blend mode: source over destination (COLOR_BLEND_PD_SRC_OVER).
  *  - CT_BLURRED\n
  *      Apply a Gaussian blur to the background of the main window. You should
  *      also specify the radius of the blur (0 ~ 255) in pixles along with the

src/Makefile.am

@@ -1,56 +1,31 @@
-if MG_MINIMALGDI
-COMMON_SUBDIRS = misc kernel sysres include 
+COMMON_SUBDIRS = libc misc main kernel sysres ial control ex_ctrl font gui mybmp include textedit newgal newgdi
 
-COMMON_LADD =               	\
-    kernel/libkernel.la     	\
-	sysres/libsysres.la         \
-    misc/libmisc.la         	
-else
-COMMON_SUBDIRS = libc misc main kernel sysres ial control ex_ctrl font gui mybmp include textedit
-
-COMMON_LADD =               	\
-    libc/liblibc.la         	\
-    misc/libmisc.la         	\
-    control/libcontrol.la   	\
-    ex_ctrl/libexctrl.la   		\
-    font/libfont.la         	\
+COMMON_LADD =                   \
+    libc/liblibc.la             \
+    misc/libmisc.la             \
+    control/libcontrol.la       \
+    ex_ctrl/libexctrl.la        \
+    font/libfont.la             \
     font/in-core/libincore.la   \
-    ial/libial.la           	\
-    gui/libgui.la           	\
-    main/libmain.la         	\
-    mybmp/libmybmp.la       	\
-    kernel/libkernel.la     	\
+    ial/libial.la               \
+    gui/libgui.la               \
+    main/libmain.la             \
+    mybmp/libmybmp.la           \
+    kernel/libkernel.la         \
     sysres/libsysres.la         \
-	textedit/libtextedit.la
-endif
+    textedit/libtextedit.la     \
+    newgal/libnewgal.la         \
+    newgdi/libnewgdi.la
 
-if MGRM_STANDALONE
-LITE_LADD = standalone/libstandalone.la
-LITE_SUBDIRS = standalone
-else
-if MGRM_PROCESSES
-LITE_LADD = server/libserver.la client/libclient.la
-LITE_SUBDIRS = server client
-else
-LITE_LADD = 
-LITE_SUBDIRS = 
-endif
-endif
-
-NEWGAL_LADD = newgal/libnewgal.la newgdi/libnewgdi.la
-NEWGAL_SUBDIRS = newgal newgdi
-
-DIST_SUBDIRS = $(COMMON_SUBDIRS) newgal newgdi server client standalone 
-SUBDIRS = $(COMMON_SUBDIRS) $(NEWGAL_SUBDIRS) $(LITE_SUBDIRS) 
+DIST_SUBDIRS = $(COMMON_SUBDIRS) newgal newgdi server client standalone
+SUBDIRS = $(COMMON_SUBDIRS) @RUNMODE_SUBDIRS@
 
 MGSOURCES = template.c template.h
-MGLIBADD =  $(COMMON_LADD)      \
-			$(LITE_LADD)        \
-			$(NEWGAL_LADD)
+MGLIBADD =  $(COMMON_LADD) @RUNMODE_LADD@
 MGLDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 lib_LTLIBRARIES=libminigui_@MGLIB_SUFFIX@.la
-libminigui_@MGLIB_SUFFIX@_la_LIBADD=$(MGLIBADD)
+libminigui_@MGLIB_SUFFIX@_la_LIBADD=$(MGLIBADD) @DEP_LIBS@
 libminigui_@MGLIB_SUFFIX@_la_SOURCES=$(MGSOURCES) 
 libminigui_@MGLIB_SUFFIX@_la_LDFLAGS=$(MGLDFLAGS) 
 

src/client/client.c

@@ -154,9 +154,31 @@ int GUIAPI GetSockFD2Server (void)
 
 #include "debug.h"
 
+static void check_live (BOOL woken)
+{
+    static DWORD last_ticks;
+    REQUEST req;
+
+    __mg_update_tick_count (NULL);
+
+    // Since 5.0.6, only send IAMLIVE if the current ticks > (last_ticks + 100)
+    if (woken || __mg_tick_counter > last_ticks + 100) {
+        last_ticks = __mg_tick_counter;
+
+        /* Tell server that I am live */
+        req.id = REQID_IAMLIVE;
+        req.data = &__mg_tick_counter;
+        req.len_data = sizeof (unsigned int);
+        ClientRequest (&req, NULL, 0);
+    }
+}
+
 static void process_socket_message (MSG *msg)
 {
-    if (msg->message == MSG_UPDATECLIWIN &&
+    if (msg->message == MSG_WAKEUP_CLIENT) {
+        check_live (TRUE);
+    }
+    else if (msg->message == MSG_UPDATECLIWIN &&
             __mg_client_check_hwnd (msg->hwnd, __mg_client_id)) {
         __mg_update_window (msg->hwnd,
                 LOSWORD(msg->wParam), HISWORD(msg->wParam),
@@ -366,27 +388,6 @@ sock_error:
     return -1;
 }
 
-static void check_live (void)
-{
-    REQUEST req;
-
-#if 0   /* deprecated code */
-    /* Since 5.0.0, call __mg_update_tick_count instead */
-    if (__mg_tick_counter != SHAREDRES_TIMER_COUNTER) {
-        AlertDesktopTimerEvent ();
-        __mg_tick_counter = SHAREDRES_TIMER_COUNTER;
-    }
-#endif  /* deprecated code */
-
-    __mg_update_tick_count (NULL);
-
-    /* Tell server that I am live */
-    req.id = REQID_IAMLIVE;
-    req.data = &__mg_tick_counter;
-    req.len_data = sizeof (unsigned int);
-    ClientRequest (&req, NULL, 0);
-}
-
 BOOL client_IdleHandler4Client (PMSGQUEUE msg_queue, BOOL wait)
 {
     static DWORD old_timer;
@@ -398,7 +399,7 @@ BOOL client_IdleHandler4Client (PMSGQUEUE msg_queue, BOOL wait)
     struct timeval sel_timeout;
     MSG Msg;
 
-    check_live ();
+    check_live (FALSE);
 
     /* rset gets modified each time around */
     rset = msg_queue->rfdset;
@@ -433,14 +434,14 @@ BOOL client_IdleHandler4Client (PMSGQUEUE msg_queue, BOOL wait)
         static unsigned int old_mouse_move_serial = 0xdeadbeef;
         int flag = 0, mouse_x = -1, mouse_y = -1, buttons = -1;
 
-        check_live ();
+        check_live (FALSE);
         if (wait && (__mg_tick_counter - old_timer) >= repeat_timeout) {
             Msg.hwnd = HWND_DESKTOP;
             Msg.message = MSG_TIMEOUT;
             Msg.wParam = (WPARAM)__mg_tick_counter;
             Msg.lParam = 0;
             Msg.time = __mg_tick_counter;
-            // Since 5.0.0, we do not genenrate MSG_TIMEOUT message any more.
+            // Since 5.0.0, we do not genenrate MSG_TIMEOUT message here.
             // kernel_QueueMessage (msg_queue, &Msg);
 
             old_timer = __mg_tick_counter;
@@ -507,7 +508,7 @@ BOOL client_IdleHandler4Client (PMSGQUEUE msg_queue, BOOL wait)
     /* go through registered listen fds */
     n += __mg_kernel_check_listen_fds (msg_queue, &rset, wsetptr, esetptr);
 
-    check_live ();
+    check_live (FALSE);
 
     if (n > 0) {
         old_timer = __mg_tick_counter;
@@ -569,12 +570,23 @@ GHANDLE GUIAPI JoinLayer (const char* layer_name, const char* client_name,
 
         __mg_layer = layer_handle;
 
-        zi  = (ZORDERINFO*) shmat (joined_info.zo_shmid, 0, SHM_RDONLY);
+        zi  = (ZORDERINFO*) shmat (joined_info.zi_shmid, 0, SHM_RDONLY);
         if (zi == (void*)-1) {
             return INV_LAYER_HANDLE;
         }
 
         __mg_zorder_info = zi;
+        if (joined_info.zi_shmid == joined_info.def_zi_shmid) {
+            __mg_def_zorder_info = zi;
+        }
+        else {
+            zi  = (ZORDERINFO*) shmat (joined_info.def_zi_shmid, 0, SHM_RDONLY);
+            if (zi == (void*)-1) {
+                return INV_LAYER_HANDLE;
+            }
+
+            __mg_def_zorder_info = zi;
+        }
     }
 
     __mg_tick_counter = SHAREDRES_TIMER_COUNTER;
@@ -711,6 +723,39 @@ BOOL __mg_client_on_layer_changed (GHANDLE layer_handle, int zi_shmid)
 
         __mg_layer = layer_handle;
         __mg_zorder_info = zi;
+
+#if 0 /* obsolete */
+        ZORDERNODE* nodes;
+        int slot;
+
+        nodes = GET_ZORDERNODE(zi);
+        slot = zi->first_tooltip;
+        for (; slot > 0; slot = nodes[slot].next) {
+            if (nodes [slot].cli == __mg_client_id) {
+                PMAINWIN win = (PMAINWIN)nodes [slot].hwnd;
+                assert (win);
+                win->idx_znode = slot;
+            }
+        }
+
+        slot = zi->first_topmost;
+        for (; slot > 0; slot = nodes[slot].next) {
+            if (nodes [slot].cli == __mg_client_id) {
+                PMAINWIN win = (PMAINWIN)nodes [slot].hwnd;
+                assert (win);
+                win->idx_znode = slot;
+            }
+        }
+
+        slot = zi->first_normal;
+        for (; slot > 0; slot = nodes[slot].next) {
+            if (nodes [slot].cli == __mg_client_id) {
+                PMAINWIN win = (PMAINWIN)nodes [slot].hwnd;
+                assert (win);
+                win->idx_znode = slot;
+            }
+        }
+#endif /* obsolete */
         return TRUE;
     }
 

src/control/bidiedit.c

@@ -210,6 +210,7 @@ static void setup_dc (HWND hWnd, BIDISLEDITDATA *sled, HDC hdc, BOOL bSel)
     DWORD dwStyle = GetWindowStyle (hWnd);
 
     if (!bSel) {
+        SetBkMode (hdc, BM_TRANSPARENT);
 
         if (dwStyle & WS_DISABLED)
             SetTextColor (hdc,
@@ -583,7 +584,7 @@ static void slePaint (HWND hWnd, HDC hdc, PBIDISLEDITDATA sled)
 
             /* draw selected chars */
             setup_dc (hWnd, sled, hdc, TRUE);
-                outw += DrawACharString (hdc, startx + outw, starty,
+            outw += DrawACharString (hdc, startx + outw, starty,
                         achar_string, sled->selEnd - sled->selStart, NULL, NULL);
             achar_string += sled->selEnd - sled->selStart;
 
@@ -1069,6 +1070,7 @@ static int ascii_bidi_type[] = {
     BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR,
     BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_ON,
     BIDI_TYPE_ON,  BIDI_TYPE_ON,  BIDI_TYPE_ON,  BIDI_TYPE_ON,
+
     /*0x60~0x6f*/
     BIDI_TYPE_ON,  BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR,
     BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR,
@@ -1085,21 +1087,23 @@ static int ascii_bidi_type[] = {
 static int inline get_char_bidi_type (LOGFONT* logfont, Achar32 chv)
 {
     DEVFONT* devfont;
+    int bidi_type = BIDI_TYPE_LTR;
 
     if (IS_MBCHV(chv)) {
         devfont = logfont->devfonts[1];
 
         if (devfont->charset_ops->bidi_char_type) {
-            return devfont->charset_ops->bidi_char_type (chv);
-        }
-        else {
-            return BIDI_TYPE_LTR;
+            bidi_type = devfont->charset_ops->bidi_char_type (chv);
         }
     }
     else {
-        return ascii_bidi_type[chv];
+        assert(chv < 0x80);
+        bidi_type = ascii_bidi_type[chv];
     }
 
+    _DBG_PRINTF("chv: %X: bidi_type: %x\n", chv, bidi_type);
+    return bidi_type;
+
 }
 static int get_text_rl_type (PLOGFONT logfont, char* newtext, int l_char_type,
         int r_char_type, int line_type)
@@ -1108,53 +1112,60 @@ static int get_text_rl_type (PLOGFONT logfont, char* newtext, int l_char_type,
     Achar32 chv;
     chv = GetACharValue (logfont, newtext, strlen(newtext), NULL, 0);
 
-    if (chv == INV_ACHAR_VALUE)
-        return -1;
+    int type = CHAR_TYPE_UNKKOWN;
+
+    if (chv == INV_ACHAR_VALUE) {
+        goto done;
+    }
 
     bidi_type = get_char_bidi_type (logfont, chv);
 
-    if (BIDI_IS_STRONG(bidi_type))
-    {
-        if (BIDI_IS_RTL(bidi_type))
-        {
-            return CHAR_TYPE_RTL;
+    if (BIDI_IS_STRONG(bidi_type)) {
+        if (BIDI_IS_RTL(bidi_type)) {
+            type = CHAR_TYPE_RTL;
+            goto done;
         }
-        else
-        {
-            return CHAR_TYPE_LTR;
+        else {
+            type = CHAR_TYPE_LTR;
+            goto done;
         }
     }
 
-    if (BIDI_IS_NUMBER(bidi_type))
-    {
-        return CHAR_TYPE_LTR;
+    if (BIDI_IS_NUMBER(bidi_type)) {
+        type = CHAR_TYPE_LTR;
+        goto done;
     }
 
-    if (l_char_type == r_char_type)
-    {
-        return l_char_type;
+    if (l_char_type == r_char_type) {
+        type = l_char_type;
+        goto done;
     }
     /* no left char */
-    else if (l_char_type == -1)
-    {
+    else if (l_char_type == CHAR_TYPE_UNKKOWN) {
         if (BIDI_IS_WEAK (bidi_type))
-            return r_char_type;
+            type = r_char_type;
         else
-            return line_type;
+            type = line_type;
+        goto done;
     }
     /* no right char */
-    else if (r_char_type == -1)
-    {
+    else if (r_char_type == CHAR_TYPE_UNKKOWN) {
         if (BIDI_IS_WEAK (bidi_type))
-            return l_char_type;
+            type = l_char_type;
         else
-            return line_type;
+            type = line_type;
+        goto done;
     }
-    else
-    {
-        return line_type;
+    else {
+        type = line_type;
     }
 
+    _DBG_PRINTF("l_char_type: %d, r_char_type: %d, line_type: %d, "
+            "type for %X: %d\n",
+            l_char_type, r_char_type, line_type, chv, type);
+
+done:
+    return type;
 }
 
 static int get_line_rl_type (ACHARMAPINFO* map, int len)
@@ -2133,7 +2144,7 @@ esright_input_char_refresh (HWND hWnd,
         scroll_rc.right = cur_caret_x;
 
         ScrollWindow(hWnd, -scroll_len, 0, &scroll_rc, NULL);
-        UpdateWindow(hWnd, FALSE);
+        UpdateInvalidClient(hWnd, TRUE);
         edtSetCaretPos (hWnd, sled);
 
         sled->changed = TRUE;
@@ -2504,8 +2515,6 @@ SLEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         unsigned char charBuffer [4];
         int chars;
 
-        _DBG_PRINTF("get char-----------------char----%p\n", (PVOID)wParam);
-
         if (dwStyle & ES_READONLY)
             return 0;
 
@@ -2526,9 +2535,6 @@ SLEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         else {
             chars = 1;
 
-            if (charBuffer [0] == 127) // BS
-                charBuffer [0] = '\b';
-
             if (dwStyle & ES_UPPERCASE) {
                 charBuffer [0] = toupper (charBuffer[0]);
             }
@@ -2537,12 +2543,12 @@ SLEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             }
         }
 
-        if (chars == 1) {
-            if (charBuffer [0] < 0x20 && charBuffer[0] != '\b') //FIXME
-                return 0;
+        if (chars > 1) {
+            _WRN_PRINTF("BIDISLEDIT only support ISO8859-6 charset\n");
+            return 0;
         }
-
-        if (wParam == '\b') { // backspace
+        else if (charBuffer [0] == '\b' || charBuffer [0] == 0x7F) {
+            // BS or DEL
             int del = 1;
 
             if (sled->editPos == 0 && sled->selStart == sled->selEnd)
@@ -2564,9 +2570,12 @@ SLEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                 sleBackspaceText (hWnd, sled, del, FALSE, FALSE);
             }
         }
-        else{
+        else if (charBuffer [0] < 0x20) {
+            // ignore all other control characters.
+            return 0;
+        }
+        else {
             if (dwStyle & ES_LEFT) {
-            //if ((dwStyle&0xffff) ==  ES_LEFT) {
                 esleft_input_char_refresh(hWnd, sled, (char*)charBuffer, chars);
                 set_edit_caret_pos(hWnd, sled);
 
@@ -2586,6 +2595,7 @@ SLEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                 sleInsertText (hWnd, sled, (char* )charBuffer, chars, FALSE);
             }
         }
+
         return 0;
     }
 

src/control/button.c

@@ -299,7 +299,15 @@ static void change_status_from_pose (PCONTROL pctrl, int new_pose,
         }
     }
 
-    /*complete a click if the click if valid
+    /* DK: When the radio or check button state changes do not erase the background,
+     * and the prospects for direct rendering */
+    btnGetRects (pctrl, &rcClient, &rcContent, &rcBitmap);
+    if (BUTTON_IS_PUSHBTN(pctrl) || (pctrl->dwStyle & BS_PUSHLIKE))
+        InvalidateRect((HWND)pctrl, NULL, TRUE);
+    else
+        InvalidateRect((HWND)pctrl, &rcBitmap, FALSE);
+
+    /* complete a click if the click if valid
      * (mouse lbutton up in button )*/
     if (old_pose == BST_PUSHED && new_pose != BST_DISABLE
             && change_valid)
@@ -312,14 +320,6 @@ static void change_status_from_pose (PCONTROL pctrl, int new_pose,
 
         NotifyParent ((HWND)pctrl, pctrl->id, BN_CLICKED);
     }
-
-    /* DK: When the radio or check button state changes do not erase the background,
-     * and the prospects for direct rendering */
-    btnGetRects (pctrl, &rcClient, &rcContent, &rcBitmap);
-    if (BUTTON_IS_PUSHBTN(pctrl) || (pctrl->dwStyle & BS_PUSHLIKE))
-        InvalidateRect((HWND)pctrl, NULL, TRUE);
-    else
-        InvalidateRect((HWND)pctrl, &rcBitmap, FALSE);
 }
 
 /*btnGetRects:
@@ -423,8 +423,8 @@ static void draw_bitmap_button (PCONTROL pctrl, HDC hdc, DWORD dwStyle,
 
         GetClientRect ((HWND)pctrl, &prcClient);
         if (dwStyle & BS_REALSIZEIMAGE) {
-            x += (w - bmp->bmWidth) >> 1;
-            y += (h - bmp->bmHeight) >> 1;
+            x += (int)(w - bmp->bmWidth) >> 1;
+            y += (int)(h - bmp->bmHeight) >> 1;
             w = h = 0;
 
             if (bmp->bmWidth > RECTW(prcClient)){
@@ -847,8 +847,6 @@ static LRESULT ButtonCtrlProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
             break;
         }
 
-
-
         case BM_SETSTYLE:
             pctrl->dwStyle &= 0xFFFF0000;
             pctrl->dwStyle |= (DWORD)(wParam & 0x0000FFFF);
@@ -1054,7 +1052,7 @@ static LRESULT ButtonCtrlProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
         }
 
         default:
-        break;
+            break;
     }
 
     return DefaultControlProc (hWnd, uMsg, wParam, lParam);

src/control/ctrlmisc.c

@@ -63,21 +63,17 @@
 #include "ctrlmisc.h"
 
 #define _ID_TIMER   100
+#define _MARGIN     10
 
 static LRESULT ToolTipWinProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    static int iBorder;
     switch (message) {
         case MSG_CREATE:
         {
-            const WINDOWINFO *info;
             int timeout = (int)GetWindowAdditionalData (hWnd);
             if (timeout >= 10)
                 SetTimer (hWnd, _ID_TIMER, timeout / 10);
 
-            info = GetWindowInfo (hWnd);
-            iBorder =
-                info->we_rdr->calc_we_area (hWnd, LFRDR_METRICS_BORDER, NULL);
             SetWindowFont (hWnd,
                 (PLOGFONT)GetWindowElementAttr(hWnd, WE_FONT_TOOLTIP));
             break;
@@ -102,7 +98,7 @@ static LRESULT ToolTipWinProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lP
 
             SetTextColor (hdc,
                     GetWindowElementPixelEx(hWnd, hdc, WE_FGC_TOOLTIP));
-            TabbedTextOut (hdc, iBorder, iBorder, text);
+            TabbedTextOut (hdc, _MARGIN, _MARGIN, text);
 
             EndPaint (hWnd, hdc);
             return 0;
@@ -164,6 +160,7 @@ HWND CreateToolTipWin (HWND hParentWnd, int x, int y, int timeout_ms,
 
     CreateInfo.dwStyle = WS_VISIBLE;
     CreateInfo.dwExStyle = WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_USEPARENTRDR;
+    CreateInfo.dwExStyle |= WS_EX_WINTYPE_TOOLTIP | WS_EX_TROUNDCNS | WS_EX_BROUNDCNS;
     CreateInfo.spCaption = buf ? buf : text;
     CreateInfo.hMenu = 0;
     CreateInfo.hCursor = GetSystemCursor (IDC_ARROW);
@@ -171,8 +168,8 @@ HWND CreateToolTipWin (HWND hParentWnd, int x, int y, int timeout_ms,
     CreateInfo.MainWindowProc = ToolTipWinProc;
     CreateInfo.lx = x;
     CreateInfo.ty = y;
-    CreateInfo.rx = CreateInfo.lx + text_size.cx;
-    CreateInfo.by = CreateInfo.ty + text_size.cy;
+    CreateInfo.rx = CreateInfo.lx + text_size.cx + _MARGIN * 2;
+    CreateInfo.by = CreateInfo.ty + text_size.cy + _MARGIN * 2;
     CreateInfo.iBkColor =
         GetWindowElementPixelEx (hParentWnd, HDC_SCREEN, WE_BGC_TOOLTIP);
     CreateInfo.dwAddData = (DWORD) timeout_ms;
@@ -218,7 +215,8 @@ void ResetToolTipWin (HWND hwnd, int x, int y, const char* text, ...)
     if (y + text_size.cy > g_rcScr.bottom)
         y = g_rcScr.bottom - text_size.cy;
 
-    MoveWindow (hwnd, x, y, text_size.cx, text_size.cy, TRUE);
+    MoveWindow (hwnd, x, y,
+            text_size.cx + _MARGIN * 2, text_size.cy  + _MARGIN * 2, TRUE);
     ShowWindow (hwnd, SW_SHOWNORMAL);
 }
 

src/control/edit.c

@@ -1678,7 +1678,7 @@ esright_input_char_refresh (HWND hWnd,
         scroll_rc.right = cur_caret_x;
 
         ScrollWindow(hWnd, -scroll_len, 0, &scroll_rc, NULL);
-        UpdateWindow(hWnd, FALSE);
+        UpdateInvalidClient(hWnd, TRUE);
         edtSetCaretPos (hWnd, sled);
 
         sled->changed = TRUE;
@@ -2143,9 +2143,6 @@ SLEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         else {
             chars = 1;
 
-            if (charBuffer [0] == 127) // BS
-                charBuffer [0] = '\b';
-
             if (dwStyle & ES_UPPERCASE) {
                 charBuffer [0] = toupper (charBuffer[0]);
             }
@@ -2154,12 +2151,8 @@ SLEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             }
         }
 
-        if (chars == 1) {
-            if (charBuffer [0] < 0x20 && charBuffer[0] != '\b') //FIXME
-                return 0;
-        }
-
-        if (charBuffer[0] == '\b') { //backspace
+        if (chars == 1 && (charBuffer[0] == '\b' || charBuffer[0] == 0x7F)) {
+            // ASCII BS or DEL
             int del;
 
             if (sled->editPos == 0 && sled->selStart == sled->selEnd)
@@ -2184,7 +2177,11 @@ SLEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                 sleInsertText (hWnd, sled, NULL, del);
             }
         }
-        else{
+        else if (chars == 1 && charBuffer [0] < 0x20) {
+            // ignore all other ASCII control characters.
+            return 0;
+        }
+        else {
             if (dwStyle & ES_LEFT) {
                 esleft_input_char_refresh(hWnd, sled, (char*)charBuffer, chars);
                 set_edit_caret_pos(hWnd, sled);

src/control/scrolled.c

@@ -172,6 +172,10 @@ BOOL scrolled_set_cont_pos (HWND hWnd, PSCRDATA pscrdata, int cont_x, int cont_y
         SetScrollPos (hWnd, SB_VERT, cont_y);
         bChange = TRUE;
     }
+
+    if (bChange)
+        UpdateInvalidClient(hWnd, FALSE);
+
     return bChange;
 }
 

src/control/scrollview.c

@@ -15,7 +15,7 @@
  *   and Graphics User Interface (GUI) support system for embedded systems
  *   and smart IoT devices.
  *
- *   Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd.
+ *   Copyright (C) 2002~2022, Beijing FMSoft Technologies Co., Ltd.
  *   Copyright (C) 1998~2002, WEI Yongming
  *
  *   This program is free software: you can redistribute it and/or modify
@@ -493,10 +493,15 @@ LRESULT ScrollViewCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lPara
         break;
     }
 
-    case MSG_DESTROY:
-        scrollview_destroy (psvdata);
-        free (psvdata);
+    case MSG_DESTROY: {
+        /* suppress a warning about calling free() before using the pointer */
+        PSVDATA svdata = (PSVDATA) GetWindowAdditionalData2 (hWnd);
+        if (svdata) {
+            scrollview_destroy(svdata);
+            free (svdata);
+        }
         break;
+    }
 
     case MSG_GETDLGCODE:
         return DLGC_WANTARROWS;

src/control/textedit.c

@@ -2096,7 +2096,6 @@ static void teOnChar (HWND hWnd, PTEDATA ptedata, WPARAM wParam)
             rcInv.right = ptedata->svdata.scrdata.nContWidth;
             rcInv.bottom = rcInv.top + ptedata->nLineHeight - ptedata->nLineBaseH;
             REFRESH_NODE_EX(node, &rcInv);
-           // UpdateWindow(hWnd, FALSE);
 
             newlinenr = NODE_LINENR(node);
             rcInv.left = 0;
@@ -2104,12 +2103,10 @@ static void teOnChar (HWND hWnd, PTEDATA ptedata, WPARAM wParam)
                 rcInv.top += ptedata->nLineHeight;
                 rcInv.bottom = rcInv.top + ptedata->nLineHeight  - ptedata->nLineBaseH;
                 REFRESH_NODE_EX(node, &rcInv);
-             //   UpdateWindow(hWnd, FALSE);
             }
             /* houhh 20090814, UpdataWindow will invalidate all edit area, but
              * erase area is not same with msg_paint area.*/
-            UpdateWindow(hWnd, FALSE);
-            //SendMessage(hWnd, MSG_PAINT, 0, 0);
+            UpdateInvalidClient(hWnd, TRUE);
         }
     }
     else {

src/ex_ctrl/coolbar.c

@@ -15,7 +15,7 @@
  *   and Graphics User Interface (GUI) support system for embedded systems
  *   and smart IoT devices.
  *
- *   Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd.
+ *   Copyright (C) 2002~2022, Beijing FMSoft Technologies Co., Ltd.
  *   Copyright (C) 1998~2002, WEI Yongming
  *
  *   This program is free software: you can redistribute it and/or modify
@@ -283,7 +283,7 @@ static void DrawCoolBox (HWND hWnd, HDC hdc, PCOOLBARCTRL pdata)
             WINDOWINFO *info;
             RECT rc;
 
-            if (tmpdata->Caption == NULL || tmpdata->Caption [0] == '\0')
+            if (tmpdata->Caption [0] == '\0')
                 break;
 
             GetTextExtent (hdc, tmpdata->Caption, -1, &size);

src/ex_ctrl/gridview.c

@@ -80,17 +80,17 @@ static void update_viewport (gvGridViewData *view, int from, int to, int is_row)
 {
     RECT r;
 
-    GetClientRect (view->hCtrl, &r);
+    GetClientRect(view->hCtrl, &r);
 
     if (is_row) {
         r.top = from;
-        ScrollWindow (view->hCtrl, 0, to, &r, NULL);
+        ScrollWindow(view->hCtrl, 0, to, &r, NULL);
     }
     else {
         r.left = from;
-        ScrollWindow (view->hCtrl, to, 0, &r, NULL);
+        ScrollWindow(view->hCtrl, to, 0, &r, NULL);
     }
-    UpdateWindow(view->hCtrl, FALSE);
+    UpdateInvalidClient(view->hCtrl, FALSE);
 }
 
 // scroll function {{{

src/ex_ctrl/iconview.c

@@ -157,6 +157,8 @@ static int isInItem (MgList *mglst, int mouseX, int mouseY,
 
     index = row * pivlist->nCol + col;
     pci = (IconviewItem *)mglist_getitem_byindex (mglst, index);
+    if (pci == NULL)
+        return -1;
 
     if (pRet)
         *pRet = (MgItem*)pci;

src/ex_ctrl/treeview.c

@@ -93,14 +93,15 @@ BOOL RegisterTreeViewControl (void)
     const WINDOW_ELEMENT_RENDERER * rdr =
         GetDefaultWindowElementRenderer();
 
-
-    if (!(icon_fold = (HICON)RetrieveRes(gui_GetIconFile(rdr->name, SYSICON_FOLD, szValue)))) {
+    if (!(icon_fold = (HICON)RetrieveRes(gui_GetIconFile(rdr->name,
+                        SYSICON_FOLD, szValue)))) {
         if (!(icon_fold = LoadSystemIcon (SYSICON_FOLD, 0))) {
             return FALSE;
         }
     }
 
-    if (!(icon_unfold = (HICON)RetrieveRes(gui_GetIconFile(rdr->name, SYSICON_UNFOLD, szValue)))) {
+    if (!(icon_unfold = (HICON)RetrieveRes(gui_GetIconFile(rdr->name,
+                        SYSICON_UNFOLD, szValue)))) {
         if (!(icon_unfold = LoadSystemIcon (SYSICON_UNFOLD, 0))) {
             DestroyIcon (icon_fold);
             icon_fold = 0;
@@ -180,6 +181,7 @@ static BOOL tvInitTVData (HWND hwnd, PTVDATA pData, DWORD dwStyle, PTVITEMINFO r
             tvRoot->hIconFold = root_ii->hIconFold;
         else
             tvRoot->hIconFold = ICON_FOLD;
+
         if (root_ii && root_ii->hIconUnfold)
             tvRoot->hIconUnfold = root_ii->hIconUnfold;
         else
@@ -632,22 +634,13 @@ static void tvDrawItem (HWND hWnd, HDC hdc, PTVDATA pData, int centerX, int cent
     centerX += (h>>1) + TV_BOXGAP;
 
     if (pData->dwStyle & TVS_WITHICON) {
-        if (!(pData->dwStyle & TVS_ICONFORSELECT)
-                && (!p->child || (p->dwFlags & TVIF_FOLD))) {
+        if (p->child != NULL && (p->dwFlags & TVIF_FOLD)) {
             if ((p->hIconFold)) {
-                DrawIcon (hdc, centerX, centerY - (h>>1),
-                        h, h, p->hIconFold);
-            }
-        } else if ((pData->dwStyle & TVS_ICONFORSELECT) && p->dwFlags & TVIF_SELECTED) {
-            if ((p->hIconFold)) {
-                DrawIcon (hdc, centerX, centerY - (h>>1),
-                        h, h, p->hIconFold);
-            }
-        } else
-            if ((p->hIconUnfold)) {
-                DrawIcon (hdc, centerX, centerY - (h>>1),
-                        h, h, p->hIconUnfold);
+                DrawIcon (hdc, centerX,  centerY - (h>>1), h, h, p->hIconFold);
             }
+        } else if ((p->hIconUnfold)) {
+            DrawIcon (hdc, centerX, centerY - (h>>1), h, h, p->hIconUnfold);
+        }
         centerX += h + TV_ICONGAP;
     }
 

src/font/charset-arabic.c

@@ -461,9 +461,8 @@ static int iso8859_6_len_first_char (const unsigned char* mstr, int len)
         return 2;
     else if (ignore == 2)
         return 3;
-    else
-        return 1;
 
+    return 1;
 }
 
 #define ISARABIC_LIG_HALF(s) ((s == 0xa5) || (s == 0xa6))
@@ -472,6 +471,7 @@ static unsigned int iso8859_6_char_type (Achar32 chv)
 {
     unsigned int ch_type = ACHAR_BASIC_UNKNOWN;
 
+    chv = REAL_ACHAR(chv);
     if (is_arabic_char_vowel (chv)) {  /* is vowel */
         ch_type = ACHAR_BASIC_VOWEL;
     }
@@ -483,7 +483,6 @@ static unsigned int iso8859_6_char_type (Achar32 chv)
 }
 
 static BidiType __mg_iso8859_6_bidi_char_type_map[] = {
-#if 0
     /*0x00~0x0f*/
     BIDI_TYPE_BN,  BIDI_TYPE_BN,  BIDI_TYPE_BN,  BIDI_TYPE_BN,
     BIDI_TYPE_BN,  BIDI_TYPE_BN,  BIDI_TYPE_BN,  BIDI_TYPE_BN,
@@ -531,7 +530,6 @@ static BidiType __mg_iso8859_6_bidi_char_type_map[] = {
     BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR,
     BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_ON,
     BIDI_TYPE_ON,  BIDI_TYPE_ON,  BIDI_TYPE_ON,  BIDI_TYPE_BN,
-#endif
 
     /*0x80~0x8f*/
     BIDI_TYPE_ON,  BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,
@@ -606,10 +604,9 @@ static BidiType __mg_iso8859_6_bidi_char_type_map[] = {
 static BidiType iso8859_6_bidi_char_type (Achar32 chv)
 {
     chv = REAL_ACHAR(chv);
-    if (chv > 0x7F)
-        return (BidiType)__mg_iso8859_6_bidi_char_type_map[chv - 0x80];
-    else
-        return (BidiType)__mg_iso8859_1_bidi_char_type_map[chv];
+    assert(chv < TABLESIZE(__mg_iso8859_6_bidi_char_type_map));
+
+    return (BidiType)__mg_iso8859_6_bidi_char_type_map[chv];
 }
 
 static int get_table_index(Uint8 c)
@@ -796,7 +793,7 @@ static const unsigned char* iso8859_6_get_next_word (const unsigned char* mstr,
 static Achar32 iso8859_6_get_shaped_char_value (const unsigned char* cur_mchar,
         int cur_len, int shape_type)
 {
-    Achar32 chv = -1;
+    Achar32 chv = INV_ACHAR_VALUE;
     int ignore;
     int index;
 
@@ -811,15 +808,14 @@ static Achar32 iso8859_6_get_shaped_char_value (const unsigned char* cur_mchar,
         }
     }
 
-    if (chv == -1 || chv == 0) {
+    if (chv == INV_ACHAR_VALUE || chv == 0) {
         if (ISARABIC_VOWEL(*cur_mchar)){
             chv = fontset_68x_get_vowel_char(*cur_mchar);
         }
 
-        if (chv == 0 || chv == -1) {
+        if (chv == 0 || chv == INV_ACHAR_VALUE) {
             index = get_table_index(*cur_mchar);
-            if (index >=0)
-            {
+            if (index >=0 ) {
                 switch (shape_type) {
                     case ACHAR_ISOLATED:
                         chv = shape_info[index].isolated;
@@ -841,7 +837,7 @@ static Achar32 iso8859_6_get_shaped_char_value (const unsigned char* cur_mchar,
     }
 
     if (chv == 0)
-        chv =-1;
+        chv = INV_ACHAR_VALUE;
 
     return chv;
 }
@@ -862,6 +858,7 @@ static const BIDICHAR_MIRROR_MAP __mg_iso8859_68x_mirror_table [] =
 
 static BOOL iso8859_6_bidi_mirror_char (Achar32 chv, Achar32* mirrored)
 {
+    chv = REAL_ACHAR(chv);
     return get_mirror_char (__mg_iso8859_68x_mirror_table,
             TABLESIZE (__mg_iso8859_68x_mirror_table), chv, mirrored);
 }

src/font/charset.c

@@ -49,6 +49,8 @@
 ** Create date: 2000/06/13
 */
 
+#undef NDEBUG
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -969,7 +971,6 @@ static const unsigned char* iso8859_8_get_next_word (const unsigned char* mstr,
 }
 
 static BidiType __mg_iso8859_8_bidi_char_type_map[] = {
-#if 0
     /*0x00~0x0f*/
     BIDI_TYPE_BN,  BIDI_TYPE_BN,  BIDI_TYPE_BN,  BIDI_TYPE_BN,
     BIDI_TYPE_BN,  BIDI_TYPE_BN,  BIDI_TYPE_BN,  BIDI_TYPE_BN,
@@ -1017,7 +1018,6 @@ static BidiType __mg_iso8859_8_bidi_char_type_map[] = {
     BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR,
     BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_LTR, BIDI_TYPE_ON,
     BIDI_TYPE_ON,  BIDI_TYPE_ON,  BIDI_TYPE_ON,  BIDI_TYPE_BN,
-#endif
 
     /*0x80~0x8f*/
     BIDI_TYPE_BN,  BIDI_TYPE_BN,  BIDI_TYPE_BN,  BIDI_TYPE_BN,
@@ -1072,10 +1072,9 @@ static BidiType __mg_iso8859_8_bidi_char_type_map[] = {
 static BidiType iso8859_8_bidi_char_type (Achar32 chv)
 {
     chv = REAL_ACHAR(chv);
-    if (chv > 0x7F)
-        return (BidiType)__mg_iso8859_8_bidi_char_type_map[chv - 0x80];
-    else
-        return (BidiType)__mg_iso8859_1_bidi_char_type_map[chv];
+    assert(chv < TABLESIZE(__mg_iso8859_8_bidi_char_type_map));
+
+    return (BidiType)__mg_iso8859_8_bidi_char_type_map[chv];
 }
 
 static const BIDICHAR_MIRROR_MAP __mg_iso8859_8_mirror_table [] =

src/font/freetype2.c

@@ -735,9 +735,9 @@ get_glyph_advance (LOGFONT* logfont, DEVFONT* devfont,
             pcache->valid_advance = 1;
         }
     }
+done:
 #endif
 
-done:
     FT_UNLOCK(&ft_lock);
 
     if (px) {

src/font/freetype2.h

@@ -88,7 +88,6 @@ typedef int (* MakeHashKeyFunc)(Glyph32 gv);
 typedef struct tagFTFACEINFO {
     char*       filepathname;
     FT_Face     face;
-    BOOL        valid;
 #ifdef _MGFONT_TTF_CACHE
     int         face_index;
     int         cmap_index;
@@ -163,13 +162,13 @@ extern void __mg_ttc_sys_deinit(void);
 extern TTFCACHEINFO *__mg_ttc_search(HCACHE hCache, Glyph32 gv, int *size);
 extern void __mg_ttc_refer(HCACHE hCache);
 
+#endif /* _MGFONT_TTF_CACHE */
+
 #ifdef _MGCOMPLEX_SCRIPTS
 extern void __mg_init_harzbuff_funcs(void);
 extern void __mg_term_harzbuff_funcs(void);
 #endif
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif  /* __cplusplus */

src/font/legacy-bidi.c

@@ -703,21 +703,20 @@ void __mg_legacy_bidi_get_embeddlevels (const CHARSETOPS* charset_ops,
     print_hexstr(achars, len, TRUE);
 }
 
-#if 0
 static void bidi_map_reverse (void* context, int len, int pos)
 {
-    GLYPHMAPINFO* str = (GLYPHMAPINFO*)context + pos;
+    ACHARMAPINFO* str = (ACHARMAPINFO*)context + pos;
     int i;
     for (i = 0; i < len / 2; i++)
     {
-        GLYPHMAPINFO tmp = str[i];
+        ACHARMAPINFO tmp = str[i];
         str[i] = str[len - 1 - i];
         str[len - 1 - i] = tmp;
     }
 }
 
 Achar32* __mg_legacy_bidi_map_reorder (const CHARSETOPS* charset_ops,
-        Achar32* achars, int len, GLYPHMAPINFO* map, int pel)
+        Achar32* achars, int len, int pel, ACHARMAPINFO* map)
 {
     BYTE max_level = 1;
     TYPERUN *type_rl_list = NULL;
@@ -725,6 +724,7 @@ Achar32* __mg_legacy_bidi_map_reorder (const CHARSETOPS* charset_ops,
     int i;
     int run_pos;
     int run_len;
+    REORDER_CONTEXT rc;
 
     print_hexstr(achars, len, FALSE);
 
@@ -741,8 +741,10 @@ Achar32* __mg_legacy_bidi_map_reorder (const CHARSETOPS* charset_ops,
         }
     }
 
-    bidi_reorder_cb(map, len, &type_rl_list, max_level,
-            bidi_map_reverse);
+    rc.achars = NULL;
+    rc.extra = map;
+    rc.cb = bidi_map_reverse;
+    bidi_reorder(&rc, len, &type_rl_list, max_level);
 
     /* free typerun list.*/
     free_typerun_list(type_rl_list);
@@ -752,18 +754,23 @@ Achar32* __mg_legacy_bidi_map_reorder (const CHARSETOPS* charset_ops,
     return achars;
 }
 
+#if 0
 Achar32* __mg_legacy_bidi_index_reorder (const CHARSETOPS* charset_ops,
         Achar32* achars, int len, int* index_map, int pel)
 {
     BYTE max_level = 1;
     TYPERUN *type_rl_list = NULL;
+    REORDER_CONTEXT rc;
 
     print_hexstr(achars, len, FALSE);
 
     /* W1~W7, N1~N2, I1~I2, Get the Embedding Level. */
     bidi_resolve_string (charset_ops, achars, len, pel, &type_rl_list, &max_level);
 
-    bidi_reorder_cb(index_map, len, &type_rl_list, max_level,
+    rc.achars = achars;
+    rc.extra = extra;
+    rc.cb = cb_reverse_extra;
+    bidi_reorder(index_map, len, &type_rl_list, max_level,
             bidi_string_reverse);
 
     /* free typerun list.*/

src/font/sysfont.c

@@ -155,7 +155,10 @@ BOOL mg_InitSysFont (void)
                 goto error_load;
             }
 
-            if ((sys_fonts[i] = CreateLogFont (type, family, charset,
+            /* VW 20221003: use CreateLogFontEx instead of CreateLogFont to
+               follow the new style convention of font name,
+               but the orientation is ignored for the system logfont. */
+            if ((sys_fonts[i] = CreateLogFontEx (type, family, charset,
                     style [0], style [1], style [2],
                     style [3], style [4], style [5],
                     height, 0)) == NULL) {

src/font/unicode-break.c

@@ -377,8 +377,8 @@ static _GBType resolve_gbt(struct break_ctxt* ctxt,
                 uc == 0x8E2 || uc == 0xD4E || uc == 0x110BD ||
                 (uc >= 0x111C2 && uc <= 0x111C3)) {
             gbt = GB_Prepend;
-            break;
         }
+        break;
 
     case UCHAR_CATEGORY_CONTROL:
     case UCHAR_CATEGORY_LINE_SEPARATOR:
@@ -393,8 +393,8 @@ static _GBType resolve_gbt(struct break_ctxt* ctxt,
         if ((uc >= 0xFFF0 && uc <= 0xFFF8) ||
                 (uc >= 0xE0000 && uc <= 0xE0FFF)) {
             gbt = GB_ControlCRLF;
-            break;
         }
+        break;
 
     case UCHAR_CATEGORY_OTHER_LETTER:
         if (ctxt->makes_hangul_syllable)
@@ -434,7 +434,6 @@ static _GBType resolve_gbt(struct break_ctxt* ctxt,
                 gbt = GB_RI_Odd;
             else
                 gbt = GB_RI_Odd;
-            break;
         }
         break;
 

src/gui/accelkey.c

@@ -59,7 +59,6 @@
 #include "cliprect.h"
 #include "gal.h"
 #include "internals.h"
-#include "blockheap.h"
 #include "accelkey.h"
 
 static BLOCKHEAP ACHeap;

src/gui/caret.c

@@ -59,17 +59,22 @@
 #include "cliprect.h"
 #include "gal.h"
 #include "internals.h"
+#include "dc.h"
 
 BOOL GUIAPI CreateCaret (HWND hWnd, PBITMAP pBitmap, int nWidth, int nHeight)
 {
     PMAINWIN pWin;
-
     pWin = (PMAINWIN)hWnd;
 
     if (!pWin->pCaretInfo) {
+        HDC hdc;
+
         if (!(pWin->pCaretInfo = malloc (sizeof (CARETINFO))))
             return FALSE;
 
+        /* Since 5.0.11: use client DC of the window instead of screen DC */
+        hdc = GetClientDC(hWnd);
+
         pWin->pCaretInfo->pBitmap = pBitmap;
         if (pBitmap) {
             nWidth  = pBitmap->bmWidth;
@@ -78,18 +83,22 @@ BOOL GUIAPI CreateCaret (HWND hWnd, PBITMAP pBitmap, int nWidth, int nHeight)
         pWin->pCaretInfo->nWidth  = nWidth;
         pWin->pCaretInfo->nHeight = nHeight;
         pWin->pCaretInfo->caret_bmp.bmType = BMP_TYPE_NORMAL;
-        pWin->pCaretInfo->caret_bmp.bmBitsPerPixel = BITSPERPHYPIXEL;
-        pWin->pCaretInfo->caret_bmp.bmBytesPerPixel = BYTESPERPHYPIXEL;
+        pWin->pCaretInfo->caret_bmp.bmBitsPerPixel =
+            GetGDCapability(hdc, GDCAP_BITSPP);
+        pWin->pCaretInfo->caret_bmp.bmBytesPerPixel =
+            GetGDCapability(hdc, GDCAP_BPP);
         pWin->pCaretInfo->caret_bmp.bmWidth = nWidth;
         pWin->pCaretInfo->caret_bmp.bmHeight = nHeight;
         pWin->pCaretInfo->caret_bmp.bmAlphaMask = NULL;
         pWin->pCaretInfo->caret_bmp.bmAlphaPitch = 0;
 
-        pWin->pCaretInfo->nBytesNr = GAL_GetBoxSize (__gal_screen,
+        pWin->pCaretInfo->nBytesNr = GAL_GetBoxSize (dc_HDC2PDC(hdc)->surface,
                         nWidth, nHeight, &pWin->pCaretInfo->caret_bmp.bmPitch);
         pWin->pCaretInfo->pNormal = malloc (pWin->pCaretInfo->nBytesNr);
         pWin->pCaretInfo->pXored  = malloc (pWin->pCaretInfo->nBytesNr);
 
+        ReleaseDC(hdc);
+
         if (pWin->pCaretInfo->pNormal == NULL ||
             pWin->pCaretInfo->pXored == NULL) {
             free (pWin->pCaretInfo);
@@ -219,8 +228,8 @@ void GetCaretBitmaps (PCARETINFO pCaretInfo)
     int i;
     int sx, sy;
     HDC hdc;
+    Uint32 amask;
 
-    // convert to screen coordinates
     sx = pCaretInfo->x;
     sy = pCaretInfo->y;
 
@@ -231,36 +240,68 @@ void GetCaretBitmaps (PCARETINFO pCaretInfo)
                     pCaretInfo->caret_bmp.bmWidth,
                     pCaretInfo->caret_bmp.bmHeight,
                     &pCaretInfo->caret_bmp);
+    amask = GetGDCapability(hdc, GDCAP_AMASK);
     ReleaseDC (hdc);
 
     // generate XOR bitmap.
-    if (pCaretInfo->pBitmap) {
+    if (amask == 0) {
         BYTE* normal;
         BYTE* bitmap;
         BYTE* xored;
 
         normal = pCaretInfo->pNormal;
-        bitmap = pCaretInfo->pBitmap->bmBits;
         xored  = pCaretInfo->pXored;
 
-        for (i = 0; i < pCaretInfo->nBytesNr; i++)
-            xored[i] = normal[i] ^ bitmap[i];
+        if (pCaretInfo->pBitmap) {
+            bitmap = pCaretInfo->pBitmap->bmBits;
+            for (i = 0; i < pCaretInfo->nBytesNr; i++)
+                xored[i] = normal[i] ^ bitmap[i];
+        }
+        else {
+            for (i = 0; i < pCaretInfo->nBytesNr; i++)
+                xored[i] = normal[i] ^ 0xFF;
+        }
     }
     else {
+        // Since 5.0.11: restore the alpha component if having alpha component.
+        int x, y;
         BYTE* normal;
         BYTE* xored;
-        BYTE xor_byte;
+        BYTE* bitmap = NULL;
+        gal_pixel pix_normal, pix_bitmap, pix_xored, bits_alpha;
 
-        if (BITSPERPHYPIXEL < 8)
-            xor_byte = 0x0F;
-        else
-            xor_byte = 0xFF;
+        for (y = 0; y < pCaretInfo->caret_bmp.bmHeight; y++) {
+            normal = pCaretInfo->pNormal + pCaretInfo->caret_bmp.bmPitch * y;
+            xored  = pCaretInfo->pXored  + pCaretInfo->caret_bmp.bmPitch * y;
+            if (pCaretInfo->pBitmap)
+                bitmap = pCaretInfo->pBitmap->bmBits +
+                    pCaretInfo->caret_bmp.bmPitch * y;
 
-        normal = pCaretInfo->pNormal;
-        xored  = pCaretInfo->pXored;
+            for (x = 0; x < pCaretInfo->caret_bmp.bmWidth; x++) {
 
-        for (i = 0; i < pCaretInfo->nBytesNr; i++)
-            xored[i] = normal[i] ^ xor_byte;
+                pix_normal = _mem_get_pixel(normal,
+                        pCaretInfo->caret_bmp.bmBytesPerPixel);
+                if (pCaretInfo->pBitmap) {
+                    pix_bitmap = _mem_get_pixel(bitmap,
+                            pCaretInfo->caret_bmp.bmBytesPerPixel);
+                }
+                else {
+                    pix_bitmap = 0xFFFFFFFF;
+                }
+
+                bits_alpha = pix_normal & amask;
+                pix_xored = pix_normal ^ pix_bitmap;
+                pix_xored &= ~amask;
+                pix_xored |= bits_alpha;
+                _mem_set_pixel(xored,
+                        pCaretInfo->caret_bmp.bmBytesPerPixel, pix_xored);
+
+                normal += pCaretInfo->caret_bmp.bmBytesPerPixel;
+                xored  += pCaretInfo->caret_bmp.bmBytesPerPixel;
+                if (pCaretInfo->pBitmap)
+                    bitmap += pCaretInfo->caret_bmp.bmBytesPerPixel;
+            }
+        }
     }
 }
 

src/gui/lf_manager.c

@@ -15,7 +15,7 @@
  *   and Graphics User Interface (GUI) support system for embedded systems
  *   and smart IoT devices.
  *
- *   Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd.
+ *   Copyright (C) 2002~2022, Beijing FMSoft Technologies Co., Ltd.
  *   Copyright (C) 1998~2002, WEI Yongming
  *
  *   This program is free software: you can redistribute it and/or modify
@@ -803,7 +803,7 @@ BOOL GUIAPI InitWindowElementAttrs (PWERENDERER rdr)
     char buff [20];
     DWORD rgba;
 
-    if (!rdr || !rdr->name || rdr->name[0] == '\0')
+    if (!rdr || rdr->name[0] == '\0')
         return FALSE;
 
     _DBG_PRINTF ("GUI>InitWEA: Initialize %s renderer window element attributes.\n",

src/gui/menu.c

@@ -71,7 +71,6 @@
 #include "cliprect.h"
 #include "gal.h"
 #include "internals.h"
-#include "blockheap.h"
 #include "menu.h"
 
 #define SHORTEN 0

src/gui/window.c

@@ -75,9 +75,6 @@
 #ifdef _MG_ENABLE_LICENSE
 #   include "../sysres/license/c_files/04_progressbar-bk.dat.c"
 #endif
-#ifndef __TARGET_UNKNOWN__
-unsigned int g_license_processor_id;
-#endif
 
 #ifdef _MGHAVE_MENU
 /* function defined in menu module. */
@@ -96,9 +93,8 @@ void GUIAPI SetAutoRepeatMessage (HWND hWnd, UINT uMsg,
 {
     MSG msg;
 
-    if (hWnd) {
-        if (!MG_IS_NORMAL_WINDOW(hWnd))
-            return;
+    if (hWnd && !MG_IS_NORMAL_WINDOW(hWnd)) {
+        return;
     }
 
     msg.hwnd = hWnd;
@@ -141,7 +137,7 @@ static void RecalcClientArea (HWND hWnd)
 
             if (pWin->secondaryDC == HDC_INVALID) {
                 /* remove the flag of WS_EX_AUTOSECONDARYDC */
-                pWin->dwExStyle = pWin->dwExStyle | WS_EX_AUTOSECONDARYDC;
+                pWin->dwExStyle &= ~WS_EX_AUTOSECONDARYDC;
                 pWin->secondaryDC = 0;
             }
 
@@ -368,11 +364,6 @@ HWND GUIAPI ChildWindowFromPointEx (HWND hParent, POINT pt, UINT uFlags)
     return pRet;
 }
 
-/* NOTE:
- ** this function is CONTROL mouse messages handler,
- ** can automaticly capture mouse depend on HITTEST code.
- */
-
 static PCONTROL __mgs_captured_ctrl = NULL;
 
 void __mg_reset_mainwin_capture_info (PCONTROL ctrl)
@@ -391,6 +382,11 @@ void __mg_reset_mainwin_capture_info (PCONTROL ctrl)
     }
 }
 
+/* NOTE:
+ ** this function is CONTROL mouse messages handler,
+ ** can automaticly capture mouse depend on HITTEST code.
+ */
+
 static LRESULT DefaultDTMouseMsgHandler (PMAINWIN pWin, UINT message,
         WPARAM flags, int x, int y)
 {
@@ -2228,6 +2224,13 @@ static LRESULT DefaultPostMsgHandler(PMAINWIN pWin, UINT message,
         OnQueryClientArea(pWin, (PRECT)lParam);
         break;
 
+    case MSG_ACTIVE:
+        if (wParam)
+            pWin->dwExStyle |= WS_EX_ACTIVATED;
+        else
+            pWin->dwExStyle &= ~WS_EX_ACTIVATED;
+        break;
+
     case MSG_SETFOCUS:
     case MSG_KILLFOCUS:
         if (pWin->hActiveChild && !lParam)
@@ -2401,8 +2404,9 @@ static void wndDrawNCFrame(MAINWIN* pWin, HDC hdc, const RECT* prcInvalid)
     }
 #endif
 
-    if (fGetDC)
+    if (fGetDC) {
         release_effective_dc (pWin, hdc);
+    }
 }
 
 /* this function is CONTROL safe. */
@@ -2599,23 +2603,44 @@ static LRESULT DefaultSessionMsgHandler(PMAINWIN pWin, UINT message,
     return 0;
 }
 
+#if 0
+static HWND get_active_descendant(PMAINWIN pWin)
+{
+    HWND hwnd = (HWND)pWin;
+    HWND active;
+
+    while ((active = )) {
+        hwnd = active;
+    }
+
+    if (hwnd == (HWND)pWin)
+        return HWND_NULL;
+
+    return hwnd;
+}
+#endif
+
 static LRESULT DefaultSystemMsgHandler(PMAINWIN pWin, UINT message,
         WPARAM wParam, LPARAM lParam)
 {
-
     /*
      ** Should handle following messages:
      **
      ** MSG_IDLE, MSG_CARETBLINK:
      */
     if (message == MSG_IDLE) {
-#if 0   /* deprecated code */
-        if (pWin == checkAndGetMainWinIfWindow (sg_repeat_msg.hwnd)) {
-            SendNotifyMessage (sg_repeat_msg.hwnd,
-                    sg_repeat_msg.message,
-                    sg_repeat_msg.wParam, sg_repeat_msg.lParam);
+        /* Since 5.0.10, MSG_IDLE will also be relayed to
+           the active child control if the main window is active currently */
+        if (pWin->dwExStyle & WS_EX_ACTIVATED) {
+            HWND active = GetFocusChild((HWND)pWin);
+            if (active) {
+                static DWORD last_tick_count;
+                if (wParam >= last_tick_count + 50) {    /* 0.5s */
+                    PostMessage(active, MSG_IDLE, wParam, lParam);
+                    last_tick_count = wParam;
+                }
+            }
         }
-#endif  /* deprecated code */
     }
     else if (message == MSG_CARETBLINK && pWin->dwStyle & WS_VISIBLE) {
         BlinkCaret ((HWND)pWin);
@@ -2675,18 +2700,32 @@ LRESULT PreDefMainWinProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam
 
 LRESULT PreDefControlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    if (message == MSG_SETTEXT)
+    switch (message) {
+    case MSG_SETTEXT:
         return 0;
-    else if (message == MSG_SETCURSOR) {
+
+    case MSG_IDLE:
+        {
+            HWND active = GetFocusChild(hWnd);
+            if (active) {
+                PostMessage(active, MSG_IDLE, wParam, lParam);
+            }
+        }
+        return 0;
+
+    case MSG_SETCURSOR:
         if (GetWindowExStyle (hWnd) & WS_EX_USEPARENTCURSOR)
             return 0;
 
         SetCursor (GetWindowCursor (hWnd));
         return 0;
-    }
-    else if (message == MSG_NCSETCURSOR) {
+
+    case MSG_NCSETCURSOR:
         SetCursor (GetSystemCursor (IDC_ARROW));
         return 0;
+
+    default:
+        break;
     }
 
     return DefaultMainWinProc (hWnd, message, wParam, lParam);
@@ -2994,6 +3033,7 @@ HWND GUIAPI GetFirstHosted (HWND hWnd)
     PMAINWIN pMainWin;
 
     if ((pMainWin = getMainWinIfWindowInThisThread (hWnd)) == NULL) {
+        _WRN_PRINTF("hWnd (%p) is not in the current thread\n", hWnd);
         return HWND_INVALID;
     }
 
@@ -3007,6 +3047,7 @@ HWND GUIAPI GetNextHosted (HWND hHosting, HWND hHosted)
     PMAINWIN pHosted;
 
     if ((pHosting = getMainWinIfWindowInThisThread (hHosting)) == NULL) {
+        _WRN_PRINTF("hHosing (%p) is not in the current thread\n", hHosting);
         return HWND_INVALID;
     }
 
@@ -3015,10 +3056,13 @@ HWND GUIAPI GetNextHosted (HWND hHosting, HWND hHosted)
     }
 
     if ((pHosted = getMainWinIfWindowInThisThread (hHosted)) == NULL) {
+        _WRN_PRINTF("hHosted (%p) is not in the current thread\n", hHosted);
         return HWND_INVALID;
     }
 
     if (MG_UNLIKELY (pHosted->pHosting != pHosting)) {
+        _ERR_PRINTF("Bad hosting relationship between hosting(%p) and hosted(%p)\n",
+                pHosting, pHosted);
         return HWND_INVALID;
     }
 
@@ -3039,11 +3083,6 @@ static PMAINWIN search_win_tree_dfs (struct _search_context *ctxt)
     while (hosted) {
         PMAINWIN found;
 
-        ctxt->hosting = hosted;
-        if ((found = search_win_tree_dfs (ctxt))) {
-            return found;
-        }
-
         if (hosted->id == ctxt->id &&
                 (((ctxt->flags & WIN_SEARCH_FILTER_MAIN) &&
                 hosted->WinType == TYPE_MAINWIN) ||
@@ -3052,6 +3091,11 @@ static PMAINWIN search_win_tree_dfs (struct _search_context *ctxt)
             return hosted;
         }
 
+        ctxt->hosting = hosted;
+        if ((found = search_win_tree_dfs (ctxt))) {
+            return found;
+        }
+
         hosted = GetNextHosted (hosting, hosted);
     }
 
@@ -3074,12 +3118,14 @@ static PMAINWIN search_win_tree_bfs (struct _search_context *ctxt)
             return hosted;
         }
 
-        ctxt->hosting = hosted;
-        if ((found = search_win_tree_bfs (ctxt))) {
-            return found;
+        if ((ctxt->hosting = GetNextHosted (hosting, hosted))) {
+            if ((found = search_win_tree_bfs (ctxt))) {
+                return found;
+            }
         }
 
-        hosted = GetNextHosted (hosting, hosted);
+        hosting = hosted;
+        hosted = GetFirstHosted (hosted);
     }
 
     return NULL;
@@ -3165,8 +3211,8 @@ HWND GUIAPI GetNextChild (HWND hWnd, HWND hChild)
 
 HWND GUIAPI GetNextMainWindow (HWND hMainWnd)
 {
-    MG_CHECK_RET (hMainWnd == HWND_NULL || MG_IS_NORMAL_MAIN_WINDOW (hMainWnd),
-            HWND_INVALID);
+    MG_CHECK_RET (hMainWnd == HWND_NULL ||
+            MG_IS_NORMAL_MAIN_WINDOW (hMainWnd), HWND_INVALID);
 
     return (HWND)SendMessage (HWND_DESKTOP,
             MSG_GETNEXTMAINWIN, (WPARAM)hMainWnd, 0L);
@@ -3198,7 +3244,7 @@ int GUIAPI ScrollWindowEx (HWND hWnd, int dx, int dy,
         rcScroll = rcClient;
 
     /*
-     * BUGFIX: if we scrolled all area, the all area must
+     * BUGFIX: if we scrolled all area, the whole area must
      * be set as invalidate (dongjunjie 2010/7/28)
      */
     if ((dx != 0 && abs(dx) >= RECTW(rcScroll)) ||
@@ -3705,6 +3751,8 @@ BOOL GUIAPI ShowScrollBar (HWND hWnd, int iSBar, BOOL bShow)
     return TRUE;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
 /* moved here from desktop.c; can be used on virtual window */
 static void guiAddNewHostedMainWindow (PMAINWIN pHosting, PMAINWIN pHosted)
 {
@@ -3756,6 +3804,7 @@ static void guiRemoveHostedMainWindow (PMAINWIN pHosting, PMAINWIN pHosted)
     }
 #endif  /* debug code */
 }
+#pragma GCC diagnostic pop
 
 /************************* Support for virtual window ************************/
 #ifdef _MGHAVE_VIRTUAL_WINDOW
@@ -3776,29 +3825,32 @@ static void* _message_thread_entry (void* arg)
         goto failed;
 
     /* create message queue for this thread */
-    if (!(entry_args.msg_queue = mg_AllocMsgQueueForThisThread ()))
+    if (!(entry_args.msg_queue = mg_AllocMsgQueueForThisThread (FALSE)))
         goto failed;
 
     orig_args->msg_queue = entry_args.msg_queue;
     sem_post (entry_args.wait);
 
+    /* register the message queue */
     SendMessage (HWND_DESKTOP, MSG_MANAGE_MSGTHREAD,
             MSGTHREAD_SIGNIN, (LPARAM)&entry_args.msg_queue);
 
     if (pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL))
-        goto failed;
+        goto cancelled;
 
     /* call start routine of app */
     entry_args.start_routine (entry_args.arg);
 
+    /* unregister the message queue */
     SendMessage (HWND_DESKTOP, MSG_MANAGE_MSGTHREAD,
             MSGTHREAD_SIGNOUT, (LPARAM)&entry_args.msg_queue);
-    mg_FreeMsgQueueForThisThread ();
+    mg_FreeMsgQueueForThisThread (FALSE);
 
     return NULL;
 
 failed:
     sem_post (entry_args.wait);
+cancelled:
     return NULL;
 }
 
@@ -3903,9 +3955,7 @@ HWND GUIAPI CreateVirtualWindow (HWND hHosting, WNDPROC WndProc,
         if (pMsgQueue != getMsgQueueIfWindowInThisThread (hHosting)) {
             goto err;
         }
-        else {
-            pVirtWin->pHosting = (PVIRTWIN)hHosting;
-        }
+        pVirtWin->pHosting = (PVIRTWIN)hHosting;
     }
 
     if (SendMessage ((HWND)pVirtWin, MSG_CREATE,
@@ -4208,10 +4258,8 @@ HWND GUIAPI CreateMainWindowEx2 (PMAINWINCREATE pCreateInfo, LINT id,
         if (pWin->pMsgQueue != getMsgQueue (pCreateInfo->hHosting)) {
             goto err;
         }
-    }
-
-    if (pWin->pHosting == NULL)
         pWin->pHosting = getMainWindowPtr (pCreateInfo->hHosting);
+    }
 
 #else   /* defined _MGRM_THREADS */
 
@@ -4495,7 +4543,7 @@ BOOL GUIAPI DestroyMainWindow (HWND hWnd)
         }
         else
 #endif  /* defined _MGHAVE_VIRTUAL_WINDOW */
-        if (pWin->dwExStyle & WS_EX_DIALOGBOX) {
+        if (hosted->dwExStyle & WS_EX_DIALOGBOX) {
             if (!EndDialog ((HWND)hosted, IDCANCEL))
                 return FALSE;
         }
@@ -4530,11 +4578,6 @@ BOOL GUIAPI DestroyMainWindow (HWND hWnd)
 
     SendMessage (HWND_DESKTOP, MSG_REMOVEMAINWIN, (WPARAM)hWnd, 0);
 
-#if 0   /* deprecated code */
-    if (sg_repeat_msg.hwnd == hWnd)
-        sg_repeat_msg.hwnd = 0;
-#endif  /* deprecated code */
-
     /* make the window to be invalid for PeekMessageEx, PostMessage etc */
     pWin->DataType = TYPE_WINTODEL;
 
@@ -6086,11 +6129,6 @@ BOOL GUIAPI DestroyWindow (HWND hWnd)
         pCtrl->privCDC = 0;
     }
 
-#if 0   /* deprecated code */
-    if (sg_repeat_msg.hwnd == hWnd)
-        sg_repeat_msg.hwnd = 0;
-#endif  /* deprecated code */
-
     ThrowAwayMessages (hWnd);
 
     if (pCtrl->dwExStyle & WS_EX_CTRLASMAINWIN) {
@@ -7026,6 +7064,19 @@ BOOL GUIAPI SetMainWindowAlwaysTop (HWND hMainWnd, BOOL fSet)
             MSG_SETALWAYSTOP, (WPARAM)pMainWin, (LPARAM)fSet);
 }
 
+/* Since 5.0.6 */
+BOOL GUIAPI SetMainWindowGestureFlags (HWND hMainWnd, DWORD dwFlags)
+{
+    PMAINWIN pMainWin;
+
+    if (!(pMainWin = checkAndGetMainWinIfMainWin (hMainWnd))) {
+        return FALSE;
+    }
+
+    return (BOOL)SendMessage (HWND_DESKTOP,
+            MSG_SETGESTUREFLAGS, (WPARAM)pMainWin, (LPARAM)dwFlags);
+}
+
 #ifdef _MGSCHEMA_COMPOSITING
 BOOL GUIAPI SetMainWindowCompositing (HWND hMainWnd, int type, DWORD arg)
 {

src/ial/Makefile.am

@@ -50,6 +50,7 @@ DFB_SRCS = dfb.h dfb.c
 
 USVFB_SRCS = usvfbinput.c usvfbinput.h
 LIBINPUT_SRCS = linux-libinput.c linux-libinput.h
+SINGLETOUCHKEY_SRCS = singletouchkey.c singletouchkey.h
 
 if MGIAL_CONSOLE
 native_libial_la_LIBADD = native/libnative.la
@@ -76,4 +77,5 @@ libial_la_SOURCES = $(COMMON_SRCS) $(DUMMY_SRCS) $(JZ4740_SRCS) \
                     $(COMMINPUT_SRCS) $(QVFB_SRCS) $(WVFB_SRCS) \
 					$(QEMU_SRCS) $(IPAQ_H3600_SRCS) $(IPAQ_H5400_SRCS) \
 					$(TSLIB_SRCS) $(SHANDONG_LIDE_SRCS) $(CISCO_TOUCHPAD_SRCS) \
-					$(MSTAR_SRCS) $(DFB_SRCS) $(USVFB_SRCS) $(LIBINPUT_SRCS)
+					$(MSTAR_SRCS) $(DFB_SRCS) $(USVFB_SRCS) $(LIBINPUT_SRCS) \
+					$(SINGLETOUCHKEY_SRCS)

src/ial/ial.c

@@ -15,7 +15,7 @@
  *   and Graphics User Interface (GUI) support system for embedded systems
  *   and smart IoT devices.
  *
- *   Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd.
+ *   Copyright (C) 2002~2020, Beijing FMSoft Technologies Co., Ltd.
  *   Copyright (C) 1998~2002, WEI Yongming
  *
  *   This program is free software: you can redistribute it and/or modify
@@ -133,6 +133,9 @@
 #ifdef _MGIAL_LIBINPUT
     #include "linux-libinput.h"
 #endif
+#ifdef _MGIAL_SINGLETOUCHKEY
+    #include "singletouchkey.h"
+#endif
 
 static INPUT inputs [] =
 {
@@ -212,6 +215,9 @@ static INPUT inputs [] =
 #ifdef _MGIAL_LIBINPUT
     {"libinput", ial_InitLibInput, TermLibInput},
 #endif
+#ifdef _MGIAL_SINGLETOUCHKEY
+    {"singletouchkey", ial_InitSingleTouchKey, TermSingleTouchKey},
+#endif
 /* ... end of general IAL engines */
 };
 

src/ial/linux-tty.c

@@ -65,7 +65,6 @@
 #include <sys/time.h>
 #include <linux/vt.h>
 #include <linux/kd.h>
-#include <linux/keyboard.h>
 
 #include "gdi.h"
 #include "window.h"

src/ial/native/kbd_event.c

@@ -67,8 +67,6 @@
 #include "gal.h"
 #include "native.h"
 
-static const char* event_dev;
-
 static int  EVENT_Open(const char *);
 static void EVENT_Close(void);
 static void EVENT_GetModifierInfo(int *modifiers);
@@ -85,6 +83,7 @@ KBDDEVICE kbddev_event = {
     EVENT_Resume
 };
 
+static char* kbd_dev;
 static int kbd_fd;        /* file descriptor for keyboard */
 
 /*
@@ -144,6 +143,7 @@ static int EVENT_Open (const char *device)
     if (kbd_fd < 0)
         return -1;
 
+    kbd_dev = strdup (device);
     return kbd_fd;
 }
 
@@ -153,8 +153,11 @@ static int EVENT_Open (const char *device)
  */
 static void EVENT_Close(void)
 {
-    close(kbd_fd);
+    close (kbd_fd);
     kbd_fd = -1;
+
+    free (kbd_dev);
+    kbd_dev = NULL;
 }
 
 /*
@@ -203,7 +206,8 @@ static int EVENT_Read(unsigned char *buf, int *modifiers)
  */
 static void EVENT_Suspend(void)
 {
-    EVENT_Close();
+    close (kbd_fd);
+    kbd_fd = -1;
 }
 
 /* deactivate_keyboard:
@@ -211,10 +215,12 @@ static void EVENT_Suspend(void)
  */
 static int EVENT_Resume(void)
 {
-    kbd_fd = open (event_dev, O_NONBLOCK);
+    kbd_fd = open (kbd_dev, O_NONBLOCK);
     if (kbd_fd < 0) {
         return -1;
-    }else{
+    }
+    else {
         return kbd_fd;
     }
 }
+

src/ial/native/native.c

@@ -56,7 +56,6 @@
 #include <sys/ioctl.h>
 #include <signal.h>
 #include <linux/kd.h>
-#include <linux/keyboard.h>
 #include <errno.h>
 
 #include "common.h"

src/ial/pcxvfbial.c

@@ -319,6 +319,19 @@ static void flush_rec (void)
 #endif
 }
 
+static void close_rec (void)
+{
+#ifdef WIN32
+    /* TODO: */
+#else
+    if (record_fd >= 0) {
+        close(record_fd);
+        record_fd = -1;
+    }
+#endif
+}
+
+
 
 static void do_record(AUTO_IAL_INPUT_EVENT *event)
 {
@@ -744,6 +757,7 @@ void TermPCXVFBInput (void)
         remove("/tmp/.pcxvfb_tmp");
     }
 #endif
+    close_rec();
 #endif /* WIN32 */
 }
 

src/ial/singletouchkey.c

@@ -0,0 +1,252 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//                          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
+//
+//////////////////////////////////////////////////////////////////////////////
+/*
+ *   This file is part of MiniGUI, a mature cross-platform windowing
+ *   and Graphics User Interface (GUI) support system for embedded systems
+ *   and smart IoT devices.
+ *
+ *   Copyright (C) 2002~2020, Beijing FMSoft Technologies Co., Ltd.
+ *   Copyright (C) 1998~2002, WEI Yongming
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is 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/>.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "common.h"
+
+#ifdef _MGIAL_SINGLETOUCHKEY
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <linux/input.h>
+
+#include "minigui.h"
+#include "misc.h"
+#include "ial.h"
+
+#include "singletouchkey.h"
+
+#define LEN_TOUCH_DEV     127
+
+static int sg_tp_event_fd = -1, sg_key_event_fd = -1;
+static short MOUSEX = 0, MOUSEY = 0, MOUSEBUTTON = 0;
+
+static int get_touch_data (short *x, short *y, short *button)
+{
+    struct input_event data;
+
+    while (read (sg_tp_event_fd, &data, sizeof (data)) == sizeof (data)) {
+
+        /* do nothing for EV_SYN due to non-blocking read.
+        if (data.type == EV_SYN) {
+            if (data.code == SYN_REPORT) {
+                return 0;
+            }
+            else if (data.code == SYN_MT_REPORT) {
+                continue;
+            }
+            else {
+                return -1;
+            }
+        }
+        */
+
+        if (data.type == EV_KEY) {
+            switch (data.code) {
+            case BTN_TOUCH:
+                if (data.value > 0)
+                    *button = IAL_MOUSE_LEFTBUTTON;
+                else
+                    *button = 0;
+                break;
+
+            default:
+                _WRN_PRINTF ("unknow event code for EV_KEY event: 0x%x, 0x%x\n", data.code, data.value);
+                return -1;
+            }
+        }
+        else if (data.type == EV_ABS) {
+            switch (data.code) {
+            case ABS_X:
+                *x = data.value;
+                break;
+
+            case ABS_Y:
+                *y = data.value;
+                break;
+
+            case ABS_MT_POSITION_X:
+                *x = data.value;
+                break;
+
+            case ABS_MT_POSITION_Y:
+                *y = data.value;
+                break;
+
+            case ABS_MT_TOUCH_MAJOR:
+                break;
+
+            case ABS_MT_WIDTH_MAJOR:
+                break;
+
+            case ABS_MT_TRACKING_ID:
+                break;
+
+            default:
+                _WRN_PRINTF ("unknow event code for EV_ABS event: 0x%x, 0x%x.\n", data.code, data.value);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+static int mouse_update (void)
+{
+    if (get_touch_data (&MOUSEX, &MOUSEY, &MOUSEBUTTON) == 0)
+        return 1;
+
+    return 0;
+}
+
+static void mouse_getxy (int *x, int* y)
+{
+    *x = MOUSEX;
+    *y = MOUSEY;
+}
+
+static int mouse_getbutton (void)
+{
+    if (MOUSEBUTTON == IAL_MOUSE_LEFTBUTTON)
+        return IAL_MOUSE_LEFTBUTTON;
+
+    return 0;
+}
+
+static int wait_event (int which, int maxfd, fd_set *in, fd_set *out, fd_set *except,
+                struct timeval *timeout)
+{
+    fd_set rfds;
+    int e;
+    int retvalue = 0;
+
+    if (!in) {
+        in = &rfds;
+        FD_ZERO (in);
+    }
+
+    FD_SET (sg_tp_event_fd, in);
+    if (sg_tp_event_fd > maxfd) 
+        maxfd = sg_tp_event_fd;
+
+    if (sg_key_event_fd >= 0) {
+        FD_SET (sg_key_event_fd, in);
+        if (sg_key_event_fd > maxfd) 
+            maxfd = sg_key_event_fd;
+    }
+
+    e = select (maxfd + 1, in, out, except, timeout);
+    if (e > 0) {
+        if (FD_ISSET (sg_tp_event_fd, in)) {
+            retvalue |= IAL_MOUSEEVENT;
+        }
+        if (sg_key_event_fd >= 0 && FD_ISSET (sg_key_event_fd, in)) {
+            retvalue |= IAL_KEYEVENT;
+        }
+    }
+    else if (e < 0) {
+        retvalue = -1;
+    }
+    else {
+        retvalue = 0;
+    }
+
+    return retvalue;
+}
+
+BOOL ial_InitSingleTouchKey (INPUT* input, const char* mdev, const char* mtype)
+{
+    char touch_dev[LEN_TOUCH_DEV + 1];
+    if (GetMgEtcValue ("singletouchkey", "touch_dev", touch_dev, LEN_TOUCH_DEV) < 0) {
+        strcpy (touch_dev, "none");
+    }
+
+    if (strcmp (touch_dev, "none") == 0) {
+        _WRN_PRINTF ("no touch_dev defined.\n");
+        return FALSE;
+    }
+
+    sg_tp_event_fd = open (touch_dev, O_RDONLY | O_NONBLOCK);
+    if (sg_tp_event_fd < 0) {
+        _WRN_PRINTF ("failed when opening touch event device: %s\n", touch_dev);
+        return FALSE;
+    }
+
+    input->update_mouse = mouse_update;
+    input->get_mouse_xy = mouse_getxy;
+    input->set_mouse_xy = NULL;
+    input->get_mouse_button = mouse_getbutton;
+    input->set_mouse_range = NULL;
+    input->suspend_mouse= NULL;
+    input->resume_mouse = NULL;
+
+    input->update_keyboard = NULL;
+    input->get_keyboard_state = NULL;
+    input->suspend_keyboard = NULL;
+    input->resume_keyboard = NULL;
+    input->set_leds = NULL;
+
+    input->wait_event = wait_event;
+
+    return TRUE;
+}
+
+void TermSingleTouchKey (void)
+{
+    if (sg_tp_event_fd >= 0)
+        close (sg_tp_event_fd);
+
+    if (sg_key_event_fd >= 0)
+        close (sg_key_event_fd);
+}
+
+#endif /* _MGIAL_SINGLETOUCHKEY */
+

src/ial/singletouchkey.h

@@ -0,0 +1,68 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//                          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
+//
+//////////////////////////////////////////////////////////////////////////////
+/*
+ *   This file is part of MiniGUI, a mature cross-platform windowing
+ *   and Graphics User Interface (GUI) support system for embedded systems
+ *   and smart IoT devices.
+ *
+ *   Copyright (C) 2002~2020, Beijing FMSoft Technologies Co., Ltd.
+ *   Copyright (C) 1998~2002, WEI Yongming
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is 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/>.
+ */
+/*
+** linux-libinput.h: the head file of the IAL engine based on libinput.
+**
+** Created by Wei YongMing, 2019/06/10
+*/
+
+#ifndef GUI_IAL_SINGLETOUCHKEY_H
+#define GUI_IAL_SINGLETOUCHKEY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+BOOL ial_InitSingleTouchKey (INPUT* input, const char* mdev, const char* mtype);
+void TermSingleTouchKey (void);
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+
+#endif  /* GUI_IAL_SINGLETOUCHKEY_H */
+
+

src/include/Makefile.am

@@ -3,7 +3,7 @@ noinst_HEADERS = \
     cursor.h dc.h event.h list.h element.h \
     ial.h inline.h internals.h zorder.h menu.h misc.h \
     msgstr.h sysfont.h timer.h devfont.h fontname.h \
-    readbmp.h icon.h blockheap.h rbtree.h \
+    readbmp.h icon.h rbtree.h \
     ourhdr.h client.h server.h sharedres.h sockio.h drawsemop.h \
     gal.h newgal.h memops.h incoreres.h sysres.h clipboard.h \
     glyph.h license.h mgsock.h unicode-ops.h \