Update version to 5.0.17

fix a compilation error about bool type
Merge remote-tracking branch 'origin/drm-page-flip'
2026-09-23 08:33:55 +08:00 · 2026-02-07 11:55:11 +08:00 · 2026-02-07 11:48:05 +08:00 · 2026-02-07 11:31:00 +08:00 · 2026-02-03 22:40:14 +08:00 · 2026-02-03 22:30:41 +08:00
221 changed files with 13505 additions and 17142 deletions
@@ -10,6 +10,7 @@ Makefile
 Makefile.in
 .deps/
 .libs/
+m4/*.m4
 /acinclude.m4
 /aclocal.m4
 /autom4te.cache
@@ -21,6 +22,7 @@ Makefile.in
 /depcomp
 /install-sh
 /libtool
+/ltmain.sh
 /*.pc
 /*config.h
 /*config.h.in
@@ -29,3 +31,4 @@ Makefile.in
 /src/font/utils/ucd/
 /src/sysres/font_list
 /src/sysres/license/dat_files/
+/configure~
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src 3rd-party include rtos etc m4 cmake build

 EXTRA_DIST = minigui.pc.in \
@@ -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,15 +83,15 @@ The following chart shows the graphics stack of HybridOS:

 ```
  -----------------------------------------------
- |           MiniGUI/HybridOS Apps               |
+ |               MiniGUI/HVML Apps               |
 |-----------------------------------------------|
- |           |         (Graphics Stack)          |
- |           |              ---------------------|
- |           |              | hiMesa             |
- |           | hiCairo      |  ------------------|
- |           | MiniGUI      |  | EGL for MiniGUI |
- | C++ libs  | hiDRMDrivers |  | GL, GLES, VG    |
- | C libs    | libDRM       |  | GPU drivers     |
+ |          |         (Graphics Stack)           |
+ |          |                --------------------|
+ |          |               |    Mesa-HBD        |
+ |          | Cairo-HBD     |  ------------------|
+ |          | MiniGUI       |  | EGL for MiniGUI |
+ | C++ libs | HBDDRMDrivers |  | GL, GLES, VG    |
+ | C libs   | libDRM        |  | GPU drivers     |
 |-----------------------------------------------|
 |  Linux Kernel                                 |
 |            -----------------------------------|
@@ -137,14 +99,13 @@ 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
+- `HBDDRMDrivers` contains the drivers (user land drivers, not kernel drivers) for
   MiniGUI DRM engine. The drivers implement the basic hardware accelerated
   2D graphics operations of various GPUs for MiniGUI.
- `hiMesa` is the Mesa derivative for HybridOS, while Mesa is the open source
+- `Mesa-HBD` is the Mesa derivative for HybridOS, while Mesa is the open source
  implementation of OpenGL and other graphics APIs, including OpenGL ES
  (versions 1, 2, 3), OpenCL, OpenMAX, and Vulkan. It contains the following
  components:
@@ -152,13 +113,17 @@ the following software:
     graphics APIs.
   + The EGL implementation for MiniGUI platform.
   + The graphics drivers for various GPUs and a software driver called `swrast`.
- `hiCairo` is the Cairo derivative for HybridOS. Cairo is a 2D vector graphics
+- `Cairo-HBD` is the Cairo derivative for HybridOS. Cairo is a 2D vector graphics
  library for Gtk. We provide support for MiniGUI backend in `hiCairo`.

 For more information about HybridOS, please refer to:

 <https://hybridos.fmsoft.cn/>

+For more information about HVML, please refer to:
+
+<https://hvml.fmsoft.cn/> or <https://www.hvml.org>
+
 ### Source Code Repositories

 FMSoft had created the public repositories for MiniGUI Core, MiniGUI
@@ -167,17 +132,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 +358,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,9 +412,55 @@ 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
+27 years have pasted since MiniGUI was initially created at
 the end of 1998, and now it becomes much reliable and stable.
 During the past years, many remarkable changes have taken place in
 the MiniGUI project.
@@ -549,15 +562,19 @@ 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.
+1. Aug., 2023:     FMSoft released MiniGUI version 5.0.13.
+1. May., 2025:     FMSoft released MiniGUI version 5.0.16.

 ## 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 ~ 2025, 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 +646,19 @@ 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://minigui.fmsoft.cn
+[HVML Official Site]: https://hvml.fmsoft.cn
+[Vincent Wei]: https://github.com/VincentWei
+
+[MiniGUI]: https://github.com/VincentWei
+[HybridOS]: https://github.com/HybridOS2
+[HVML]: https://github.com/HVML
+[PurC]: https://github.com/HVML/PurC
+[xGUI Pro]: https://github.com/HVML/xGUI-Pro
+[WebKit]: https://webkit.org
+
@@ -1,8 +1,33 @@
 # Release Notes

+- [Version 5.0.17](#version-5017)
+   + [What's new in version 5.0.17](#whats-new-in-version-5017)
+- [Version 5.0.16](#version-5016)
+   + [What's new in version 5.0.16](#whats-new-in-version-5016)
+- [Version 5.0.15](#version-5015)
+   + [What's new in version 5.0.15](#whats-new-in-version-5015)
+- [Version 5.0.13](#version-5013)
+   + [What's new in version 5.0.13](#whats-new-in-version-5013)
+- [Version 5.0.12](#version-5012)
+   + [What's new in version 5.0.12](#whats-new-in-version-5012)
+- [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)
   + [What's new in version 5.0.2](#whats-new-in-version-502)
-
 - [Version 5.0.0](#version-500)
   + [What's new in version 5.0.0](#whats-new-in-version-500)
   + [Compositing schema](#compositing-schema)
@@ -13,6 +38,256 @@
   + [Changes leading to incompatibility](#changes-leading-to-incompatibility)
   + [Deprecated APIs](#deprecated-apis)

+## Version 5.0.17
+
+On Feb. 07, 2026, FMSoft announces the availability of MiniGUI 5.0.17,
+which is a bugfix release with some minor enhancements of MiniGUI 5.0.x.
+
+* BUGFIXING:
+   - Fix legacy BIDI bracket reordering/mirroring for MBC Achar32.
+   - Fix wrong BIDI type mapping for ISO8859-6 0xEF.
+   - Fix a compilation error about bool type
+   - Fix Arabic letter 'ي' incorrectly using medial form at word start.
+* OPTIMIZATION:
+   - Use drmModePageFlip for drmVideo to fix screen tearing.
+
+## Version 5.0.16
+
+On May 27, 2025, FMSoft announces the availability of MiniGUI 5.0.16,
+which is a bugfix release with some minor enhancements of MiniGUI 5.0.x.
+
+* BUGFIXING:
+   - The desktop thread can not handle the request from other threads as soon as possible.
+   - The `MSG_TIMEOUT` message can not be fired correctly under MiniGUI-Threads mode.
+   - Bad subpixel rendering when background color is RGBA0000.
+* TUNING:
+   - Tune `configure.ac` and `Makefile.am` to use the system libtool scripts.
+   - Do not check `pciaccess` if the target architecture is not `i386`.
+
+## Version 5.0.15
+
+On May 09, 2025, FMSoft announces the availability of MiniGUI 5.0.15,
+which is an enhancement release with some minor enhancements
+of MiniGUI 5.0.x.
+
+* ENHANCEMENTS:
+   - Optimize NEWGAL engines: `shadow`, `drm`, and `fbcon` for large resolution.
+   - New APIs: `GetWindowSharedSurfaceFD()` and `CreateMemDCFromSharedSurfaceFD()` for compositing schema.
+* CHANGES:
+   - The operations for DRM userland driver changed.
+
+## Version 5.0.13
+
+On Aug. 31, 2023, FMSoft announces the availability of MiniGUI 5.0.13,
+which is an enhancement release with some minor enhancements
+of MiniGUI 5.0.x.
+
+### What's new in version 5.0.13
+
+In this version, we made some enhancements:
+
+* ENHANCEMENTS:
+   - Disable BIDI for text in UTF-8 charset by default.
+* CHANGES:
+   - Add `BIDI_FLAG_NONE` and `BIDI_FLAG_LEGACY`.
+* BUGFIXING:
+   - Ignore C0CTRL characters when renerding text.
+   - Support for vowels.
+
+## Version 5.0.12
+
+On May 10, 2023, FMSoft announces the availability of MiniGUI 5.0.12,
+which is an enhancement release with some minor enhancements
+of MiniGUI 5.0.x.
+
+### What's new in version 5.0.12
+
+In this version, we made some enhancements:
+
+* ENHANCEMENTS:
+  - Add new API `GetACharsExtentPointEx()`.
+  - Add new APIs `GetTabbedACharsExtent()`, `GetTabbedACharsExtentPoint()`,
+    and `GetTabbedACharsExtentPointEx()`.
+  - Enhance two APIs `GetTextExtentPoint()` and `GetTabbedTextExtentPoint()`
+    to support BIDI charsets.
+  - Tune management of tick count.
+* BUGFIXING:
+   - Fix a typo: `Achar2UChar()` to `AChar2UChar()`.
+
+## 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,
+which is the bug fixing release of MiniGUI 5.0.x.
+
+### What's new in version 5.0.3
+
+In this version, we fixed some bugs and made some minor enhancements:
+
+* BUGFIXING:
+   - Always check expired timers even got `EINTR`.
+   - Add static modifier to `refresh_dirty_region` method of the fallback compositor.
+   - Fix a bug in `RegisterListenFD`.
+   - Fix a bug in `allocate_more_fd_slots`.
+* TUNING:
+  - Rebuild the private data for all visible z-nodes after selected a new compositor.
+* ENHANCEMENTS:
+  - New configuration option: `--enable-mgslicefallback` to build a fallback
+    implementation of mgslice.
+  - New API: `ServerGetTopmostZNodeOfType`.
+  - Merge some code by @ehello (<https://github.com/ehello>) for FreeRTOS.
+
 ## Version 5.0.2

 The MiniGUI development team announces the availability of MiniGUI 5.0.2,
@@ -1,11 +1,11 @@
-Version 5.0.0 (2019/03/30)
+Version 5.0.17 (2026/02/07)

-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`
@@ -1,6 +1,7 @@
 #!/bin/sh

-cat m4/*.m4 > acinclude.m4
+libtoolize
+cat m4/*.m4 > aclocal.m4
 aclocal
 autoheader
 automake --add-missing --foreign --copy
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+rm config.cache config.status -f
+
+./configure \
+--disable-shared                           \
+--enable-static                            \
+--with-osname=freertos                     \
+--with-targetname=external                 \
+--with-runmode=sa                          \
+--enable-mgslicefallback                   \
+--disable-videopcxvfb                      \
+--disable-videoqvfb                        \
+--disable-videodrm                         \
+--disable-videofbcon                       \
+--enable-videocommlcd                      \
+--enable-dummyial                          \
+--disable-consoleial                       \
+--disable-libinputial                      \
+--enable-commial                           \
+--disable-consoleimps2                     \
+--disable-mousecalibrate                   \
+--enable-incoreres                         \
+--disable-cursor                           \
+--disable-clipboard                        \
+--disable-adv2dapi                         \
+--disable-savebitmap                       \
+--disable-savescreen                       \
+--disable-dblclk                           \
+--disable-splash                           \
+--disable-latin9support                    \
+--disable-fullunicode                      \
+--disable-rbfsupport                       \
+--disable-vbfsupport                       \
+--disable-upfsupport                       \
+--disable-qpfsupport                       \
+--disable-ttfsupport                       \
+--disable-complexscripts                   \
+--disable-ttfcache                         \
+--disable-jpgsupport                       \
+--disable-pngsupport                       \
+--disable-flatlf                           \
+--disable-textmode                         \
+--disable-shmopen                          
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+rm config.cache config.status -f
+
+./configure \
+--disable-shared                           \
+--enable-static                            \
+--with-osname=linux                        \
+--with-targetname=external                 \
+--with-runmode=sa                          \
+--enable-mgslicefallback                   \
+--disable-videopcxvfb                      \
+--disable-videoqvfb                        \
+--disable-videodrm                         \
+--disable-videofbcon                       \
+--enable-videocommlcd                      \
+--enable-dummyial                          \
+--disable-consoleial                       \
+--disable-libinputial                      \
+--enable-commial                           \
+--disable-consoleimps2                     \
+--disable-mousecalibrate                   \
+--enable-incoreres                         \
+--disable-cursor                           \
+--disable-savebitmap                       \
+--disable-savescreen                       \
+--disable-dblclk                           \
+--disable-splash                           \
+--disable-latin9support                    \
+--disable-fullunicode                      \
+--disable-rbfsupport                       \
+--disable-vbfsupport                       \
+--disable-upfsupport                       \
+--disable-qpfsupport                       \
+--disable-ttfsupport                       \
+--disable-complexscripts                   \
+--disable-ttfcache                         \
+--disable-jpgsupport                       \
+--disable-pngsupport                       \
+--disable-flatlf                           \
+--disable-textmode
@@ -0,0 +1,36 @@
+
+
+# set your own targaet_os
+TARGET_OS=freertos
+
+##################################################
+# set your compile tool #
+CC=arm-linux-gnueabihf-gcc
+CXX=arm-linux-gnueabihf-g++
+CPP=arm-linux-gnueabihf-g++
+AR=arm-linux-gnueabihf-ar
+AS=arm-linux-gnueabihf-as
+RANLIB=arm-linux-gnueabihf-ranlib
+MAKE=/usr/bin/make
+##################################################
+
+ARFLAGS=-rc
+COFLAG=-c
+
+OBJ=o
+LIBA=a
+
+##################################################
+# if you don't want to create dynamic, delete it # 
+LIBSO=so
+SOFLAGS=-fPIC -shared -o
+##################################################
+
+
+##################################################
+# set your compile flags and install prefix path # 
+PREFIX=/usr/local
+CFLAGS+=-g -Wall -fPIC 
+LDFLAGS+=
+##################################################
+
@@ -55,6 +55,36 @@ wallpaper_pattern_size=full
 # def_compositor_so=
 #}}

+#{{ifdef _MGGAL_SHADOW
+[shadow]
+real_engine=pc_xvfb
+defaultmode=800x600-16bpp
+
+# `cw`: rotating screen clock-wise.
+# `ccw`: rotating screen counter clock-wise.
+# `hflip`: flipping screen horizontally.
+# `vflip`: flipping screen vertically.
+rotate_screen=ccw
+
+# Whether the async. update is enabled.
+# Use `true` or `yes` for enabled, anything else for disabled.
+# Since 5.0.13.
+async_update=yes
+
+# The synchronization interval for the asyn. updater (milli-seconds).
+# This setting is only valid when `async_update` is enabled and
+# the real engine does not provide WaitWBlank method.
+# Since 5.0.13.
+update_interval=15
+
+# The minimal pixels to use the hardware accelerator.
+# If the number of pixels to copy is less than this value,
+# MiniGUI will use the software copy routine to update the real screen,
+# even if the real device provides a hardware accelerator.
+# Since 5.0.13.
+min_pixels_using_hwaccl=4096
+#}}
+
 #{{ifdef _MGGAL_DRM
 [drm]
 defaultmode=1024x768-32bpp
@@ -78,9 +108,34 @@ dpi=96
 # Since 5.0.0.
 double_buffering=true

+# The update interval for the asyn. updater (milli-seconds).
+# This setting is only valid when drmWaitVBlank doesn't work correctly.
+# Since 5.0.13.
+update_interval=15
+
+# The minimal pixels to use the hardware accelerator.
+# If the number of pixels to copy is less than this value,
+# MiniGUI will use the software copy routine to update the real screen,
+# even if the device provides a hardware accelerator.
+# Since 5.0.13.
+min_pixels_using_hwaccl=4096
+
 # The filename of the shared library for the external driver.
 # The equivalent environment variable: MG_GAL_DRM_DRIVER
-exdriver=libhidrmdrivers-0.2.so.0
+exdriver=libdrmdrivers.so
+#}}
+
+#{{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
@@ -92,6 +147,22 @@ 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
+
+# Whether the async. update is enabled.
+# Use `true` or `yes` for enabled, anything else for disabled.
+# Since 5.0.13.
+async_update=yes
+
+# The update interval for the asyn. updater (milli-seconds).
+# This setting is only valid when drmWaitVBlank doesn't work correctly.
+# Since 5.0.13.
+update_interval=15
 #}}

 #{{ifdef _MGGAL_PCXVFB
@@ -104,13 +175,6 @@ exec_file=/usr/local/bin/gvfb
 [rtos_xvfb]
 defaultmode=800x600-16bpp

-#{{ifdef _MGGAL_SHADOW
-[shadow]
-real_engine=pc_xvfb
-defaultmode=800x600-16bpp
-rotate_screen=normal
-#}}
-
 #{{ifdef _MGGAL_MLSHADOW
 [mlshadow]
 real_engine=qvfb
@@ -268,6 +268,8 @@ MGUI_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
 #define MG_UNLIKELY(expr) (expr)
 #endif

+#define HAVE(FEATURE) (defined HAVE_##FEATURE && HAVE_##FEATURE)
+
    /**
     * \defgroup endian_info Endianness information
     * @{
@@ -311,6 +313,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__)) || \
@@ -2346,6 +2349,7 @@ int init_minigui_printf (int (*output_char) (int ch),
 #define _ERR_PRINTF(fmt, ...)                   \
    do {                                        \
        TCS_RED (stderr);                       \
+        fprintf (stderr, "%s: ", __FUNCTION__); \
        fprintf (stderr, fmt, ##__VA_ARGS__);   \
        TCS_NONE (stderr);                      \
    } while (0)
@@ -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
@@ -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.
@@ -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
@@ -84,6 +84,14 @@ extern "C" {
     * @{
     */

+/** The current version of DRM driver. */
+#define DRM_DRIVER_VERSION  2
+
+#define DRM_SURBUF_TYPE_OFFSCREEN       0x0000
+#define DRM_SURBUF_TYPE_SHADOW          0x0001
+#define DRM_SURBUF_TYPE_SCANOUT         0x0002
+#define DRM_SURBUF_TYPE_MASK            0x000F
+
 /**
 * The struct type represents the DRI sub driver.
 * The concrete struct should be defined by the driver.
@@ -129,6 +137,8 @@ typedef struct _DrmSurfaceBuffer {
    uint32_t dumb:1;
    /** Is it a scanout buffer. Since 5.0.0. */
    uint32_t scanout:1;
+    /** The buffer is also a dma-buf. Since 5.0.13. */
+    uint32_t dma_buf:1;

    /** The width of the buffer. */
    uint32_t width;
@@ -154,11 +164,23 @@ typedef struct _DrmSurfaceBuffer {
      * The address of the pixel data:
      *     uint8_t* pixels = this->buff + this->offset;
      */
-    uint8_t* buff;
+    uint8_t* vaddr;
 } DrmSurfaceBuffer;

+typedef struct _DrmBlitOperations {
+    BlitCopyOperation   cpy;
+    BlitKeyOperation    key;
+    BlitAlphaOperation  alf;
+    ColorBlendMethod    bld;
+    ColorLogicalOp      rop;
+    ScalingFilter       scl;
+
+    uint32_t            key_min, key_max;
+    uint8_t             alpha;
+} DrmBlitOperations;
+
 /**
- * The structure type defines the operations for a DRM driver.
+ * The structure type defines the operations for a userland DRM driver.
 */
 typedef struct _DrmDriverOps {
    /**
@@ -176,12 +198,13 @@ typedef struct _DrmDriverOps {
    void (*destroy_driver) (DrmDriver *driver);

    /**
-     * This operation flushes the batch buffer of the driver or
-     * the hardware cache.
+     * This operation flushes the batch buffer of the driver and/or
+     * the specified buffer.
     *
     * \note This operation can be NULL.
     */
-    void (* flush_driver) (DrmDriver *driver);
+    void (* flush) (DrmDriver *driver, DrmSurfaceBuffer* buff,
+            const GAL_Rect *dirty_rect);

    /**
     * This operation creates a surface buffer with the specified pixel format,
@@ -194,7 +217,7 @@ typedef struct _DrmDriverOps {
     */
    DrmSurfaceBuffer* (* create_buffer) (DrmDriver *driver,
            uint32_t drm_format, uint32_t hdr_size,
-            uint32_t width, uint32_t height);
+            uint32_t width, uint32_t height, unsigned flags);

    /**
     * This operation creates a buffer from a given and possibly foreign handle
@@ -207,7 +230,9 @@ typedef struct _DrmDriverOps {
     *  DrmSurfaceBuffer object.
     */
    DrmSurfaceBuffer* (* create_buffer_from_handle) (DrmDriver *driver,
-            uint32_t handle, size_t size);
+            uint32_t handle, size_t size,
+            uint32_t drm_format, uint32_t hdr_size,
+            uint32_t width, uint32_t height, uint32_t pitch);

    /**
     * This operation creates a buffer for the given system global name
@@ -219,7 +244,9 @@ typedef struct _DrmDriverOps {
     *  DrmSurfaceBuffer object.
     */
    DrmSurfaceBuffer* (* create_buffer_from_name) (DrmDriver *driver,
-            uint32_t name);
+            uint32_t name,
+            uint32_t drm_format, uint32_t hdr_size,
+            uint32_t width, uint32_t height, uint32_t pitch);

    /**
     * This operation creates a buffer for the given PRIME file descriptor
@@ -231,21 +258,19 @@ typedef struct _DrmDriverOps {
     *  DrmSurfaceBuffer object.
     */
    DrmSurfaceBuffer* (* create_buffer_from_prime_fd) (DrmDriver *driver,
-            int prime_fd, size_t size);
+            int prime_fd, size_t size,
+            uint32_t drm_format, uint32_t hdr_size,
+            uint32_t width, uint32_t height, uint32_t pitch);

    /**
     * This operation maps the buffer into the current process's virtual memory
     * space, and returns the virtual address. If failed, it returns NULL.
     *
-     * When \a for_scanout is not zero, the buffer will be used for scan out
-     * frame buffer.
-     *
     * \note The driver must implement this operation. The driver must
     *  set a valid value for buff field of the DrmSurfaceBuffer object
     *  on success.
     */
-    uint8_t* (* map_buffer) (DrmDriver *driver, DrmSurfaceBuffer* buffer,
-            int for_scanout);
+    uint8_t* (* map_buffer) (DrmDriver *driver, DrmSurfaceBuffer* buffer);

    /**
     * This operation un-maps a buffer.
@@ -264,96 +289,51 @@ typedef struct _DrmDriverOps {
    void (* destroy_buffer) (DrmDriver *driver, DrmSurfaceBuffer* buffer);

    /**
-     * This operation clears the specific rectangle area of a buffer
+     * This operation fills the specific rectangle area of a buffer
     * with the specific pixel value. If succeed, it returns 0.
     *
     * \note If this operation is set as NULL, the driver does not support
-     * hardware accelerated clear operation.
+     * hardware accelerated filling operation.
     */
-    int (* clear_buffer) (DrmDriver *driver,
+    int (* fill_rect) (DrmDriver *driver,
            DrmSurfaceBuffer* dst_buf, const GAL_Rect* rc, uint32_t pixel_value);

    /**
-     * This operation checks whether a hardware accelerated blit
+     * This operation checks whether a specified hardware accelerated blit
     * can be done between the source buffer and the destination buffer.
-     * If succeed, it returns 0.
+     * If succeed, it returns zero, otherwise for failure.
+     * If succeed, it is safe to call do_blit operation.
     *
     * \note If this operation is set as NULL, it will be supposed that
     * the driver does not support any hardware accelerated blitting operation.
     */
    int (* check_blit) (DrmDriver *driver,
-            DrmSurfaceBuffer* src_buf, DrmSurfaceBuffer* dst_buf);
-
-    /**
-     * This operation copies bits from a source buffer to a destination buffer.
-     *
-     * \note If this operation is set as NULL, the driver does not support
-     * hardware accelerated copy blitting.
-     *
-     * \note Currently, the logical operation is ignored.
-     */
-    int (* copy_blit) (DrmDriver *driver,
            DrmSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
            DrmSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc,
-            ColorLogicalOp logic_op);
+            const DrmBlitOperations *ops);

    /**
-     * This operation blits pixels from a source buffer with the source alpha
-     * value specified to a destination buffer.
-     *
-     * \note If this operation is set as NULL, the driver does not support
-     * hardware accelerated blitting with alpha.
+     * This operation does the real blit. It should not be NULL if check_blit
+     * is not NULL.
     */
-    int (* alpha_blit) (DrmDriver *driver,
-            DrmSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
-            DrmSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc,
-            uint8_t alpha);
+    int (* do_blit) (DrmDriver *driver,
+            DrmSurfaceBuffer *src_buf, const GAL_Rect *src_rc,
+            DrmSurfaceBuffer *dst_buf, const GAL_Rect *dst_rc,
+            const DrmBlitOperations *blit_ops);

    /**
-     * This operation blits pixels from a source buffer to a destination buffer,
-     * but skipping the pixel value specified by \a color_key.
+     * This operation copies the pixels from the source buffer to
+     * the destination buffer, with or without scaling, rotation, and flip.
     *
     * \note If this operation is set as NULL, the driver does not support
-     * hardware accelerated blitting with color key.
+     * hardware accelerated copy operation between buffers.
     */
-    int (* key_blit) (DrmDriver *driver,
+    int (* copy_buff) (DrmDriver *driver,
            DrmSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
            DrmSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc,
-            uint32_t color_key);
-
-    /**
-     * This operation blits pixels from a source buffer with the source alpha
-     * value specified to a destination buffer, but skipping the pixel value
-     * specified.
-     *
-     * \note If this operation is set as NULL, the driver does not support
-     * hardware accelerated blitting with alpha and color key.
-     */
-    int (* alpha_key_blit) (DrmDriver *driver,
-            DrmSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
-            DrmSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc,
-            uint8_t alpha, uint32_t color_key);
-
-    /**
-     * This operation blits pixels from a source buffer with the source alpha
-     * value of pixels to the destination buffer, and with the specified color
-     * compositing/blending method (\a ColorBlendMethod).
-     *
-     * \note If this operation is set as NULL, the driver does not support
-     * hardware accelerated blitting with alpha on basis per pixel.
-     *
-     * \note Currently, the color compositing/blending method is ignored.
-     */
-    int (* alpha_pixel_blit) (DrmDriver *driver,
-            DrmSurfaceBuffer* src_buf, const GAL_Rect* src_rc,
-            DrmSurfaceBuffer* dst_buf, const GAL_Rect* dst_rc,
-            ColorBlendMethod blend_method);
-
+            BlitCopyOperation op);
 } DrmDriverOps;

-/** The current version of DRM driver. */
-#define DRM_DRIVER_VERSION  1
-
 /**
 * Implement this stub to return the DRI driver operations
 *
@@ -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
@@ -101,9 +107,9 @@ extern "C" {
 #define ZOF_TYPE_NORMAL         0x30000000
 #define ZOF_TYPE_HIGHER         0x40000000
 #define ZOF_TYPE_DOCKER         0x50000000  // Since 5.0.0
-#define ZOF_TYPE_SCREENLOCK     0x60000000  // Since 5.0.0;
+#define ZOF_TYPE_SCREENLOCK     0x60000000  // Since 5.0.0
 #define ZOF_TYPE_GLOBAL         0x70000000
-#define ZOF_TYPE_TOOLTIP        0x80000000  // Since 5.0.0; fixed and only one.
+#define ZOF_TYPE_TOOLTIP        0x80000000  // Since 5.0.0
 #define ZOF_TYPE_POPUPMENU      0x90000000

 #define ZOF_TYPE_BOTTOMMOST     ZOF_TYPE_LAUNCHER
@@ -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
 */
@@ -442,6 +456,45 @@ MG_EXPORT void GUIAPI MiniGUIPanic (int exitcode);
     * @{
     */

+/**
+ * \fn GHANDLE GUIAPI JoinLayerEx (const char* layer_name,
+                const char* client_name,
+                int max_nr_highers, int max_nr_normals, int *cli_id)
+ * \brief Joins to a layer and returns the client identifier if success.
+ *
+ * This function should be called by clients before calling any other MiniGUI
+ * functions. You can call \a GetLayerInfo to get the layer information.
+ * If the layer to be joined does not exist, the server, i.e. \a mginit, will
+ * try to create a new one. If you passed a NULL pointer or a null string for
+ * \a layer_name, the client will join to the default layer.
+ *
+ * If the client want to create a new layer, you should specify the maximal
+ * number of z-nodes in the higher level (max_nr_highers) and the maximal
+ * number of z-nodes in the normal level (max_nr_normals) of the new layer.
+ * Passing zero to \a max_nr_highers and max_nr_normals will use the default
+ * values, and the default values are specified by ServerStartup.
+ *
+ * Note that the server will create a default layer named "mginit".
+ *
+ * \param layer_name The name of the layer. You can use NAME_TOPMOST_LAYER to
+ *        specify the current topmost layer.
+ * \param client_name The name of the client.
+ * \param max_nr_highers The maximal number of z-nodes in the higher level of
+ *        the new layer.
+ * \param max_nr_normals The maximal number of z-nodes in the normal level of
+ *        the new layer.
+ * \param cli_id The pointer to a buffer of int to return the client identifier.
+ *
+ * \return The handle to the layer on success, INV_LAYER_HANDLE on error.
+ *
+ * \note Only call this function in clients of MiniGUI-Processes.
+ *
+ * \sa GetLayerInfo, ServerStartup, ServerCreateLayer
+ */
+MG_EXPORT GHANDLE GUIAPI JoinLayerEx (const char* layer_name,
+                const char* client_name,
+                int max_nr_highers, int max_nr_normals, int *cli_id);
+
 /**
 * \fn GHANDLE GUIAPI JoinLayer (const char* layer_name,
                const char* client_name,
@@ -476,9 +529,30 @@ MG_EXPORT void GUIAPI MiniGUIPanic (int exitcode);
 *
 * \sa GetLayerInfo, ServerStartup, ServerCreateLayer
 */
-MG_EXPORT GHANDLE GUIAPI JoinLayer (const char* layer_name,
+static inline GHANDLE GUIAPI JoinLayer (const char* layer_name,
                const char* client_name,
-                int max_nr_highers, int max_nr_normals);
+                int max_nr_highers, int max_nr_normals)
+{
+    return JoinLayerEx (layer_name, client_name,
+                max_nr_highers, max_nr_normals, NULL);
+}
+
+/**
+ * \fn int GUIAPI GetClientId (void)
+ * \brief Gets the client identifier.
+ *
+ * You can get the information of a layer through this function.
+ * The information will be returned through the pointer arguments
+ * if the specific pointer is not NULL.
+ *
+ * \return Returns the client identifier of the current process.
+ *      Note that the server always returns 0.
+ *
+ * \sa JoinLayerEx
+ *
+ * Since 5.2.0
+ */
+MG_EXPORT int GUIAPI GetClientId (void);

 /**
 * \fn GHANDLE GUIAPI GetLayerInfo (const char* layer_name,
@@ -562,6 +636,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.
@@ -669,21 +745,22 @@ typedef void (* ON_NEW_DEL_CLIENT) (int op, int cli);
 typedef void (* ON_CHANGE_LAYER) (int op, MG_Layer* layer,
                MG_Client* client);

-#define ZNOP_ALLOCATE   1
-#define ZNOP_FREE       2
-#define ZNOP_MOVE2TOP   3
-#define ZNOP_SHOW       4
-#define ZNOP_HIDE       5
-#define ZNOP_MOVEWIN    6
-#define ZNOP_SETACTIVE  7
+#define ZNOP_ALLOCATE           1
+#define ZNOP_FREE               2
+#define ZNOP_MOVE2TOP           3
+#define ZNOP_SHOW               4
+#define ZNOP_HIDE               5
+#define ZNOP_MOVEWIN            6
+#define ZNOP_SETACTIVE          7

-#define ZNOP_ENABLEWINDOW        11
-#define ZNOP_DISABLEWINDOW       12
-#define ZNOP_STARTDRAG           13
-#define ZNOP_CANCELDRAG          14
-#define ZNOP_CHANGECAPTION       15
-#define ZNOP_REGIONCHANGED       16
-#define ZNOP_COMPOSITINGCHANGED  17
+#define ZNOP_ENABLEWINDOW       11
+#define ZNOP_DISABLEWINDOW      12
+#define ZNOP_STARTDRAG          13
+#define ZNOP_CANCELDRAG         14
+#define ZNOP_CHANGECAPTION      15
+#define ZNOP_REGIONCHANGED      16
+#define ZNOP_COMPOSITINGCHANGED 17
+#define ZNOP_ICONCHANGED        18  /* reserved for future */

 /**
 * \var typedef void (* ON_ZNODE_OPERATION) (int op, int cli, int idx_znode)
@@ -889,6 +966,39 @@ MG_EXPORT BOOL GUIAPI ServerSetTopmostLayer (MG_Layer* layer);
 */
 MG_EXPORT BOOL GUIAPI ServerDeleteLayer (MG_Layer* layer);

+/**
+ * \fn int GUIAPI ServerGetTopmostZNodeOfType (MG_Layer* layer, DWORD type,
+ *              int* cli)
+ * \brief Get the topmost z-node in the specified layer for the specific
+ *  window type from the server.
+ *
+ * This function gets the topmost z-node of the type specified by
+ * \a type in the specified layer \a layer from the server.
+ *
+ * \param layer The pointer to the layer, NULL for the current topmost layer.
+ * \param type The window type, can be one of the following values:
+ *  - ZOF_TYPE_TOOLTIP
+ *  - ZOF_TYPE_GLOBAL
+ *  - ZOF_TYPE_SCREENLOCK
+ *  - ZOF_TYPE_DOCKER
+ *  - ZOF_TYPE_HIGHER
+ *  - ZOF_TYPE_NORMAL
+ *  - ZOF_TYPE_LAUNCHER
+ * \param cli The client identifier of the topmost z-node will be returned
+ *        through this pointer. NULL is okay.
+ *
+ * \return The index of the topmost z-node of the specified type.
+ *      Zero when there is no z-node in the level; < 0 when error.
+ *
+ * \note Server-only function. Note that this function will not return
+ *       the z-node of the desktop, and the desktop always has the z-node index
+ *       of zero.
+ *
+ * \sa ServerGetZNodeInfo
+ */
+MG_EXPORT int GUIAPI ServerGetTopmostZNodeOfType (MG_Layer* layer, DWORD type,
+                int* cli);
+
 /**
 * \fn int GUIAPI ServerGetNextZNode (MG_Layer* layer, int idx_znode,
 *              int* cli)
@@ -1457,7 +1567,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.
 *
@@ -1566,7 +1678,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.
@@ -1695,6 +1807,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.
@@ -1709,12 +1835,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.
@@ -1774,7 +1923,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,
@@ -1792,7 +1941,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
@@ -2018,7 +2185,7 @@ MG_EXPORT int GUIAPI ServerSendReplyEx (int clifd,
 * \fn int GUIAPI ServerSendReply (int clifd, const void* reply, int len)
 * \brief Sends the reply to the client.
 *
- * This function sends a replay pointed to by \a reply which is
+ * This function sends a reply pointed to by \a reply which is
 * \a len bytes long to the client.
 *
 * \note Only used by the server to send the reply to the client.
@@ -2566,6 +2733,26 @@ MG_EXPORT void GUIAPI DesktopUpdateAllWindow (void);

 #define DUMMY_LAYER_HANDLE  (GHANDLE)(-1)

+/**
+ * \fn GHANDLE GUIAPI JoinLayerEx (const char* layer_name,
+                const char* client_name,
+                int max_nr_highers, int max_nr_normals, int *cli_fd)
+ * \brief The dummy replacement of the same function for MiniGUI-Processes.
+ *
+ * This function is a replacment of the same function for MiniGUI-Processes
+ * runtime mode. We provide this function for MiniGUI-Threads and
+ * MiniGUI-Standalone runtime modes, in order to avoid using the
+ * conditional compilation instructions in your source code.
+ *
+ * \return Always returns DUMMY_LAYER_HANDLE to indicate success.
+ */
+static inline GHANDLE GUIAPI JoinLayerEx (const char* layer_name,
+        const char* client_name,
+        int max_nr_highers, int max_nr_normals, int *cli_fd)
+{
+    return DUMMY_LAYER_HANDLE;
+}
+
 /**
 * \fn GHANDLE GUIAPI JoinLayer (const char* layer_name,
                const char* client_name,
@@ -2580,7 +2767,8 @@ MG_EXPORT void GUIAPI DesktopUpdateAllWindow (void);
 * \return Always returns DUMMY_LAYER_HANDLE to indicate success.
 */
 static inline GHANDLE GUIAPI JoinLayer (const char* layer_name,
-        const char* client_name, int max_nr_highers, int max_nr_normals)
+        const char* client_name,
+        int max_nr_highers, int max_nr_normals)
 {
    return DUMMY_LAYER_HANDLE;
 }
@@ -3990,7 +4178,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.
@@ -4003,10 +4191,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
@@ -4020,7 +4210,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 */

@@ -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

@@ -2973,15 +2990,22 @@ typedef struct _WINMASKINFO {
   if the client moved to a new layer */
 #define MSG_LAYERCHANGED    0x0149

+/* Since 5.2.0; the server send this message to the client
+   if a window has been composited to the screen.  */
+#define MSG_WINCOMPOSITED   0x014A
+
 #endif /* defined _MGRM_PROCESSES */

 /* Since 5.0.0: for managing message thread */
-#define MSG_MANAGE_MSGTHREAD    0x014A
+#define MSG_MANAGE_MSGTHREAD    0x014B
    #define MSGTHREAD_SIGNIN        0x00
    #define MSGTHREAD_SIGNOUT       0x01

 /* Since 5.0.0: for calculating the default position */
-#define MSG_CALC_POSITION       0x014B
+#define MSG_CALC_POSITION       0x014C
+
+/* Since 5.0.6: for waking up the client */
+#define MSG_WAKEUP_CLIENT       0x014D

 /**
 * \def MSG_DOESNEEDIME
@@ -4280,39 +4304,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 +4367,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 +4379,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 +4457,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 +4478,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 +4497,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 +4523,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 +4583,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 +6923,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 +7198,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,8 +7206,66 @@ 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

+/**
+ * \fn int GUIAPI GetWindowSharedSurfaceFD (HWND hwnd, size_t *map_size,
+ *      DWORD *flags)
+ * \brief Gets the file descriptor of the surface buffer for a window or
+ * the main window it locates.
+ *
+ * This function gets the file descriptor of the surface buffer for
+ * the specified window if it is a main window or the main window it locates.
+ * Note that if the window is a control that has the style `WS_EX_CTRLASMAINWIN`,
+ * the window will have a separate surface buffer.
+ *
+ * \param hwnd The handle to the window.
+ *
+ * \return An integer larger than or equal to 0 for a valid file descriptor,
+ *      otherwise a negative value.
+ *
+ * \note This function only available when _MGSCHEMA_COMPOSITING is defined.
+ *
+ * \sa CreateMemDCFromSharedSurfaceFD
+ *
+ * Since 5.0.13
+ */
+MG_EXPORT int GUIAPI GetWindowSharedSurfaceFD (HWND hWnd, size_t *map_size,
+        DWORD *flags);
+
 /**
 * \fn BOOL GUIAPI SetMainWindowCompositing (HWND hWnd,
        int type, DWORD arg)
@@ -7189,14 +7287,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
@@ -1,4 +1,4 @@
 # This file does not do anything, except making sure these files are included
 # when you run 'make dist'.

-EXTRA_DIST = libtool.m4
+EXTRA_DIST = 
@@ -2,11 +2,12 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+runmode=@MINIGUI_RUNMODE@
+libsuffix=@MGLIB_SUFFIX@

 Name: MiniGUI
 Description: A mature cross-platform windowing and GUI system for embedded systems and IoT smart devices.
 Version: @MINIGUI_VERSION@
-Runmode: @MINIGUI_RUNMODE@
 Requires:
 Libs: -L${libdir} -lminigui_@MGLIB_SUFFIX@ @DEP_LIBS@
 Libs.private:
@@ -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) 

@@ -154,14 +154,53 @@ 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),
                LOSWORD(msg->lParam), HISWORD(msg->lParam));
    }
+#ifdef _MGSCHEMA_COMPOSITING
+    else if (msg->message == MSG_WINCOMPOSITED) {
+        /* Since 5.2.0 */
+        int slot = (int)msg->wParam;
+        HWND hwnd = (HWND)msg->lParam;
+        unsigned dirty_age = (unsigned)msg->time;
+        if (__mg_client_check_znode_hwnd(slot, hwnd, __mg_client_id)) {
+            GAL_Surface *ssurf = ((PMAINWIN)hwnd)->surf;
+            assert(ssurf->shared_header);
+            __mg_lock_file_for_write(ssurf->fd);
+            if (ssurf->dirty_info->dirty_age == dirty_age) {
+                ssurf->dirty_info->nr_dirty_rcs = 0;
+            }
+            __mg_unlock_file_for_write(ssurf->fd);
+        }
+    }
+#endif
    else {
        if (msg->hwnd == HWND_NULL) {
            msg->hwnd = HWND_DESKTOP;
@@ -366,27 +405,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 +416,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 +451,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 +525,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;
@@ -517,8 +535,8 @@ BOOL client_IdleHandler4Client (PMSGQUEUE msg_queue, BOOL wait)
    return (n > 0);
 }

-GHANDLE GUIAPI JoinLayer (const char* layer_name, const char* client_name,
-               int max_nr_topmosts, int max_nr_normals)
+GHANDLE GUIAPI JoinLayerEx (const char* layer_name, const char* client_name,
+               int max_nr_topmosts, int max_nr_normals, int *cli_id)
 {
    GHANDLE layer_handle = INV_LAYER_HANDLE;
    REQUEST req;
@@ -528,8 +546,12 @@ GHANDLE GUIAPI JoinLayer (const char* layer_name, const char* client_name,
    if (mgIsServer)
        return layer_handle;

-    if (__mg_client_id != 0) /* Already joined, return the handle */
+    if (__mg_client_id != 0) {
+        /* Already joined, return the handle */
+        if (cli_id)
+            *cli_id = __mg_client_id;
        return GetLayerInfo (NAME_SELF_LAYER, NULL, NULL, NULL);
+    }

    if (layer_name) {
        strncpy (info.layer_name, layer_name, LEN_LAYER_NAME);
@@ -569,22 +591,41 @@ 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;

    __mg_start_client_desktop ();

+    if (cli_id)
+        *cli_id = __mg_client_id;
+
 ret:
    return layer_handle;
 }

+int GUIAPI GetClientId (void)
+{
+    return __mg_client_id;
+}
+
 GHANDLE GUIAPI GetLayerInfo (const char* layer_name,
                int* nr_clients, BOOL* is_topmost, int* cli_active)
 {
@@ -711,6 +752,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;
    }

@@ -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;
    }

@@ -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);
@@ -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);
 }

@@ -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);
@@ -404,7 +404,7 @@ void mglist_set_itemops (MgList *mglst, PMGITEMOPS iop)
    mglst->iop = *iop;
 }

-int DefaultItemViewProc (HWND hWnd, int message, WPARAM wParam, LPARAM lParam,
+LRESULT DefaultItemViewProc (HWND hWnd, int message, WPARAM wParam, LPARAM lParam,
                         PSCRDATA pscrdata, MgList *mglst)
 {
    switch (message) {
@@ -140,7 +140,7 @@ struct _MgList

 /* ------------------------- external api -------------------------- */

-MG_EXPORT int DefaultItemViewProc (HWND hWnd, int message, WPARAM wParam, LPARAM lParam,
+MG_EXPORT LRESULT DefaultItemViewProc (HWND hWnd, int message, WPARAM wParam, LPARAM lParam,
                         PSCRDATA pscrdata, MgList *mglst);

 MG_EXPORT SVITEM_DRAWFUNC mglist_set_itemdraw (MgList *mglst, SVITEM_DRAWFUNC draw_func);
@@ -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;
 }

@@ -585,7 +589,7 @@ int scrolled_init (HWND hWnd, PSCRDATA pscrdata, int w, int h)
    return 0;
 }

-int DefaultScrolledProc (HWND hWnd, int message, WPARAM wParam, LPARAM lParam)
+LRESULT DefaultScrolledProc (HWND hWnd, int message, WPARAM wParam, LPARAM lParam)
 {
    PSCRDATA pscrdata = NULL;

@@ -96,7 +96,7 @@ typedef struct _scrdata
 typedef SCRDATA *PSCRDATA;


-MG_EXPORT int     DefaultScrolledProc (HWND hWnd, int message, WPARAM wParam, LPARAM lParam);
+MG_EXPORT LRESULT DefaultScrolledProc (HWND hWnd, int message, WPARAM wParam, LPARAM lParam);
 MG_EXPORT int     scrolled_init (HWND hWnd, PSCRDATA pscrdata, int w, int h);
 MG_EXPORT void    scrolled_destroy (PSCRDATA pscrdata);
 MG_EXPORT void    scrolled_hscroll (HWND hWnd, PSCRDATA pscrdata, WPARAM wParam, LPARAM lParam);
@@ -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;
@@ -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 {
@@ -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);
@@ -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 {{{
@@ -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;
@@ -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;
    }

@@ -202,6 +202,17 @@ static void destroy (GLYPHTREENODE *root)

 /*** device font ops ***/

+static DWORD get_feature (LOGFONT* logfont, DEVFONT* devfont,
+        enum devfont_feature feature)
+{
+    switch (feature) {
+    case DEVFONT_FEATURE_MARK_BBOX:
+        return 0;
+    }
+
+    return 0;
+}
+
 static DWORD get_glyph_bmptype (LOGFONT* logfont, DEVFONT* devfont)
 {
    return DEVFONTGLYPHTYPE_PRERDRBMP;
@@ -380,6 +391,7 @@ static int get_glyph_bbox (LOGFONT* logfont, DEVFONT* devfont,

 /**************************** Global data ************************************/
 FONTOPS __mg_bitmap_font_ops = {
+    get_feature,
    get_glyph_bmptype,
    get_ave_width,
    get_max_width,
@@ -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~2023, Beijing FMSoft Technologies Co., Ltd.
 *   Copyright (C) 1998~2002, WEI Yongming
 *
 *   This program is free software: you can redistribute it and/or modify
@@ -166,7 +166,7 @@ static unsigned short iso8859_68x_unicode_map [] =
    0xFEB3, 0xFEB7, 0xFEBB, 0xFEBF, /*0xF1~0xF4*/
    0xFECB, 0xFECF, 0xFED3, 0xFED7, /*0xF5~0xF8*/
    0xFEDB, 0xFEDF, 0xFEE3, 0xFEE7, /*0xF9~0xFC*/
-    0xFEEB, 0xFEF4, 0xFFFF,         /*0xFD~0xFF*/
+    0xFEEB, 0xFEF3, 0xFFFF,         /*0xFD~0xFF*/

    0xFEC4, 0xFEC6, 0xFE82, 0xFE84, /*0x100~0x103*/
    0xFE86, 0xFE88, 0xFE8C, 0xFE8E, /*0x104~0x107*/
@@ -226,7 +226,7 @@ static int iso8859_6_conv_from_uc32 (Uchar32 wc, unsigned char* mchar)
 }
 #endif

-/* must attetion the para s is arabic chv value.*/
+#if 0
 static int is_arabic_char_vowel(Uint8 c)
 {

@@ -240,6 +240,7 @@ static int is_arabic_char_vowel(Uint8 c)
    */
    return 0;
 }
+#endif

 /* ISO8859-6 charset vowel relative define and judge */
 #define ISARABIC_VOWEL(s) ((s >= FATHATAN) && (s <= SUKUN))
@@ -461,15 +462,18 @@ 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))

 static unsigned int iso8859_6_char_type (Achar32 chv)
 {
+    chv = REAL_ACHAR(chv);
+#if 1
+    return sb_char_type(chv);
+#else
    unsigned int ch_type = ACHAR_BASIC_UNKNOWN;

    if (is_arabic_char_vowel (chv)) {  /* is vowel */
@@ -480,10 +484,10 @@ static unsigned int iso8859_6_char_type (Achar32 chv)
    }

    return ch_type;
+#endif
 }

 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 +535,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,
@@ -573,7 +576,7 @@ static BidiType __mg_iso8859_6_bidi_char_type_map[] = {
    BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,
    BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,
    BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,
-    BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_ON,
+    BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,

    /*0xf0~0xff*/
    BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,  BIDI_TYPE_AL,
@@ -606,10 +609,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 +798,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 +813,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 +842,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 +863,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);
 }
@@ -871,6 +873,7 @@ static CHARSETOPS CharsetOps_iso8859_6 = {
    3,
    FONT_CHARSET_ISO8859_6,
    0,
+    1,
    iso8859_6_len_first_char,
    iso8859_6_get_char_value,
    iso8859_6_get_shaped_char_value,
@@ -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~2023, Beijing FMSoft Technologies Co., Ltd.
 *   Copyright (C) 1998~2002, WEI Yongming
 *
 *   This program is free software: you can redistribute it and/or modify
@@ -210,6 +210,8 @@ static unsigned int unicode_char_type (Achar32 chv)
        mchar_type = ACHAR_BASIC_LF;
    else if (break_type == UCHAR_BREAK_SPACE)
        mchar_type = ACHAR_BASIC_SPACE;
+    else if (basic_type == UCHAR_CATEGORY_NON_SPACING_MARK)
+        mchar_type = ACHAR_BASIC_VOWEL;
    else if (chv != 0x00AD && ISZEROWIDTHTYPE (basic_type))
        mchar_type = ACHAR_BASIC_ZEROWIDTH;
    else if ((chv >= 0x1160 && chv < 0x1200)
@@ -239,10 +241,36 @@ static const BidiType linear_enum_to_bidi_type[] = {
 #undef _UNIBIDI_ADD_TYPE
 };

+/* Since 5.0.13: this function only returns BidiType which
+   is recognizable by the legacy BIDI algorithm. */
 static BidiType unicode_bidi_char_type(Achar32 ch)
 {
    ch = REAL_ACHAR(ch);
-    return linear_enum_to_bidi_type[UNIBIDI_GET_BIDI_TYPE(ch)];
+    BidiType bt = linear_enum_to_bidi_type[UNIBIDI_GET_BIDI_TYPE(ch)];
+
+    switch (bt) {
+        case BIDI_TYPE_LTR:
+        case BIDI_TYPE_RTL:
+        case BIDI_TYPE_AL:
+        case BIDI_TYPE_EN:
+        case BIDI_TYPE_AN:
+        case BIDI_TYPE_ET:
+        case BIDI_TYPE_CS:
+        case BIDI_TYPE_NSM:
+        case BIDI_TYPE_BN:
+        case BIDI_TYPE_BS:
+        case BIDI_TYPE_SS:
+        case BIDI_TYPE_WS:
+        case BIDI_TYPE_ON:
+        case BIDI_TYPE_SOT:
+        case BIDI_TYPE_EOT:
+            return bt;
+        default:
+            _DBG_PRINTF("Not recognizable for char (0x%04x): %u\n", ch, bt);
+            break;
+    }
+
+    return BIDI_TYPE_WS;
 }

 BidiType GUIAPI UCharGetBidiType(Uchar32 uc)
@@ -628,6 +656,7 @@ CHARSETOPS __mg_CharsetOps_utf8 = {
    6,
    FONT_CHARSET_UTF8,
    0,
+    0,
    utf8_len_first_char,
    utf8_get_char_value,
    NULL,
@@ -854,6 +883,7 @@ CHARSETOPS __mg_CharsetOps_utf16le = {
    4,
    FONT_CHARSET_UTF16LE,
    0,
+    0,
    utf16le_len_first_char,
    utf16le_get_char_value,
    NULL,
@@ -1080,6 +1110,7 @@ CHARSETOPS __mg_CharsetOps_utf16be = {
    4,
    FONT_CHARSET_UTF16BE,
    0,
+    0,
    utf16be_len_first_char,
    utf16be_get_char_value,
    NULL,
@@ -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~2023, Beijing FMSoft Technologies Co., Ltd.
 *   Copyright (C) 1998~2002, WEI Yongming
 *
 *   This program is free software: you can redistribute it and/or modify
@@ -49,6 +49,8 @@
 ** Create date: 2000/06/13
 */

+#undef NDEBUG
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -233,6 +235,7 @@ static CHARSETOPS CharsetOps_ascii = {
    1,
    FONT_CHARSET_US_ASCII,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -296,6 +299,7 @@ static CHARSETOPS CharsetOps_iso8859_1 = {
    1,
    FONT_CHARSET_ISO8859_1,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -407,6 +411,7 @@ static CHARSETOPS CharsetOps_iso8859_2 = {
    1,
    FONT_CHARSET_ISO8859_2,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -519,6 +524,7 @@ static CHARSETOPS CharsetOps_iso8859_3 = {
    1,
    FONT_CHARSET_ISO8859_3,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -632,6 +638,7 @@ static CHARSETOPS CharsetOps_iso8859_4 = {
    1,
    FONT_CHARSET_ISO8859_4,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -726,6 +733,7 @@ static CHARSETOPS CharsetOps_iso8859_5 = {
    1,
    FONT_CHARSET_ISO8859_5,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -884,6 +892,7 @@ static CHARSETOPS CharsetOps_iso8859_7 = {
    1,
    FONT_CHARSET_ISO8859_7,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -969,7 +978,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 +1025,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 +1079,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 [] =
@@ -1160,6 +1166,7 @@ static CHARSETOPS CharsetOps_iso8859_8 = {
    2, // This is a trick for bidi reorder only implemented for MBC.
    FONT_CHARSET_ISO8859_8,
    0,
+    1,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -1261,6 +1268,7 @@ static CHARSETOPS CharsetOps_iso8859_9 = {
    1,
    FONT_CHARSET_ISO8859_9,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -1374,6 +1382,7 @@ static CHARSETOPS CharsetOps_iso8859_10 = {
    1,
    FONT_CHARSET_ISO8859_10,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -1486,6 +1495,7 @@ static CHARSETOPS CharsetOps_iso8859_11 = {
    1,
    FONT_CHARSET_ISO8859_11,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -1598,6 +1608,7 @@ static CHARSETOPS CharsetOps_iso8859_13 = {
    1,
    FONT_CHARSET_ISO8859_13,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -1710,6 +1721,7 @@ static CHARSETOPS CharsetOps_iso8859_14 = {
    1,
    FONT_CHARSET_ISO8859_14,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -1821,6 +1833,7 @@ static CHARSETOPS CharsetOps_iso8859_15 = {
    1,
    FONT_CHARSET_ISO8859_15,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -1971,6 +1984,7 @@ static CHARSETOPS CharsetOps_iso8859_16 = {
    1,
    FONT_CHARSET_ISO8859_16,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -2168,6 +2182,7 @@ static CHARSETOPS CharsetOps_gb2312_0 = {
    2,
    FONT_CHARSET_GB2312_0,
    0,
+    0,
    gb2312_0_len_first_char,
    gb2312_0_get_char_value,
    NULL,
@@ -2325,6 +2340,7 @@ static CHARSETOPS CharsetOps_gbk = {
    2,
    FONT_CHARSET_GBK,
    0,
+    0,
    gbk_len_first_char,
    gbk_get_char_value,
    NULL,
@@ -2593,6 +2609,7 @@ static CHARSETOPS CharsetOps_gb18030_0 = {
    4,
    FONT_CHARSET_GB18030_0,
    0,
+    0,
    gb18030_0_len_first_char,
    gb18030_0_get_char_value,
    NULL,
@@ -2750,6 +2767,7 @@ static CHARSETOPS CharsetOps_big5 = {
    2,
    FONT_CHARSET_BIG5,
    0,
+    0,
    big5_len_first_char,
    big5_get_char_value,
    NULL,
@@ -2896,6 +2914,7 @@ static CHARSETOPS CharsetOps_ksc5601_0 = {
    2,
    FONT_CHARSET_EUCKR,
    0,
+    0,
    ksc5601_0_len_first_char,
    ksc5601_0_get_char_value,
    NULL,
@@ -3020,6 +3039,7 @@ static CHARSETOPS CharsetOps_jisx0201_0 = {
    1,
    FONT_CHARSET_JISX0201_0,
    0,
+    0,
    jisx0201_0_len_first_char,
    jisx0201_0_get_char_value,
    NULL,
@@ -3163,6 +3183,7 @@ static CHARSETOPS CharsetOps_jisx0208_0 = {
    2,
    FONT_CHARSET_JISX0208_0,
    0,
+    0,
    jisx0208_0_len_first_char,
    jisx0208_0_get_char_value,
    NULL,
@@ -3248,6 +3269,7 @@ static CHARSETOPS CharsetOps_jisx0201_1 = {
    1,
    FONT_CHARSET_JISX0201_1,
    0,
+    0,
    sb_len_first_char,
    sb_get_char_value,
    NULL,
@@ -3419,6 +3441,7 @@ static CHARSETOPS CharsetOps_jisx0208_1 = {
    2,
    FONT_CHARSET_JISX0208_1,
    0,
+    0,
    jisx0208_1_len_first_char,
    jisx0208_1_get_char_value,
    NULL,
@@ -255,6 +255,17 @@ compute_kernval (TTFINSTANCEINFO* ttf_inst_info)
    return kernval;
 }

+static DWORD get_feature (LOGFONT* logfont, DEVFONT* devfont,
+        enum devfont_feature feature)
+{
+    switch (feature) {
+    case DEVFONT_FEATURE_MARK_BBOX:
+        return 0;
+    }
+
+    return 0;
+}
+
 static DWORD get_glyph_bmptype (LOGFONT* logfont, DEVFONT* devfont)
 {
    if (logfont->style & FS_WEIGHT_BOOK)
@@ -792,6 +803,7 @@ static int is_rotatable (LOGFONT* logfont, DEVFONT* devfont, int rot_desired)
 }
 /**************************** Global data ************************************/
 FONTOPS __mg_ttf_ops = {
+    get_feature,
    get_glyph_bmptype,
    get_ave_width,
    get_max_width,
@@ -197,6 +197,17 @@ print_bitmap_grey (const BYTE* buffer, int width, int rows, int pitch)
    printf("*******************************************\n");
 }

+static DWORD get_feature (LOGFONT* logfont, DEVFONT* devfont,
+        enum devfont_feature feature)
+{
+    switch (feature) {
+    case DEVFONT_FEATURE_MARK_BBOX:
+        return 1;
+    }
+
+    return 0;
+}
+
 static DWORD get_glyph_bmptype (LOGFONT* logfont, DEVFONT* devfont)
 {
    switch (logfont->style & FS_RENDER_MASK) {
@@ -735,9 +746,9 @@ get_glyph_advance (LOGFONT* logfont, DEVFONT* devfont,
            pcache->valid_advance = 1;
        }
    }
+done:
 #endif

-done:
    FT_UNLOCK(&ft_lock);

    if (px) {
@@ -1265,6 +1276,7 @@ void font_TermFreetypeLibrary (void)

 /**************************** Global data ************************************/
 FONTOPS __mg_ttf_ops = {
+    get_feature,
    get_glyph_bmptype,
    get_ave_width,
    get_max_width,
@@ -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 */
@@ -286,7 +286,7 @@ static TYPERUN* get_runtype_link (const CHARSETOPS* charset_ops, Achar32* achars
    last = list;

    for (i = 0; i < len; i++){
-        if ((type = charset_ops->bidi_char_type (achars[i])) != last->type){
+        if ((type = charset_ops->bidi_char_type (REAL_ACHAR(achars[i]))) != last->type){
            link = calloc(1, sizeof(TYPERUN));
            link->type = type;
            link->pos = i;
@@ -456,7 +456,7 @@ static void bidi_resolveWeak(TYPERUN **ptype_rl_list, Uint32 base_dir)
            prev_type_org = TYPE(pp);
    }

-    compact_neutrals (type_rl_list);
+    compact_list (type_rl_list);

 #ifdef BIDI_DEBUG
    print_run_types(type_rl_list);
@@ -469,19 +469,115 @@ static void bidi_resolveWeak(TYPERUN **ptype_rl_list, Uint32 base_dir)
 #define BIDI_EMBEDDING_DIR(list) BIDI_LEVEL_TO_DIR(LEVEL(list))

 /* 4.Resolving Neutral Types */
-static void bidi_resolveNeutrals(TYPERUN **ptype_rl_list, Uint32 base_bir)
+static void bidi_resolveNeutrals(const CHARSETOPS* charset_ops, Achar32* achars, int len,
+        TYPERUN **ptype_rl_list, Uint32 base_bir)
 {
    TYPERUN *type_rl_list = *ptype_rl_list, *pp = NULL;
+    Uint32* bracket_types = NULL;
+    int i;
+
+    if (charset_ops->bidi_mirror_char && achars && len > 0) {
+        typedef struct {
+            int pos;
+            Achar32 mirror;
+        } BRSTACK;
+
+        BRSTACK* stack = NULL;
+        int top = 0;
+
+        bracket_types = calloc(len, sizeof(Uint32));
+        stack = calloc(len, sizeof(BRSTACK));
+
+        if (bracket_types && stack) {
+            for (i = 0; i < len; i++) {
+                Achar32 ch = REAL_ACHAR(achars[i]);
+                Achar32 mirrored;
+                if (!charset_ops->bidi_mirror_char(ch, &mirrored))
+                    continue;
+
+                if (ch < mirrored) {
+                    stack[top].pos = i;
+                    stack[top].mirror = mirrored;
+                    top++;
+                }
+                else {
+                    if (top > 0 && stack[top - 1].mirror == ch) {
+                        int open_pos = stack[top - 1].pos;
+                        int close_pos = i;
+                        Uint32 found_dir = BIDI_TYPE_ON;
+                        int k;
+
+                        for (k = open_pos + 1; k < close_pos; k++) {
+                            Uint32 t = charset_ops->bidi_char_type(REAL_ACHAR(achars[k]));
+                            if (t == BIDI_TYPE_AL)
+                                t = BIDI_TYPE_RTL;
+                            if (BIDI_IS_LETTER(t)) {
+                                found_dir = BIDI_IS_RTL(t) ? BIDI_TYPE_RTL : BIDI_TYPE_LTR;
+                                break;
+                            }
+                        }
+
+                        if (found_dir != BIDI_TYPE_ON) {
+                            bracket_types[open_pos] = found_dir;
+                            bracket_types[close_pos] = found_dir;
+                        }
+
+                        top--;
+                    }
+                }
+            }
+        }
+
+        if (stack)
+            free(stack);
+    }
+
+    if (bracket_types) {
+        for (pp = type_rl_list->next; pp->next; pp = pp->next) {
+            if (BIDI_IS_NEUTRAL(TYPE(pp))) {
+                int start = POS(pp);
+                int end = start + LEN(pp);
+                Uint32 forced = BIDI_TYPE_ON;
+
+                if (end > len)
+                    end = len;
+
+                for (i = start; i < end; i++) {
+                    if (bracket_types[i] == BIDI_TYPE_RTL) {
+                        forced = BIDI_TYPE_RTL;
+                        break;
+                    }
+                    if (bracket_types[i] == BIDI_TYPE_LTR) {
+                        forced = BIDI_TYPE_LTR;
+                    }
+                }
+
+                if (forced != BIDI_TYPE_ON) {
+                    TYPE(pp) = forced;
+                }
+            }
+        }
+        compact_list (type_rl_list);
+    }

    DBGLOG ("\n4.Resolving neutral types\n");

    for (pp = type_rl_list->next; pp->next; pp = pp->next)
    {
        Uint32 prev_type, this_type, next_type;
+        TYPERUN* prev = NULL;
+        TYPERUN* next = NULL;
+
+        prev = pp->prev;
+        while (prev && BIDI_IS_NEUTRAL(TYPE(prev)) && !BIDI_IS_SENTINEL(TYPE(prev)))
+            prev = prev->prev;
+        prev_type = (!prev || BIDI_IS_SENTINEL(TYPE(prev))) ? base_bir : TYPE(prev);

-        prev_type = TYPE(pp->prev);
        this_type = TYPE(pp);
-        next_type = (pp->next) ? TYPE(pp->next) : this_type;
+        next = pp->next;
+        while (next && BIDI_IS_NEUTRAL(TYPE(next)) && !BIDI_IS_SENTINEL(TYPE(next)))
+            next = next->next;
+        next_type = (!next || BIDI_IS_SENTINEL(TYPE(next))) ? base_bir : TYPE(next);
        /* "European and arabic numbers are treated as though they were R, NUMBER_TO_RTL does this. */
        this_type = BIDI_NUMBER_TO_RTL(this_type);
        prev_type = BIDI_NUMBER_TO_RTL(prev_type);
@@ -498,6 +594,9 @@ static void bidi_resolveNeutrals(TYPERUN **ptype_rl_list, Uint32 base_bir)
    print_resolved_levels (type_rl_list);
    print_resolved_types (type_rl_list);
 #endif
+
+    if (bracket_types)
+        free(bracket_types);
 }

 /* 5.Resolving implicit levels. */
@@ -549,10 +648,13 @@ bidi_resolveMirrorChar (const CHARSETOPS* charset_ops, Achar32* achars, int len,
            int i;
            for (i = POS (pp); i < POS (pp) + LEN (pp); i++)
            {
+                Achar32 ch = achars[i];
+                Achar32 real_ch = REAL_ACHAR(ch);
                Achar32 mirrored_ch;
                if (charset_ops->bidi_mirror_char &&
-                        charset_ops->bidi_mirror_char (achars[i], &mirrored_ch))
-                    achars[i] = mirrored_ch;
+                        charset_ops->bidi_mirror_char (real_ch, &mirrored_ch)) {
+                    achars[i] = IS_MBCHV(ch) ? SET_MBCHV(mirrored_ch) : mirrored_ch;
+                }
            }
        }
    }
@@ -593,7 +695,7 @@ static void bidi_resolve_string (const CHARSETOPS* charset_ops,
    bidi_resolveWeak(&type_rl_list, base_dir);

    /* 4.Resolving Neutral Types */
-    bidi_resolveNeutrals(&type_rl_list, base_dir);
+    bidi_resolveNeutrals(charset_ops, achars, len, &type_rl_list, base_dir);

    /* 5.Resolving implicit levels. */
    *pmax_level = bidi_resolveImplicit(&type_rl_list, base_level);
@@ -703,21 +805,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 +826,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);

@@ -735,14 +837,15 @@ Achar32* __mg_legacy_bidi_map_reorder (const CHARSETOPS* charset_ops,
        run_pos = node_p->pos;
        run_len = node_p->len;

-        for (i=0; i<run_len; i++)
-        {
+        for (i=0; i<run_len; i++) {
            (map+run_pos+i)->is_rtol = (node_p)->level & 1;
        }
    }

-    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 +855,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.*/
@@ -820,4 +928,3 @@ Uint32 __mg_legacy_bidi_str_base_dir (const CHARSETOPS* charset_ops,

    return base_dir;
 }
-
--- a/Show More
+++ b/Show More