Order blocks by Unicode location

Signed-off-by: Simon Rozman <simon.rozman@amebis.si>

.gitignore

@@ -1,6 +1,3 @@
-/*.opensdf
-/*.sdf
-/*.suo
-/ipch
+/.vs
 *.user
 temp

.gitmodules

@@ -1,18 +1,24 @@
 [submodule "lib/stdex"]
 	path = lib/stdex
-	url = https://github.com/Amebis/stdex.git
+	url = https://git.amebis.si/Amebis/stdex.git
 [submodule "lib/WinStd"]
 	path = lib/WinStd
-	url = https://github.com/Amebis/WinStd.git
+	url = https://git.amebis.si/Amebis/WinStd.git
 [submodule "lib/wxExtend"]
 	path = lib/wxExtend
-	url = https://github.com/Amebis/wxExtend.git
+	url = https://git.amebis.si/Amebis/wxExtend.git
 [submodule "MSI/MSIBuild"]
 	path = MSI/MSIBuild
-	url = https://github.com/Amebis/MSIBuild.git
+	url = https://git.amebis.si/Amebis/MSIBuild.git
 [submodule "MSI/MSICA"]
 	path = MSI/MSICA
-	url = https://github.com/Amebis/MSICA.git
+	url = https://git.amebis.si/Amebis/MSICA.git
 [submodule "Updater"]
 	path = Updater
-	url = https://github.com/Amebis/Updater.git
+	url = https://git.amebis.si/Amebis/Updater.git
+[submodule "lib/oatpp"]
+	path = lib/oatpp
+	url = https://github.com/oatpp/oatpp.git
+[submodule "lib/oatpp-swagger"]
+	path = lib/oatpp-swagger
+	url = https://github.com/oatpp/oatpp-swagger.git

LOCALIZATION.md

@@ -1,17 +1,18 @@
-# Localization of ZRCola
+# Localization of ZRCola
 
 In order to get ZRCola experience in your language the following resources should be translated:
 
-1. [ZRCola](https://poeditor.com/join/project/NTidhEPdDM)
-2. [ZRCola-zrcdb](https://poeditor.com/join/project/QBuYsTwk0d)
-3. [libZRColaUI](https://poeditor.com/join/project/vrnIvk5IOM)
-4. [Updater](https://poeditor.com/join/project/oDK4ktH3ZV)
-5. [wxExtend](https://poeditor.com/join/project/YmsdlC3CBv)
+1. [ZRCola Application](https://www.transifex.com/amebis/zrcola/app/)
+2. [ZRCola Database](https://www.transifex.com/amebis/zrcola/database/)
+3. [ZRCola Core](https://www.transifex.com/amebis/zrcola/core/)
+4. [Updater](https://www.transifex.com/amebis/updater/updater/) and [Updater UpdCheck](https://www.transifex.com/amebis/updater/updcheck/)
+5. [wxExtend](https://www.transifex.com/amebis/wxextend/wxextend/)
 6. Setup
-   - [MSIBuildUI](https://poeditor.com/join/project/ikxWBlq1o5)
-   - [MSIBuildCore](https://poeditor.com/join/project/RSCSsz9fXi)
-   - [MSICALib](https://poeditor.com/join/project/cKP0wwBrHU)
-   - [MSICA](https://poeditor.com/join/project/gCNPagUQvn)
+   - [ZRCola Setup](https://www.transifex.com/amebis/zrcola/setup/)
+   - [MSIBuild UI](https://www.transifex.com/amebis/msibuild/ui/)
+   - [MSIBuild Core](https://www.transifex.com/amebis/msibuild/core/)
+   - [MSICALib](https://www.transifex.com/amebis/msicalib/msicalib/)
+   - [MSICA](https://www.transifex.com/amebis/msica/msica/)
 
 ## General Guidelines
 

MSI/MSM/.gitignore

@@ -1,5 +0,0 @@
-/*.log
-/Microsoft_VC100_CRT_x64.msm
-/Microsoft_VC100_CRT_x86.msm
-/Microsoft_VC100_DebugCRT_x64.msm
-/Microsoft_VC100_DebugCRT_x86.msm

MSI/MSM/Microsoft_VC100_CRT_x64.lst

@@ -1,2 +0,0 @@
-Win\System64\msvcp100.dll
-Win\System64\msvcr100.dll

MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 Amebis
-#
-#    This file is part of ZRCola.
-#
-#    ZRCola is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    ZRCola is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/Microsoft_VC100_CRT_x86.lst

@@ -1,2 +0,0 @@
-Win\System\msvcp100.dll
-Win\System\msvcr100.dll

MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 Amebis
-#
-#    This file is part of ZRCola.
-#
-#    ZRCola is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    ZRCola is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst

@@ -1,2 +0,0 @@
-Win\System64\msvcp100d.dll
-Win\System64\msvcr100d.dll

MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 Amebis
-#
-#    This file is part of ZRCola.
-#
-#    ZRCola is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    ZRCola is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst

@@ -1,2 +0,0 @@
-Win\System\msvcp100d.dll
-Win\System\msvcr100d.dll

MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 Amebis
-#
-#    This file is part of ZRCola.
-#
-#    ZRCola is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    ZRCola is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/ZRCola/Makefile

@@ -1,21 +1,5 @@
-#
-#    Copyright 1991-2017 Amebis
-#
-#    This file is part of ZRCola.
-#
-#    ZRCola is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    ZRCola is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-#
+#    SPDX-License-Identifier: GPL-3.0-or-later
+#    Copyright © 1991-2022 Amebis
 
 !INCLUDE "..\..\include\MSIBuildCfg.mak"
 !INCLUDE "..\MSIBuild\Makefile"

MSI/ZRCola/wxWidgets/.gitignore

@@ -1,9 +0,0 @@
-/*-1.idt
-/*-2.idt
-/*-2.idtx
-/*.Binary-1
-/*.Binary-2
-/*.Icon-1
-/*.Icon-2
-/*.lst
-/*.msm

MSI/ZRCola/wxWidgets/Makefile

@@ -1,94 +0,0 @@
-#
-#    Copyright 1991-2017 Amebis
-#
-#    This file is part of ZRCola.
-#
-#    ZRCola is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    ZRCola is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-#
-
-!INCLUDE "..\..\..\include\MSIBuildCfg.mak"
-
-# Note: When changing WXWIDGETS_VER or WXWIDGETS_COMPILER, the DLL filenames will change.
-# Then, you MUST change the component GUIDs as well.
-WXWIDGETS_VER=311
-WXWIDGETS_COMPILER=_vc100
-
-!IF "$(PLAT)" == "x64"
-WXWIDGETS_PLAT=_x64
-!ELSE
-WXWIDGETS_PLAT=
-!ENDIF
-
-!IF "$(CFG)" == "Debug"
-WXWIDGETS_CFG=ud
-!ELSE
-WXWIDGETS_CFG=u
-!ENDIF
-
-
-######################################################################
-# Component
-
-All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
-
-"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
-	move /y << $@ > NUL
-Component	ComponentId	Directory_	Attributes	Condition	KeyPath
-s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
-Component	Component
-!IF "$(PLAT)" == "Win32"
-compwxbase.dll.Win32	{4C7F5A16-5B74-47D5-A405-57C7BD96F090}	ZRCOLABINDIR	0		filewxbase.dll.Win32
-compwxbase_net.dll.Win32	{00534942-B21F-4401-BFE4-C7677F4BE3E5}	ZRCOLABINDIR	0		filewxbase_net.dll.Win32
-compwxbase_xml.dll.Win32	{71E30748-DD22-4D8B-B26F-60C5150D9AAE}	ZRCOLABINDIR	0		filewxbase_xml.dll.Win32
-compwxmsw_core.dll.Win32	{FB8D46B9-86DC-4590-8F0A-8294F6A45E6A}	ZRCOLABINDIR	0		filewxwxmsw_core.dll.Win32
-compwxmsw_adv.dll.Win32	{7B7DB31D-1760-493A-BBE9-35237A6EF9E0}	ZRCOLABINDIR	0		filewxmsw_adv.dll.Win32
-compwxmsw_aui.dll.Win32	{49CF9864-63B6-4F43-8EC7-7294B966B419}	ZRCOLABINDIR	0		filewxmsw_aui.dll.Win32
-!ENDIF
-!IF "$(PLAT)" == "x64"
-compwxbase.dll.x64	{905D8859-BFD2-410A-81DB-93231088C066}	ZRCOLABINDIR	256		filewxbase.dll.x64
-compwxbase_net.dll.x64	{8A0A49C8-DAEB-4983-8E8D-9DE30AE1D0B6}	ZRCOLABINDIR	256		filewxbase_net.dll.x64
-compwxbase_xml.dll.x64	{24A5F181-EFE7-4542-8AAB-1D21DB74E954}	ZRCOLABINDIR	256		filewxbase_xml.dll.x64
-compwxmsw_core.dll.x64	{F5B3F6E6-4FFB-4A79-A794-202D6F93F716}	ZRCOLABINDIR	256		filewxwxmsw_core.dll.x64
-compwxmsw_adv.dll.x64	{D7722FB9-59BB-498F-93C3-78451471A023}	ZRCOLABINDIR	256		filewxmsw_adv.dll.x64
-compwxmsw_aui.dll.x64	{FB703979-0E3D-458E-82DD-DAC33329FA9D}	ZRCOLABINDIR	256		filewxmsw_aui.dll.x64
-!ENDIF
-<<NOKEEP
-
-
-######################################################################
-# File
-
-All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
-
-"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
-	move /y << $@ > NUL
-File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
-s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
-File	File
-filewxbase.dll.$(PLAT)	compwxbase.dll.$(PLAT)	WXBASE~1.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-filewxbase_net.dll.$(PLAT)	compwxbase_net.dll.$(PLAT)	WXBASE~2.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_net$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-filewxbase_xml.dll.$(PLAT)	compwxbase_xml.dll.$(PLAT)	WXBASE~3.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_xml$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-filewxwxmsw_core.dll.$(PLAT)	compwxmsw_core.dll.$(PLAT)	WXMSW3~1.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_core$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-filewxmsw_adv.dll.$(PLAT)	compwxmsw_adv.dll.$(PLAT)	WXMSW3~2.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_adv$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-filewxmsw_aui.dll.$(PLAT)	compwxmsw_aui.dll.$(PLAT)	WXMSW3~3.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_aui$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-<<NOKEEP
-
-
-######################################################################
-# Build MSM module!
-######################################################################
-
-!INCLUDE "..\..\MSIBuild\MSM.mak"

README.md

@@ -6,30 +6,58 @@ A Microsoft Windows application for composing texts using a wide range of Slavic
 http://zrcola.zrc-sazu.si/en/
 
 ## Binaries for Download
-https://www.amebis.si/prenos/ZRCola/
+https://prenos.amebis.si/ZRCola/
 
 ## Building
 
 ### Building Environment Requirements
 - Microsoft Windows Vista or later
-- Microsoft Visual Studio 2010 SP1
+- Microsoft Visual Studio 2017
 - _sed.exe_ and _grep.exe_
 - Command line utilities from Microsoft Windows SDK Bin folder: distributed with Visual Studio, add Bin folder to path manually.
 - Additional command line utilities from project's bin folder: add bin folder to path. The source code is provided on request.
-- wxWidgets 3.1.1 - set `WXWIN` environment variable to the folder where wxWidgets include and lib files are located. Official binary builds are required.
+
+### wxWidgets
+ZRCola is using wxWidgets static libraries. You have to compile static libraries yourself.
+
+#### Compiling wxWidgets Win32 static libraries
+1. Start _x86 Native Tools Command Prompt for VS 2017_
+2. Change working folder to `build\msw`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 BUILD=release`
+
+#### Compiling wxWidgets x64 static libraries
+1. Start _x64 Native Tools Command Prompt for VS 2017_
+2. Change working folder to `build\msw`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64 BUILD=release`
+
+#### Specifying wxWidgets path
+ZRCola compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (e.g. `C:\SDK\wxWidgets`).
 
 ### Digital Signing of Build Outputs
-In order to have the build process digitally sign output files, one should provide the following:
+In order to have the build process digitally sign output files, one should setup either:
 
-1. A signing certificate installed in the current user's certificate store.
-2. The following variables in the environment:
-  - `ManifestCertificateThumbprint` - set the value to certificate's SHA1 thumbprint (hexadecimal, without spaces, i.e. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
-  - `ManifestTimestampUrl`          - set the value to URL used to perform timestamp signature (i.e. `http://timestamp.verisign.com/scripts/timstamp.dll`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
+- Local signing:
+   1. A signing certificate installed in the current user's certificate store.
+   2. The following variables in the environment:
+      - `ManifestCertificateThumbprint` - set the value to certificate's SHA1 thumbprint (hexadecimal, without spaces, e.g. `f61b973226c502a732d24f41aa85e192b009e7c0`).
+      - `ManifestTimestampRFC3161Url`   - set the value to URL used to perform RFC3161 timestamp signature (e.g. `http://time.certum.pl`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
 
-Please note that only Release builds are configured for timestamp signing. Debug configurations do not attempt to timestamp sign the resulting DLL and EXE files in order to speed up the building process and enable offline building.
+- Microsoft Trusted Signing:
+   1. Install [Trusted Signing dlib package](https://www.nuget.org/packages/Microsoft.Trusted.Signing.Client):
+      ```cmd
+      nuget install Microsoft.Trusted.Signing.Client -Version 1.0.53 -x
+      ```
+   2. Provide a [`manifest.json`](https://learn.microsoft.com/en-us/azure/trusted-signing/how-to-signing-integrations#create-a-json-file) file and place it at `%APPDATA%\Microsoft.Trusted.Signing.Client.json`:
+      ```cmd
+      notepad "%APPDATA%\Microsoft.Trusted.Signing.Client.json"
+      ```
+
+Please note that only Release builds are configured for signing. Debug configurations do not sign the resulting DLL and EXE files in order to speed up the building process and reduce signing volume.
 
 ### Building
-Use Microsoft NMAKE to build the project. The resulting files can be found in output subfolder.
+Use Microsoft NMAKE to build the project. The resulting files can be found in output subfolder. Open _x64 Native Tools Command Prompt for VS 2017_ for building.
 
 - `nmake Clean`	Delete all intermediate and output files.
 - `nmake Setup`	Build a release version of project and release MSI setup files.
@@ -37,7 +65,11 @@ Use Microsoft NMAKE to build the project. The resulting files can be found in ou
 - `nmake Register`	Build a debug version of project, install fonts (reboot required), and Start Menu shortcuts. For development purposes only!
 - `nmake Unregister`	Remove Start Menu shortcuts, and fonts. For development purposes only!
 
-The `/ls` flag can be appended to the commands above to reduce NMAKE's verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.
+The `/ls` flag can be appended to the commands above to reduce NMAKE's verbosity. You can combine multiple targets (e.g. nmake Unregister Clean). Please, see NMAKE reference for further reading.
+
+## Building and installing ZRCola webservice
+
+ZRCola is also available as a Linux web-service. See [ZRColaWS/README.md](ZRColaWS/README.md) for instructions.
 
 ## Translating ZRCola
 Instructions how to translate ZRCola to your language can be found [here](LOCALIZATION.md).

ZRCola.sln

@@ -1,11 +1,13 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29728.190
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRCola", "ZRCola\ZRCola.vcxproj", "{CD9E4170-92DD-440E-980C-D15F62032249}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendDll-10.0.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFEBC17E-C840-4507-BDE6-1EF5B52DDCC5}"
 	ProjectSection(SolutionItems) = preProject
@@ -16,86 +18,89 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-10.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Updater\Updater\build\Updater.vcxproj", "{990D8CF9-4457-4DC0-AA18-4968EF434741}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-10.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Release|ARM64 = Release|ARM64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|ARM64.Build.0 = Debug|ARM64
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|Win32.Build.0 = Debug|Win32
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|x64.ActiveCfg = Debug|x64
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|x64.Build.0 = Debug|x64
+		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|ARM64.ActiveCfg = Release|ARM64
+		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|ARM64.Build.0 = Release|ARM64
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|Win32.ActiveCfg = Release|Win32
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|Win32.Build.0 = Release|Win32
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|x64.ActiveCfg = Release|x64
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|x64.Build.0 = Release|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.Build.0 = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.Build.0 = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.ActiveCfg = Release|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.Build.0 = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.Build.0 = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.ActiveCfg = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.Build.0 = Release|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.ActiveCfg = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.Build.0 = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64
+		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|ARM64.Build.0 = Debug|ARM64
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|Win32.Build.0 = Debug|Win32
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x64.ActiveCfg = Debug|x64
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x64.Build.0 = Debug|x64
+		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|ARM64.Build.0 = Release|ARM64
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|Win32.ActiveCfg = Release|Win32
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|Win32.Build.0 = Release|Win32
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x64.ActiveCfg = Release|x64
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x64.Build.0 = Release|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|ARM64.Build.0 = Debug|ARM64
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.Build.0 = Debug|Win32
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x64.ActiveCfg = Debug|x64
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x64.Build.0 = Debug|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|ARM64.ActiveCfg = Release|ARM64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|ARM64.Build.0 = Release|ARM64
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.ActiveCfg = Release|Win32
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.Build.0 = Release|Win32
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.ActiveCfg = Release|x64
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.Build.0 = Release|x64
-		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.ActiveCfg = Debug|Win32
-		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.Build.0 = Debug|Win32
-		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.ActiveCfg = Debug|x64
-		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.Build.0 = Debug|x64
-		{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.ActiveCfg = Release|Win32
-		{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.Build.0 = Release|Win32
-		{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.ActiveCfg = Release|x64
-		{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.Build.0 = Release|x64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|ARM64.Build.0 = Debug|ARM64
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.ActiveCfg = Debug|Win32
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.Build.0 = Debug|Win32
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.ActiveCfg = Debug|x64
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.Build.0 = Debug|x64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|ARM64.ActiveCfg = Release|ARM64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|ARM64.Build.0 = Release|ARM64
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.ActiveCfg = Release|Win32
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.Build.0 = Release|Win32
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.ActiveCfg = Release|x64
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.Build.0 = Release|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
-		{518777CC-0A59-4415-A12A-82751ED75343} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 		{990D8CF9-4457-4DC0-AA18-4968EF434741} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
-		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EECB5329-0607-4D77-8BC0-48BD8C08BEF9}
 	EndGlobalSection
 EndGlobal

ZRCola/ZRCola.props

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\Updater\Updater\include;..\lib\stdex\include;..\lib\WinStd\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

ZRCola/ZRCola.vcxproj

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,62 +31,45 @@
     <RootNamespace>ZRCola</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Debug.props" />
-    <Import Project="ZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\x64.props" />
-    <Import Project="..\include\Debug.props" />
-    <Import Project="ZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Release.props" />
-    <Import Project="ZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\x64.props" />
-    <Import Project="..\include\Release.props" />
-    <Import Project="ZRCola.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\Updater\Updater\include;..\lib\stdex\include;..\lib\WinStd\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Manifest>
+      <EnableDpiAwareness>true</EnableDpiAwareness>
+    </Manifest>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\Updater\Updater\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="zrcolaabout.cpp" />
     <ClCompile Include="zrcolaapp.cpp" />
@@ -91,10 +82,11 @@
     <ClCompile Include="zrcolagui.cpp" />
     <ClCompile Include="zrcolakeyhndlr.cpp" />
     <ClCompile Include="zrcolasettings.cpp" />
+    <ClCompile Include="zrcolatranseq.cpp" />
     <ClCompile Include="zrcolaupdater.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="pch.h" />
     <ClInclude Include="zrcolaabout.h" />
     <ClInclude Include="zrcolaapp.h" />
     <ClInclude Include="zrcolachrcatpnl.h" />
@@ -106,6 +98,7 @@
     <ClInclude Include="zrcolagui.h" />
     <ClInclude Include="zrcolakeyhndlr.h" />
     <ClInclude Include="zrcolasettings.h" />
+    <ClInclude Include="zrcolatranseq.h" />
     <ClInclude Include="zrcolaupdater.h" />
   </ItemGroup>
   <ItemGroup>
@@ -115,11 +108,8 @@
     <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
       <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-10.0.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendDll-10.0.vcxproj">
-      <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
+      <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
     </ProjectReference>
     <ProjectReference Include="..\Updater\Updater\build\Updater.vcxproj">
       <Project>{990d8cf9-4457-4dc0-aa18-4968ef434741}</Project>
@@ -128,6 +118,8 @@
   <ItemGroup>
     <None Include="locale\ZRCola.pot" />
     <None Include="res\char_select.ico" />
+    <None Include="res\copy_composed_and_return.ico" />
+    <None Include="res\copy_decomposed_and_return.ico" />
     <None Include="res\edit_copy.ico" />
     <None Include="res\edit_cut.ico" />
     <None Include="res\edit_paste.ico" />
@@ -137,7 +129,9 @@
     <None Include="res\send_composed.ico" />
     <None Include="res\send_decomposed.ico" />
     <None Include="res\zrcola.ico" />
-    <None Include="ZRCola.fbp" />
+    <None Include="res\ZRCola.fbp">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ZRCola.rc" />
@@ -147,6 +141,9 @@
     <POCompile Include="locale\ru_RU.po" />
     <POCompile Include="locale\sl_SI.po" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\composition.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\include\xgettext.targets" />

ZRCola/ZRCola.vcxproj.filters

@@ -19,7 +19,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="zrcolaapp.cpp">
@@ -58,9 +58,12 @@
     <ClCompile Include="zrcolachrreq.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="zrcolatranseq.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="zrcolaapp.h">
@@ -99,6 +102,9 @@
     <ClInclude Include="zrcolachrreq.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="zrcolatranseq.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\zrcola.ico">
@@ -122,7 +128,7 @@
     <None Include="res\edit_paste.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="ZRCola.fbp">
+    <None Include="res\ZRCola.fbp">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="res\char_select.ico">
@@ -137,6 +143,12 @@
     <None Include="res\navigate_forward.ico">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="res\copy_composed_and_return.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\copy_decomposed_and_return.ico">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ZRCola.rc">
@@ -154,4 +166,9 @@
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\composition.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
 </Project>

ZRCola/pch.cpp

@@ -0,0 +1,6 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+*/
+
+#include "pch.h"

ZRCola/pch.h

@@ -1,61 +1,56 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../include/version.h"
-#include "zrcolaabout.h"
-#include "zrcolaapp.h"
-#include "zrcolachrcatpnl.h"
-#include "zrcolachrgrid.h"
-#include "zrcolachrreq.h"
-#include "zrcolacomppnl.h"
-#include "zrcolafrm.h"
-#include "zrcolakeyhndlr.h"
-#include "zrcolasettings.h"
-#include "zrcolaupdater.h"
-
-#include <Updater/chkthread.h>
-
-#include <wxex/common.h>
-#include <wxex/url.h>
-#include <wxex/persist/auimanager.h>
-
-#include <wx/ffile.h>
-#include <wx/msgdlg.h>
-#include <wx/persist.h>
-#include <wx/persist/toplevel.h>
-#include <wx/utils.h>
-#include <wx/valtext.h>
-#include <wx/socket.h>
-
-#include <WinStd/MSI.h>
-
-#include <fstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <stdex/idrec.h>
-
-#if defined(__WXMSW__)
-#include <Msi.h>
-#include <ShObjIdl.h>
-#include <ShlGuid.h>
-#endif
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+*/
+
+#pragma once
+
+#include "../include/version.h"
+#include "zrcolaabout.h"
+#include "zrcolaapp.h"
+#include "zrcolachrcatpnl.h"
+#include "zrcolachrgrid.h"
+#include "zrcolachrreq.h"
+#include "zrcolacomppnl.h"
+#include "zrcolafrm.h"
+#include "zrcolakeyhndlr.h"
+#include "zrcolasettings.h"
+#include "zrcolatranseq.h"
+#include "zrcolaupdater.h"
+
+#include <Updater/chkthread.h>
+
+#include <wxex/common.h>
+#include <wxex/icon.h>
+#include <wxex/url.h>
+#include <wxex/persist/auimanager.h>
+#include <wxex/persist/toplevel.h>
+
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include <wx/clipbrd.h>
+#include <wx/dcclient.h>
+#include <wx/ffile.h>
+#include <wx/msgdlg.h>
+#include <wx/persist.h>
+#include <wx/persist/toplevel.h>
+#include <wx/socket.h>
+#include <wx/tokenzr.h>
+#include <wx/utils.h>
+#include <wx/valtext.h>
+#pragma warning(pop)
+
+#include <WinStd/MSI.h>
+
+#include <fstream>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <zrcola/idrec.h>
+
+#if defined(__WXMSW__)
+#include <Msi.h>
+#include <ShObjIdl.h>
+#include <ShlGuid.h>
+#endif

ZRCola/res/zrcolagui.h

@@ -0,0 +1,430 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO *NOT* EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/cshelp.h>
+#include <wx/intl.h>
+class wxZRColaCharGrid;
+
+#include <wx/string.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/menu.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/aui/aui.h>
+#include <wx/aui/auibar.h>
+#include <wx/choice.h>
+class wxZRColaCharacterCatalogPanel;
+class wxZRColaComposerPanel;
+#include <wx/statusbr.h>
+#include <wx/frame.h>
+#include <wx/textctrl.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/panel.h>
+#include <wx/splitter.h>
+#include <wx/timer.h>
+#include <wx/grid.h>
+#include <wx/checkbox.h>
+#include <wx/srchctrl.h>
+#include <wx/hyperlink.h>
+#include <wx/checklst.h>
+#include <wx/stattext.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+#include <wx/radiobut.h>
+#include <wx/listbox.h>
+#include <wx/listbook.h>
+#include <wx/listctrl.h>
+#include <wx/statbmp.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaFrameBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaFrameBase : public wxFrame
+{
+	private:
+
+	protected:
+		enum
+		{
+			wxID_CHARACTER_SELECTOR = 6000,
+			wxID_SEND_DESTINATION,
+			wxID_COPY_DESTINATION_AND_RETURN,
+			wxID_SEND_SOURCE,
+			wxID_COPY_SOURCE_AND_RETURN,
+			wxID_SEND_ABORT,
+			wxID_COMPOSITION_NONE,
+			wxID_COMPOSITION_ZRCOLA,
+			wxID_COMPOSITION_UNICODE,
+			wxID_WARN_PUA,
+			wxID_SETTINGS,
+			wxID_TOOLBAR_EDIT,
+			wxID_TOOLBAR_TRANSLATE,
+			wxID_PANEL_CHRGRPS,
+			wxID_HELP_INSTRUCTIONS,
+			wxID_HELP_SHORTCUTS,
+			wxID_HELP_REQCHAR,
+			wxID_HELP_UPDATE,
+		};
+
+		wxMenuBar* m_menubar;
+		wxMenu* m_menuProgram;
+		wxMenu* m_menuEdit;
+		wxMenuItem* m_menuItemCompositionNone;
+		wxMenuItem* m_menuItemCompositionZRCola;
+		wxMenuItem* m_menuItemCompositionUnicode;
+		wxMenu* m_menuTranslationSeq;
+		wxMenuItem* m_menuItemWarnPUA;
+		wxMenu* m_menuView;
+		wxMenu* m_menuHelp;
+		wxAuiToolBar* m_toolbarEdit;
+		wxAuiToolBarItem* m_toolEditCut;
+		wxAuiToolBarItem* m_toolEditCopy;
+		wxAuiToolBarItem* m_toolEditPaste;
+		wxAuiToolBar* m_toolbarTranslate;
+		wxAuiToolBarItem* m_toolCharSelect;
+		wxAuiToolBarItem* m_toolSendDestination;
+		wxAuiToolBarItem* m_toolSendSource;
+		wxChoice* m_toolComposition;
+		wxChoice* m_toolTranslationSeq;
+		wxAuiToolBarItem* m_toolWarnPUA;
+		wxZRColaCharacterCatalogPanel* m_panelChrCat;
+		wxStatusBar* m_statusBar;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
+		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnCompositionChoice( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+		wxZRColaComposerPanel* m_panel;
+
+		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 640,480 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") );
+		wxAuiManager m_mgr;
+
+		~wxZRColaFrameBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaComposerPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaComposerPanelBase : public wxPanel
+{
+	private:
+
+	protected:
+		enum
+		{
+			wxID_TIMER_SAVE = 6000,
+		};
+
+		wxSplitterWindow* m_splitterSource;
+		wxPanel* m_panelSourceEdit;
+		wxPanel* m_panelSourceHex;
+		wxTextCtrl* m_sourceHex;
+		wxSplitterWindow* m_splitterDestination;
+		wxPanel* m_panelDestinationEdit;
+		wxPanel* m_panelDestinationHex;
+		wxTextCtrl* m_destinationHex;
+		wxTimer m_timerSave;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnSourcePaint( wxPaintEvent& event ) { event.Skip(); }
+		virtual void OnSourceText( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSourceHexPaint( wxPaintEvent& event ) { event.Skip(); }
+		virtual void OnDestinationPaint( wxPaintEvent& event ) { event.Skip(); }
+		virtual void OnDestinationText( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDestinationHexPaint( wxPaintEvent& event ) { event.Skip(); }
+		virtual void OnSaveTimer( wxTimerEvent& event ) { event.Skip(); }
+
+
+	public:
+		wxTextCtrl* m_source;
+		wxTextCtrl* m_destination;
+
+		wxZRColaComposerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaComposerPanel") );
+
+		~wxZRColaComposerPanelBase();
+
+		void m_splitterSourceOnIdle( wxIdleEvent& )
+		{
+			m_splitterSource->SetSashPosition( -5 );
+			m_splitterSource->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterSourceOnIdle ), NULL, this );
+		}
+
+		void m_splitterDestinationOnIdle( wxIdleEvent& )
+		{
+			m_splitterDestination->SetSashPosition( -5 );
+			m_splitterDestination->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterDestinationOnIdle ), NULL, this );
+		}
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaCharacterCatalogPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaCharacterCatalogPanelBase : public wxPanel
+{
+	private:
+
+	protected:
+		wxChoice* m_choice;
+		wxZRColaCharGrid* m_grid;
+		wxCheckBox* m_show_all;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnChoice( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnGridClick( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnGridKeyDown( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnShowAll( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaCharacterCatalogPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaCharacterCatalog") );
+
+		~wxZRColaCharacterCatalogPanelBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaCharSelectBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaCharSelectBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxSearchCtrl* m_search;
+		wxHyperlinkCtrl* m_search_more;
+		wxPanel* m_search_panel;
+		wxCheckListBox* m_blocks;
+		wxHyperlinkCtrl* m_blocksAll;
+		wxHyperlinkCtrl* m_blocksNone;
+		wxHyperlinkCtrl* m_blocksInvert;
+		wxZRColaCharGrid* m_gridResults;
+		wxZRColaCharGrid* m_gridRecent;
+		wxStaticText* m_labelUnicode;
+		wxTextCtrl* m_unicode;
+		wxTextCtrl* m_shortcut;
+		wxGrid* m_gridPreview;
+		wxTextCtrl* m_description;
+		wxTextCtrl* m_tags;
+		wxTextCtrl* m_block;
+		wxHyperlinkCtrl* m_navigateBack;
+		wxHyperlinkCtrl* m_navigateForward;
+		wxZRColaCharGrid* m_gridRelated;
+		wxButton* m_buttonInsert;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnSearchText( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSearchMore( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnBlocksToggle( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnBlocksAll( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnBlocksNone( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnBlocksInvert( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnResultCellDClick( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnResultSelectCell( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnResultsKeyDown( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnRecentCellDClick( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnRecentSelectCell( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnRecentKeyDown( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnUnicodeText( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPreviewKeyDown( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnNavigateBack( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnNavigateForward( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnRelatedSelectCell( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnInsert( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInsertUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Character Search"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharSelect") );
+
+		~wxZRColaCharSelectBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaSettingsBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaSettingsBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxListbook* m_listbook;
+		wxPanel* m_panelLanguage;
+		wxStaticText* m_langLabel;
+		wxRadioButton* m_langAuto;
+		wxRadioButton* m_langManual;
+		wxListBox* m_languages;
+		wxPanel* m_panelAutoStart;
+		wxStaticText* m_autoStartLabel;
+		wxCheckBox* m_autoStart;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+		wxButton* m_sdbSizerButtonsApply;
+		wxButton* m_sdbSizerButtonsCancel;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		virtual void OnLanguageUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void OnApplyButtonClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaSettingsBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaSettings") );
+
+		~wxZRColaSettingsBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaAboutBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaAboutBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapIcon;
+		wxStaticText* m_staticTextZRCola;
+		wxStaticText* m_staticTextVersion;
+		wxStaticText* m_staticTextColophone;
+		wxStaticText* m_staticTextCopyright;
+		wxHyperlinkCtrl* m_hyperlink;
+		wxStaticText* m_staticTextDeclaration;
+		wxTextCtrl* m_declaration;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+
+	public:
+
+		wxZRColaAboutBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaAbout") );
+
+		~wxZRColaAboutBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaUpdaterBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaUpdaterBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxTextCtrl* m_log;
+		wxButton* m_buttonUpdate;
+		wxButton* m_buttonClose;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnUpdate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Product Update"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaUpdater") );
+
+		~wxZRColaUpdaterBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaCharRequestBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaCharRequestBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxStaticText* m_characterLbl;
+		wxTextCtrl* m_character;
+		wxStaticText* m_characterNote;
+		wxStaticText* m_contextLbl;
+		wxTextCtrl* m_context;
+		wxStaticText* m_note;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+		wxButton* m_sdbSizerButtonsCancel;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Request a New Character"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharRequest") );
+
+		~wxZRColaCharRequestBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaTranslationSeqBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaTranslationSeqBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxStaticText* m_transLbl;
+		wxStaticText* m_availableLbl;
+		wxListBox* m_available;
+		wxButton* m_add;
+		wxButton* m_remove;
+		wxStaticText* m_selectedLbl;
+		wxListBox* m_selected;
+		wxButton* m_selectedUp;
+		wxButton* m_selectedDown;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+		wxButton* m_sdbSizerButtonsCancel;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		virtual void OnUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void OnAvailableChar( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnAvailableDClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAdd( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRemove( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectedChar( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnSelectedDClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectedUp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectedDown( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaTranslationSeqBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Custom Translation Sequence"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaTranslationSeq") );
+
+		~wxZRColaTranslationSeqBase();
+
+};
+

ZRCola/stdafx.cpp

@@ -1,20 +0,0 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "stdafx.h"

ZRCola/zrcolaabout.cpp

@@ -1,23 +1,9 @@
 /*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////

ZRCola/zrcolaabout.h

@@ -1,20 +1,6 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
@@ -25,7 +11,11 @@ class wxZRColaAbout;
 
 #pragma once
 
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include "zrcolagui.h"
+#pragma warning(pop)
 
 
 ///

ZRCola/zrcolaapp.cpp

@@ -1,23 +1,9 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
 #if defined(__WXMSW__)
 #pragma comment(lib, "msi.lib")
 #endif
@@ -27,11 +13,13 @@
 // ZRColaApp
 //////////////////////////////////////////////////////////////////////////
 
+#pragma warning(suppress: 28251) // wxWidgets implement WinMain without code analysis annotations.
 wxIMPLEMENT_APP(ZRColaApp);
 
 
 ZRColaApp::ZRColaApp() :
     m_mainWnd(NULL),
+    #pragma warning(suppress: 26812) // wxLanguage is unscoped
     m_lang_ui(wxLANGUAGE_DEFAULT),
     wxApp()
 {
@@ -94,7 +82,7 @@ bool ZRColaApp::OnInit()
                     ZRCola::recordid_t id;
                     if (!stdex::idrec::read_id(dat, id, size)) break;
 
-                    if (id == ZRCola::translation_rec::id) {
+                    if (id == ZRCola::translation_rec::id()) {
                         dat >> ZRCola::translation_rec(m_t_db);
                         if (dat.good()) {
                             has_translation_data = true;
@@ -102,48 +90,66 @@ bool ZRColaApp::OnInit()
                             wxFAIL_MSG(wxT("Error reading translation data from ZRCola.zrcdb."));
                             m_t_db.clear();
                         }
-                    } else if (id == ZRCola::langchar_rec::id) {
+                    } else if (id == ZRCola::transet_rec::id()) {
+                        dat >> ZRCola::transet_rec(m_ts_db);
+                        if (!dat.good()) {
+                            wxFAIL_MSG(wxT("Error reading translation set data from ZRCola.zrcdb."));
+                            m_ts_db.clear();
+                        }
+                    } else if (id == ZRCola::transeq_rec::id()) {
+                        dat >> ZRCola::transeq_rec(m_tsq_db);
+                        if (!dat.good()) {
+                            wxFAIL_MSG(wxT("Error reading translation sequence data from ZRCola.zrcdb."));
+                            m_tsq_db.clear();
+                        }
+                    } else if (id == ZRCola::langchar_rec::id()) {
                         dat >> ZRCola::langchar_rec(m_lc_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading language character data from ZRCola.zrcdb."));
                             m_lc_db.clear();
                         }
-                    } else if (id == ZRCola::language_rec::id) {
+                    } else if (id == ZRCola::language_rec::id()) {
                         dat >> ZRCola::language_rec(m_lang_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading language character data from ZRCola.zrcdb."));
                             m_lang_db.clear();
                         }
-                    } else if (id == ZRCola::keyseq_rec::id) {
+                    } else if (id == ZRCola::keyseq_rec::id()) {
                         dat >> ZRCola::keyseq_rec(m_ks_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading key sequences data from ZRCola.zrcdb."));
                             m_ks_db.clear();
                         }
-                    } else if (id == ZRCola::character_rec::id) {
+                    } else if (id == ZRCola::character_rec::id()) {
                         dat >> ZRCola::character_rec(m_chr_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading character data from ZRCola.zrcdb."));
                             m_chr_db.clear();
                         }
-                    } else if (id == ZRCola::chrcat_rec::id) {
-                        dat >> ZRCola::chrcat_rec(m_cc_db);
+                    } else if (id == ZRCola::chrblk_rec::id()) {
+                        dat >> ZRCola::chrblk_rec(m_cb_db);
                         if (!dat.good()) {
-                            wxFAIL_MSG(wxT("Error reading character category data from ZRCola.zrcdb."));
-                            m_cc_db.clear();
+                            wxFAIL_MSG(wxT("Error reading character block data from ZRCola.zrcdb."));
+                            m_cb_db.clear();
                         }
-                    } else if (id == ZRCola::chrtag_rec::id) {
+                    } else if (id == ZRCola::chrtag_rec::id()) {
                         dat >> ZRCola::chrtag_rec(m_ct_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading character tag data from ZRCola.zrcdb."));
                             m_ct_db.clear();
                         }
-                    } else if (id == ZRCola::tagname_rec::id) {
+                    } else if (id == ZRCola::tagname_rec::id()) {
                         dat >> ZRCola::tagname_rec(m_tn_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading tag name data from ZRCola.zrcdb."));
                             m_tn_db.clear();
                         }
+                    } else if (id == ZRCola::highlight_rec::id()) {
+                        dat >> ZRCola::highlight_rec(m_h_db);
+                        if (!dat.good()) {
+                            wxFAIL_MSG(wxT("Error reading highlight data from ZRCola.zrcdb."));
+                            m_h_db.clear();
+                        }
                     } else
                         stdex::idrec::ignore<ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat);
                 }
@@ -153,13 +159,14 @@ bool ZRColaApp::OnInit()
             }
         } else
             wxFAIL_MSG(wxT("ZRCola.zrcdb is not a valid ZRCola database."));
-    }
+    } else
+        wxFAIL_MSG(wxT("ZRCola.zrcdb not found or cannot be opened."));
 
     // Initialize sockets. Otherwise Updater thread will not work.
     wxSocketBase::Initialize();
 
     m_mainWnd = new wxZRColaFrame();
-    wxPersistentRegisterAndRestore<wxZRColaFrame>(m_mainWnd);
+    m_mainWnd->m_panel->RestoreFromStateFile();
     m_mainWnd->Show();
 
     return true;

ZRCola/zrcolaapp.h

@@ -1,20 +1,6 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
@@ -27,10 +13,15 @@ class ZRColaApp;
 
 #include "zrcolafrm.h"
 #include <WinStd/Win.h>
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/app.h>
 #include <wx/config.h>
 #include <wx/intl.h>
+#pragma warning(pop)
 #include <zrcola/character.h>
+#include <zrcola/highlight.h>
 #include <zrcola/language.h>
 #include <zrcola/translate.h>
 #include <zrcola/tag.h>
@@ -73,13 +64,16 @@ public:
 
 public:
     ZRCola::translation_db m_t_db;  ///< Translation database
+    ZRCola::transet_db m_ts_db;     ///< Translation set database
+    ZRCola::transeq_db m_tsq_db;    ///< Translation sequence database
     ZRCola::langchar_db m_lc_db;    ///< Language character database
     ZRCola::language_db m_lang_db;  ///< Language database
     ZRCola::keyseq_db m_ks_db;      ///< Key sequence database
     ZRCola::character_db m_chr_db;  ///< Character database
-    ZRCola::chrcat_db m_cc_db;      ///< Characted category database
+    ZRCola::chrblk_db m_cb_db;      ///< Character block database
     ZRCola::chrtag_db m_ct_db;      ///< Character tag database
     ZRCola::tagname_db m_tn_db;     ///< Tag name database
+    ZRCola::highlight_db m_h_db;    ///< Highlight database
 
     wxZRColaFrame *m_mainWnd;       ///< Main window
 
@@ -88,7 +82,7 @@ public:
 
 protected:
 #ifdef __WXMSW__
-    winstd::win_handle m_running;   ///< Global Win32 event to determine if another instance of ZRCola is already running
+    winstd::event m_running;        ///< Global Win32 event to determine if another instance of ZRCola is already running
 #endif
 };
 

ZRCola/zrcolachrcatpnl.cpp

@@ -1,23 +1,9 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -25,11 +11,13 @@
 //////////////////////////////////////////////////////////////////////////
 
 BEGIN_EVENT_TABLE(wxZRColaCharacterCatalogPanel, wxZRColaCharacterCatalogPanelBase)
-    EVT_MENU(wxZRColaCharacterCatalogPanel::wxID_FOCUS_DECOMPOSED, wxZRColaCharacterCatalogPanel::OnFocusDecomposed)
+    EVT_MENU(wxZRColaCharacterCatalogPanel::wxID_FOCUS_SOURCE, wxZRColaCharacterCatalogPanel::OnFocusSource)
 END_EVENT_TABLE()
 
 
-wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) : wxZRColaCharacterCatalogPanelBase(parent)
+wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) :
+    m_cg_id(0),
+    wxZRColaCharacterCatalogPanelBase(parent)
 {
     std::fstream dat((LPCTSTR)dynamic_cast<ZRColaApp*>(wxTheApp)->GetDatabaseFilePath(), std::ios_base::in | std::ios_base::binary);
     if (dat.good()) {
@@ -42,26 +30,27 @@ wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) :
                     dat >> rec;
                     if (!dat.good()) {
                         wxFAIL_MSG(wxT("Error reading character group data from ZRCola.zrcdb."));
-                        m_cg_db.idxRnk.clear();
-                        m_cg_db.data  .clear();
+                        m_cg_db.idxRank.clear();
+                        m_cg_db.data   .clear();
                     }
                 } else
                     wxFAIL_MSG(wxT("ZRCola.zrcdb has no character group data."));
             }
         } else
             wxFAIL_MSG(wxT("ZRCola.zrcdb is not a valid ZRCola database."));
-    }
+    } else
+        wxFAIL_MSG(wxT("ZRCola.zrcdb not found or cannot be opened."));
 
-    if (!m_cg_db.idxRnk.empty()) {
+    if (!m_cg_db.idxRank.empty()) {
         // Populate character group list.
-        for (size_t i = 0, n = m_cg_db.idxRnk.size(); i < n; i++) {
-            const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[i];
+        for (size_t i = 0, n = m_cg_db.idxRank.size(); i < n; i++) {
+            const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRank[i];
             wxString
-                label(cg.data, cg.name_len),
+                label(cg.name(), cg.name_len()),
                 label_tran2(wxGetTranslation(label, wxT("ZRCola-zrcdb")));
-            m_choice->Insert(label_tran2, i);
+            m_choice->Insert(label_tran2, (unsigned int)i);
         }
-        m_cg_id = m_cg_db.idxRnk[0].id;
+        m_cg_id = m_cg_db.idxRank[0].grp;
         m_choice->Select(0);
 
         Update();
@@ -70,7 +59,7 @@ wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) :
     // Register frame specific hotkey(s).
     {
         wxAcceleratorEntry entries[1];
-        entries[0].Set(wxACCEL_NORMAL, WXK_ESCAPE, wxID_FOCUS_DECOMPOSED);
+        entries[0].Set(wxACCEL_NORMAL, WXK_ESCAPE, wxID_FOCUS_SOURCE);
         SetAcceleratorTable(wxAcceleratorTable(_countof(entries), entries));
     }
 }
@@ -83,10 +72,10 @@ wxZRColaCharacterCatalogPanel::~wxZRColaCharacterCatalogPanel()
 
 void wxZRColaCharacterCatalogPanel::OnChoice(wxCommandEvent& event)
 {
-    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[event.GetSelection()];
+    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRank[event.GetSelection()];
 
-    if (m_cg_id != cg.id) {
-        m_cg_id = cg.id;
+    if (m_cg_id != cg.grp) {
+        m_cg_id = cg.grp;
         Update();
     }
 
@@ -98,8 +87,8 @@ void wxZRColaCharacterCatalogPanel::OnGridClick(wxGridEvent& event)
 {
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     if (app->m_mainWnd) {
-        app->m_mainWnd->m_panel->m_decomposed->WriteText(m_grid->GetCellValue(event.GetRow(), event.GetCol()));
-        app->m_mainWnd->m_panel->m_decomposed->SetFocus();
+        app->m_mainWnd->m_panel->m_source->WriteText(m_grid->GetCellValue(event.GetRow(), event.GetCol()));
+        app->m_mainWnd->m_panel->m_source->SetFocus();
     }
 
     event.Skip();
@@ -113,8 +102,8 @@ void wxZRColaCharacterCatalogPanel::OnGridKeyDown(wxKeyEvent& event)
     case WXK_NUMPAD_ENTER:
         auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
         if (app->m_mainWnd) {
-            app->m_mainWnd->m_panel->m_decomposed->WriteText(m_grid->GetCellValue(m_grid->GetGridCursorRow(), m_grid->GetGridCursorCol()));
-            app->m_mainWnd->m_panel->m_decomposed->SetFocus();
+            app->m_mainWnd->m_panel->m_source->WriteText(m_grid->GetCellValue(m_grid->GetGridCursorRow(), m_grid->GetGridCursorCol()));
+            app->m_mainWnd->m_panel->m_source->SetFocus();
 
             event.StopPropagation();
             return;
@@ -135,11 +124,11 @@ void wxZRColaCharacterCatalogPanel::OnShowAll(wxCommandEvent& event)
 }
 
 
-void wxZRColaCharacterCatalogPanel::OnFocusDecomposed(wxCommandEvent& event)
+void wxZRColaCharacterCatalogPanel::OnFocusSource(wxCommandEvent& event)
 {
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     if (app->m_mainWnd) {
-        app->m_mainWnd->m_panel->m_decomposed->SetFocus();
+        app->m_mainWnd->m_panel->m_source->SetFocus();
 
         event.StopPropagation();
         return;
@@ -151,21 +140,23 @@ void wxZRColaCharacterCatalogPanel::OnFocusDecomposed(wxCommandEvent& event)
 
 void wxZRColaCharacterCatalogPanel::Update()
 {
-    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[m_choice->GetSelection()];
+    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRank[m_choice->GetSelection()];
 
     if (m_show_all->GetValue()) {
         m_grid->SetCharacters(
-            wxString(cg.get_chars(), cg.char_len),
-            wxArrayShort((const short*)cg.get_char_shown(), (const short*)cg.get_char_shown() + (cg.char_len + 15)/16));
+            wxString(cg.chrlst(), cg.chrlst_end()),
+            wxArrayShort(reinterpret_cast<const short*>(cg.chrshow()), reinterpret_cast<const short*>(cg.chrshow_end())));
     } else {
         // Select frequently used characters only.
-        const wchar_t *src = cg.get_chars();
-        const unsigned __int16 *shown = cg.get_char_shown();
-        wxString chars;
-        for (unsigned __int16 i = 0, j = 0; i < cg.char_len; j++) {
-            for (unsigned __int16 k = 0, mask = shown[j]; k < 16 && i < cg.char_len; k++, mask >>= 1, i++) {
+        const auto *src = cg.chrlst();
+        const uint16_t *shown = cg.chrshow();
+        wxArrayString chars;
+        for (size_t i = 0, i_end = cg.chrlst_len(), j = 0; i < i_end; j++) {
+            for (uint16_t k = 0, mask = shown[j]; k < 16 && i < i_end; k++, mask >>= 1) {
+                size_t len = wcsnlen(src + i, i_end - i);
                 if (mask & 1)
-                    chars += src[i];
+                    chars.Add(wxString(src + i, len));
+                i += len + 1;
             }
         }
         m_grid->SetCharacters(chars);
@@ -208,12 +199,12 @@ bool wxPersistentZRColaCharacterCatalogPanel::Restore()
     // Restore selected character group.
     int cg_id;
     if (RestoreValue(wxT("charGroup"), &cg_id)) {
-        for (size_t i = 0, n = wnd->m_cg_db.idxRnk.size(); i < n; i++) {
-            const ZRCola::chrgrp_db::chrgrp &cg = wnd->m_cg_db.idxRnk[i];
-            if (cg.id == cg_id) {
-                if (wnd->m_cg_id != cg.id) {
-                    wnd->m_cg_id = cg.id;
-                    wnd->m_choice->Select(i);
+        for (size_t i = 0, n = wnd->m_cg_db.idxRank.size(); i < n; i++) {
+            const ZRCola::chrgrp_db::chrgrp &cg = wnd->m_cg_db.idxRank[i];
+            if (cg.grp == cg_id) {
+                if (wnd->m_cg_id != cg.grp) {
+                    wnd->m_cg_id = cg.grp;
+                    wnd->m_choice->Select((int)i);
                     update = true;
                 }
 

ZRCola/zrcolachrcatpnl.h

@@ -1,20 +1,6 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
@@ -25,9 +11,16 @@ class wxZRColaCharacterCatalogPanel;
 
 #pragma once
 
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include "zrcolagui.h"
+#pragma warning(pop)
 #include <zrcolaui/chargroup.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/persist/window.h>
+#pragma warning(pop)
 
 
 ///
@@ -38,7 +31,7 @@ class wxZRColaCharacterCatalogPanel : public wxZRColaCharacterCatalogPanelBase
 public:
     enum
     {
-        wxID_FOCUS_DECOMPOSED = 6000,
+        wxID_FOCUS_SOURCE = 6000,
     };
 
     wxZRColaCharacterCatalogPanel(wxWindow* parent);
@@ -51,7 +44,7 @@ protected:
     virtual void OnGridClick(wxGridEvent& event);
     virtual void OnGridKeyDown(wxKeyEvent& event);
     virtual void OnShowAll(wxCommandEvent& event);
-    void OnFocusDecomposed(wxCommandEvent& event);
+    void OnFocusSource(wxCommandEvent& event);
     DECLARE_EVENT_TABLE()
 
     void Update();

ZRCola/zrcolachrgrid.cpp

@@ -1,23 +1,9 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -41,7 +27,7 @@ wxZRColaCharGrid::wxZRColaCharGrid(wxWindow *parent, wxWindowID id, const wxPoin
 {
     Init();
 
-    SetDefaultRowSize(wxZRColaCharacterGridRowHeight);
+    SetDefaultRowSize(FromDIP(wxZRColaCharacterGridRowHeight));
 
     // Create timer for saving the state.
     m_timerToolTip.SetOwner(this, wxID_TOOLTIP_TIMER);
@@ -68,6 +54,24 @@ void wxZRColaCharGrid::Init()
 
 
 void wxZRColaCharGrid::SetCharacters(const wxString &chars)
+{
+    m_chars.Clear();
+    const wxCStrData chr = chars.GetData();
+    for (size_t i = 0, i_end = chars.Length(), i_next; i < i_end; i = i_next + 1) {
+        i_next = i + _tcsnlen(chr + i, i_end - i);
+        m_chars.Add(wxString(chr + i, chr + i_next));
+    };
+    m_relevance.Clear();
+    m_regenerate = true;
+
+    // Invoke OnSize(), which will populate the grid.
+    wxSizeEvent e(GetSize(), m_windowId);
+    e.SetEventObject(this);
+    HandleWindowEvent(e);
+}
+
+
+void wxZRColaCharGrid::SetCharacters(const wxArrayString &chars)
 {
     m_chars = chars;
     m_relevance.Clear();
@@ -82,7 +86,12 @@ void wxZRColaCharGrid::SetCharacters(const wxString &chars)
 
 void wxZRColaCharGrid::SetCharacters(const wxString &chars, const wxArrayShort &relevance)
 {
-    m_chars      = chars;
+    m_chars.Clear();
+    const wxCStrData chr = chars.GetData();
+    for (size_t i = 0, i_end = chars.Length(), i_next; i < i_end; i = i_next + 1) {
+        i_next = i + _tcsnlen(chr + i, i_end - i);
+        m_chars.Add(wxString(chr + i, chr + i_next));
+    };
     m_relevance  = relevance;
     m_regenerate = true;
 
@@ -95,22 +104,23 @@ void wxZRColaCharGrid::SetCharacters(const wxString &chars, const wxArrayShort &
 
 wxString wxZRColaCharGrid::GetToolTipText(int idx)
 {
-    wxASSERT_MSG(idx < (int)m_chars.Length(), wxT("index out of bounds"));
+    wxASSERT_MSG(idx < (int)m_chars.GetCount(), wxT("index out of bounds"));
 
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    const auto &chr = m_chars[idx];
 
     // See if this character has a key sequence registered.
-    char ks[sizeof(ZRCola::keyseq_db::keyseq)] = {};
-    ((ZRCola::keyseq_db::keyseq*)ks)->chr = m_chars[idx];
+    std::unique_ptr<ZRCola::keyseq_db::keyseq> ks((ZRCola::keyseq_db::keyseq*)new char[sizeof(ZRCola::keyseq_db::keyseq) + sizeof(ZRCola::char_t)*chr.length()]);
+    ks->ZRCola::keyseq_db::keyseq::keyseq(NULL, 0, chr.data(), chr.length());
     ZRCola::keyseq_db::indexKey::size_type start;
-    if (app->m_ks_db.idxChr.find(*(ZRCola::keyseq_db::keyseq*)ks, start)) {
+    if (app->m_ks_db.idxChr.find(*ks, start)) {
         ZRCola::keyseq_db::keyseq &seq = app->m_ks_db.idxChr[start];
         wxString ks_str;
-        if (ZRCola::keyseq_db::GetSequenceAsText(seq.seq, seq.seq_len, ks_str))
-            return wxString::Format(wxT("U+%04X (%s)"), (int)m_chars[idx], ks_str.c_str());
+        if (ZRCola::keyseq_db::GetSequenceAsText(seq.seq(), seq.seq_len(), ks_str))
+            return wxString::Format(wxT("U+%s (%s)"), ZRCola::GetUnicodeDump(chr.data(), chr.length(), _T("+")).c_str(), ks_str.c_str());
     }
 
-    return wxString::Format(wxT("U+%04X"), (int)m_chars[idx]);
+    return wxString::Format(wxT("U+%s"), ZRCola::GetUnicodeDump(chr.data(), chr.length(), _T("+")).c_str());
 }
 
 
@@ -126,17 +136,19 @@ void wxZRColaCharGrid::OnSize(wxSizeEvent& event)
     // Calculate initial estimate of columns and rows.
     wxSize size(event.GetSize());
     size_t
-        char_len = m_chars.Length();
+        char_count = m_chars.GetCount();
     int
-        width    = size.GetWidth() - m_rowLabelWidth - m_extraWidth,
-        cols     = std::max<int>(width / wxZRColaCharacterGridColumnWidth, 1),
-        rows     = std::max<int>((char_len + cols - 1) / cols, 1);
+        col_width  = FromDIP(wxZRColaCharacterGridColumnWidth),
+        row_height = FromDIP(wxZRColaCharacterGridRowHeight),
+        width      = size.GetWidth() - m_rowLabelWidth - m_extraWidth,
+        cols       = std::max<int>(width / col_width, 1),
+        rows       = std::max<int>((int)((char_count + cols - 1) / cols), 1);
 
-    if (m_colLabelHeight + rows*wxZRColaCharacterGridRowHeight + m_extraHeight > size.GetHeight()) {
+    if (m_colLabelHeight + rows*row_height + m_extraHeight > size.GetHeight()) {
         // Vertical scrollbar will be shown. Adjust the width and recalculate layout to avoid horizontal scrollbar.
         width = std::max<int>(width - wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, this), 0);
-        cols  = std::max<int>(width / wxZRColaCharacterGridColumnWidth, 1);
-        rows  = std::max<int>((char_len + cols - 1) / cols, 1);
+        cols  = std::max<int>(width / col_width, 1);
+        rows  = std::max<int>((int)((char_count + cols - 1) / cols), 1);
     }
 
     BeginBatch();
@@ -146,14 +158,14 @@ void wxZRColaCharGrid::OnSize(wxSizeEvent& event)
         wxGridStringTable *table = new wxGridStringTable(rows, cols);
         for (int r = 0, i = 0; r < rows; r++)
             for (int c = 0; c < cols; c++, i++)
-                table->SetValue(r, c, i < (int)char_len ? wxString(1, m_chars[i]) : wxEmptyString);
+                table->SetValue(r, c, i < (int)char_count ? m_chars[i] : wxEmptyString);
         SetTable(table, true);
         if (!m_relevance.IsEmpty()) {
             const wxColour colour_def;
             const wxColour colour_irr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT);
             for (int r = 0, i = 0; r < rows; r++)
                 for (int c = 0; c < cols; c++, i++)
-                    SetCellBackgroundColour(r, c, i >= (int)char_len || ((unsigned short)(m_relevance[i/16]) & (1<<(i%16))) ? colour_def : colour_irr);
+                    SetCellBackgroundColour(r, c, i >= (int)char_count || ((unsigned short)(m_relevance[i/16]) & (1<<(i%16))) ? colour_def : colour_irr);
         } else {
             for (int r = 0, i = 0; r < rows; r++)
                 for (int c = 0; c < cols; c++, i++)
@@ -163,7 +175,7 @@ void wxZRColaCharGrid::OnSize(wxSizeEvent& event)
     }
 
     for (int c = 0; c < cols; c++)
-        SetColSize(c, wxZRColaCharacterGridColumnWidth);
+        SetColSize(c, col_width);
 
     //// Set column widths to stretch to full width.
     //for (int c = 0, x_l = 0; c < cols; c++) {
@@ -216,8 +228,8 @@ void wxZRColaCharGrid::OnMotion(wxMouseEvent& event)
     if (col == wxNOT_FOUND || row == wxNOT_FOUND )
         return;
 
-    size_t toolTipIdx = row*m_numCols + col;
-    if (toolTipIdx >= m_chars.Length()) {
+    size_t toolTipIdx = (size_t)row*m_numCols + col;
+    if (toolTipIdx >= m_chars.GetCount()) {
         // Index out of range.
         m_toolTipIdx = (size_t)-1;
         m_timerToolTip.Stop();
@@ -228,7 +240,7 @@ void wxZRColaCharGrid::OnMotion(wxMouseEvent& event)
         wxWindow *gridWnd = GetGridWindow();
         if (gridWnd->GetToolTip()) {
             // The tooltip is already shown. Update it immediately.
-            gridWnd->SetToolTip(GetToolTipText(m_toolTipIdx));
+            gridWnd->SetToolTip(GetToolTipText((int)m_toolTipIdx));
         } else {
             // This must be our initial entry. Schedule tooltip display after 1s.
             m_timerToolTip.Start(1000, true);
@@ -241,8 +253,8 @@ void wxZRColaCharGrid::OnTooltipTimer(wxTimerEvent& event)
 {
     event.Skip();
 
-    if (m_toolTipIdx >= m_chars.Length())
+    if (m_toolTipIdx >= m_chars.GetCount())
         return;
 
-    GetGridWindow()->SetToolTip(GetToolTipText(m_toolTipIdx));
+    GetGridWindow()->SetToolTip(GetToolTipText((int)m_toolTipIdx));
 }

ZRCola/zrcolachrgrid.h

@@ -1,20 +1,6 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
@@ -25,7 +11,11 @@ class wxZRColaCharGrid;
 
 #pragma once
 
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/grid.h>
+#pragma warning(pop)
 
 
 ///
@@ -54,14 +44,21 @@ public:
     ///
     /// Sets new array of characters to display
     ///
-    /// \param[in] chars  The string containing characters to display
+    /// \param[in] chars  The string containing characters to display (zero delimited)
     ///
     void SetCharacters(const wxString &chars);
 
     ///
     /// Sets new array of characters to display
     ///
-    /// \param[in] chars      The string containing characters to display
+    /// \param[in] chars  The array of characters to display
+    ///
+    void SetCharacters(const wxArrayString &chars);
+
+    ///
+    /// Sets new array of characters to display
+    ///
+    /// \param[in] chars      The string containing characters to display (zero delimited)
     /// \param[in] relevance  Bit-array of \p chars relevance (1=more relevant, 0=less relevant)
     ///
     void SetCharacters(const wxString &chars, const wxArrayShort &relevance);
@@ -71,7 +68,7 @@ public:
     ///
     /// \returns  The string containing displayed characters
     ///
-    inline wxString GetCharacters() const
+    inline const wxArrayString& GetCharacters() const
     {
         return m_chars;
     }
@@ -83,10 +80,14 @@ public:
     ///
     /// \returns Grid coordinates of selected character or (-1, -1) if character not found.
     ///
-    inline wxGridCellCoords GetCharacterCoords(wchar_t c) const
+    inline wxGridCellCoords GetCharacterCoords(const wxString &c) const
     {
-        int i = m_chars.Find(c);
-        return i != wxNOT_FOUND ? wxGridCellCoords(i / m_numCols, i % m_numCols) : wxGridCellCoords(-1, -1);
+        for (size_t i = 0, n = m_chars.GetCount(); ; i++) {
+            if (i >= n)
+                return wxGridCellCoords(-1, -1);
+            else if (m_chars[i] == c)
+                return wxGridCellCoords((int)(i / m_numCols), i % m_numCols);
+        }
     }
 
 protected:
@@ -102,7 +103,7 @@ private:
     void Init();                // common part of all ctors
 
 protected:
-    wxString m_chars;           ///< Array of Unicode characters to display in the grid
+    wxArrayString m_chars;      ///< Array of Unicode characters to display in the grid
     wxArrayShort m_relevance;   ///< Bit-array of `m_chars` relevance
 
 private:

ZRCola/zrcolachrreq.cpp

@@ -1,23 +1,9 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -71,14 +57,18 @@ void wxZRColaCharRequest::OnOKButtonClick(wxCommandEvent& event)
 // wxPersistentZRColaCharRequest
 //////////////////////////////////////////////////////////////////////////
 
-wxPersistentZRColaCharRequest::wxPersistentZRColaCharRequest(wxZRColaCharRequest *wnd) : wxPersistentDialog(wnd)
+const int wxPersistentZRColaCharRequest::s_guiLevel = 1;
+
+
+wxPersistentZRColaCharRequest::wxPersistentZRColaCharRequest(wxZRColaCharRequest *wnd) : wxPersistentTLWEx(wnd)
 {
 }
 
 
 void wxPersistentZRColaCharRequest::Save() const
 {
-    wxPersistentDialog::Save();
+    SaveValue(wxT("guiLevel"), s_guiLevel);
+    wxPersistentTLWEx::Save();
 
     auto wnd = static_cast<const wxZRColaCharRequest*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
@@ -97,5 +87,6 @@ bool wxPersistentZRColaCharRequest::Restore()
     if (RestoreValue(wxT("context"), &str))
         wnd->m_context->SetValue(str);
 
-    return wxPersistentDialog::Restore();
+    int guiLevel;
+    return RestoreValue(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel ? wxPersistentTLWEx::Restore() : true;
 }

ZRCola/zrcolachrreq.h

@@ -1,32 +1,24 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
 /// Forward declarations
 ///
 class wxZRColaCharRequest;
+class wxPersistentZRColaCharRequest;
 
 
 #pragma once
 
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include "zrcolagui.h"
+#pragma warning(pop)
 #include "zrcolakeyhndlr.h"
+#include <wxex/persist/toplevel.h>
 
 
 ///
@@ -49,13 +41,16 @@ protected:
 ///
 /// Supports saving/restoring wxZRColaCharRequest state
 ///
-class wxPersistentZRColaCharRequest : public wxPersistentDialog
+class wxPersistentZRColaCharRequest : public wxPersistentTLWEx
 {
 public:
     wxPersistentZRColaCharRequest(wxZRColaCharRequest *wnd);
 
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 

ZRCola/zrcolachrslct.cpp

@@ -1,23 +1,177 @@
 /*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
+
+
+//////////////////////////////////////////////////////////////////////
+// wxZRColaUTF16CharValidator
+//////////////////////////////////////////////////////////////////////
+
+wxIMPLEMENT_DYNAMIC_CLASS(wxZRColaUTF16CharValidator, wxValidator);
+
+
+wxZRColaUTF16CharValidator::wxZRColaUTF16CharValidator(ZRCola::char_t *val) :
+    m_val(val),
+    wxValidator()
+{
+}
+
+
+wxObject* wxZRColaUTF16CharValidator::Clone() const
+{
+    return new wxZRColaUTF16CharValidator(*this);
+}
+
+
+bool wxZRColaUTF16CharValidator::Validate(wxWindow *parent)
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+    wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow();
+    if (!ctrl->IsEnabled()) return true;
+
+    wxString val(ctrl->GetValue());
+    return Parse(val, 0, val.Length(), ctrl, parent);
+}
+
+
+bool wxZRColaUTF16CharValidator::TransferToWindow()
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+
+    if (m_val)
+        ((wxTextCtrl*)GetWindow())->SetValue(wxString::Format(wxT("%04X"), *m_val));
+
+    return true;
+}
+
+
+bool wxZRColaUTF16CharValidator::TransferFromWindow()
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+    wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow();
+
+    wxString val(ctrl->GetValue());
+    return Parse(val, 0, val.Length(), ctrl, NULL, m_val);
+}
+
+
+bool wxZRColaUTF16CharValidator::Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, ZRCola::char_t *val_out)
+{
+    const wxStringCharType *buf = val_in;
+
+    ZRCola::char_t chr = 0;
+    for (size_t i = i_start;;) {
+        if (i >= i_end) {
+            // End of Unicode found.
+            if (val_out) *val_out = chr;
+            return true;
+        } else if (i >= i_start + 4) {
+            // Maximum characters exceeded.
+            ctrl->SetFocus();
+            ctrl->SetSelection((int)i, (int)i_end);
+            wxMessageBox(_("Too many digits in Unicode."), _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
+            return false;
+        } else if (_T('0') <= buf[i] && buf[i] <= _T('9')) {
+            // Digit found.
+            chr = (chr << 4) | (buf[i] - _T('0'));
+            i++;
+        } else if (_T('A') <= buf[i] && buf[i] <= _T('F')) {
+            // Capital letter found.
+            chr = (chr << 4) | (buf[i] - _T('A') + 10);
+            i++;
+        } else if (_T('a') <= buf[i] && buf[i] <= _T('f')) {
+            // Lower letter found.
+            chr = (chr << 4) | (buf[i] - _T('a') + 10);
+            i++;
+        } else {
+            // Invalid character found.
+            ctrl->SetFocus();
+            ctrl->SetSelection((long)i, (long)(i + 1));
+            wxMessageBox(wxString::Format(_("Invalid character in Unicode found: %c"), buf[i]), _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
+            return false;
+        }
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////
+// wxZRColaUnicodeDumpValidator
+//////////////////////////////////////////////////////////////////////
+
+wxIMPLEMENT_DYNAMIC_CLASS(wxZRColaUnicodeDumpValidator, wxValidator);
+
+
+wxZRColaUnicodeDumpValidator::wxZRColaUnicodeDumpValidator(wxString *val) :
+    m_val(val),
+    wxValidator()
+{
+}
+
+
+wxObject* wxZRColaUnicodeDumpValidator::Clone() const
+{
+    return new wxZRColaUnicodeDumpValidator(*this);
+}
+
+
+bool wxZRColaUnicodeDumpValidator::Validate(wxWindow *parent)
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+    wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow();
+    if (!ctrl->IsEnabled()) return true;
+
+    wxString val(ctrl->GetValue());
+    return Parse(val, 0, val.Length(), ctrl, parent);
+}
+
+
+bool wxZRColaUnicodeDumpValidator::TransferToWindow()
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+
+    if (m_val)
+        ((wxTextCtrl*)GetWindow())->SetValue(ZRCola::GetUnicodeDumpW(m_val->c_str(), m_val->length(), L"+"));
+
+    return true;
+}
+
+
+bool wxZRColaUnicodeDumpValidator::TransferFromWindow()
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+    wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow();
+
+    wxString val(ctrl->GetValue());
+    return Parse(val, 0, val.Length(), ctrl, NULL, m_val);
+}
+
+
+bool wxZRColaUnicodeDumpValidator::Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, wxString *val_out)
+{
+    const wxStringCharType *buf = val_in;
+
+    wxString str;
+    for (size_t i = i_start;;) {
+        const wxStringCharType *buf_next;
+        ZRCola::char_t chr;
+        if ((buf_next = wmemchr(buf + i, L'+', i_end - i)) != NULL) {
+            // Unicode dump separator found.
+            if (!wxZRColaUTF16CharValidator::Parse(val_in, i, buf_next - buf, ctrl, parent, &chr))
+                return false;
+            str += chr;
+            i = buf_next - buf + 1;
+        } else if (wxZRColaUTF16CharValidator::Parse(val_in, i, i_end, ctrl, parent, &chr)) {
+            // The rest of the FQDN parsed succesfully.
+            if (chr) str += chr;
+            if (val_out) *val_out = str;
+            return true;
+        } else
+            return false;
+    }
+}
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -30,11 +184,11 @@ wxDEFINE_EVENT(wxEVT_SEARCH_COMPLETE, wxThreadEvent);
 wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
     m_searchChanged(false),
     m_unicodeChanged(false),
-    m_char(0),
     m_searchThread(NULL),
     wxZRColaCharSelectBase(parent)
 {
     // Set tag lookup locale.
+    #pragma warning(suppress: 26812) // wxLanguage is unscoped
     wxLanguage language = dynamic_cast<ZRColaApp*>(wxTheApp)->m_lang_ui;
          if (wxLANGUAGE_DEFAULT   == language ||
              wxLANGUAGE_ENGLISH   <= language && language <= wxLANGUAGE_ENGLISH_ZIMBABWE) m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH  , SUBLANG_DEFAULT), SORT_DEFAULT);
@@ -46,15 +200,15 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
 
     m_search_more->SetLabel(_(L"▸ Search Options"));
 
-    m_unicode->SetValidator(wxHexValidator<wchar_t>(&m_char, wxNUM_VAL_DEFAULT, 4));
+    m_unicode->SetValidator(wxZRColaUnicodeDumpValidator(&m_char));
 
-    // Fill categories.
+    // Fill blocks.
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-        const auto &cc = app->m_cc_db.idxRnk[i];
-        int idx = m_categories->Insert(wxGetTranslation(wxString(cc.name, cc.name_len), wxT("ZRCola-zrcdb")), i);
-        m_categories->Check(idx);
-        m_ccOrder.insert(std::make_pair(cc.id, idx));
+    for (size_t i = 0, n = app->m_cb_db.idxFirst.size(); i < n; i++) {
+        const auto &cb = app->m_cb_db.idxFirst[i];
+        int idx = m_blocks->Insert(wxGetTranslation(wxString(cb.name(), cb.name_len()), wxT("ZRCola-zrcdb")), (unsigned int)i);
+        m_blocks->Check(idx);
+        m_cbOrder.insert(std::make_pair(cb.id, idx));
     }
 
     ResetResults();
@@ -69,8 +223,10 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
 
 wxZRColaCharSelect::~wxZRColaCharSelect()
 {
-    if (m_searchThread)
+    if (m_searchThread) {
+        #pragma warning(suppress: 26812) // wxThreadError is unscoped.
         m_searchThread->Delete();
+    }
 
     Disconnect(wxID_ANY, wxEVT_SEARCH_COMPLETE, wxThreadEventHandler(wxZRColaCharSelect::OnSearchComplete), NULL, this);
 }
@@ -84,24 +240,24 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
         if (m_unicode->GetValidator()->TransferFromWindow()) {
             auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
 
-            m_gridPreview->SetCellValue(0, 0, wxString(1, m_char));
+            m_gridPreview->SetCellValue(0, 0, m_char);
 
-            char chr[sizeof(ZRCola::character_db::character)] = {};
-            ((ZRCola::character_db::character*)chr)->chr = m_char;
-            size_t start;
-            if (app->m_chr_db.idxChr.find(*(ZRCola::character_db::character*)chr, start)) {
-                const auto &chr = app->m_chr_db.idxChr[start];
+            std::unique_ptr<ZRCola::character_db::character> ch((ZRCola::character_db::character*)new char[sizeof(ZRCola::character_db::character) + sizeof(ZRCola::char_t)*m_char.length()]);
+            ch->ZRCola::character_db::character::character(m_char.data(), m_char.length());
+            ZRCola::character_db::indexChr::size_type ch_start;
+            if (app->m_chr_db.idxChr.find(*ch, ch_start)) {
+                const auto &chr = app->m_chr_db.idxChr[ch_start];
                 // Update character description.
-                m_description->SetValue(wxString(chr.data, chr.desc_len));
+                m_description->SetValue(wxString(chr.desc(), chr.desc_len()));
                 {
                     // See if this character has a key sequence registered.
-                    char ks[sizeof(ZRCola::keyseq_db::keyseq)] = {};
-                    ((ZRCola::keyseq_db::keyseq*)ks)->chr = m_char;
-                    ZRCola::keyseq_db::indexKey::size_type start;
-                    if (app->m_ks_db.idxChr.find(*(ZRCola::keyseq_db::keyseq*)ks, start)) {
-                        ZRCola::keyseq_db::keyseq &seq = app->m_ks_db.idxChr[start];
+                    std::unique_ptr<ZRCola::keyseq_db::keyseq> ks((ZRCola::keyseq_db::keyseq*)new char[sizeof(ZRCola::keyseq_db::keyseq) + sizeof(ZRCola::char_t)*m_char.length()]);
+                    ks->ZRCola::keyseq_db::keyseq::keyseq(NULL, 0, m_char.data(), m_char.length());
+                    ZRCola::keyseq_db::indexKey::size_type ks_start;
+                    if (app->m_ks_db.idxChr.find(*ks, ks_start)) {
+                        const auto &seq = app->m_ks_db.idxChr[ks_start];
                         wxString ks_str;
-                        if (ZRCola::keyseq_db::GetSequenceAsText(seq.seq, seq.seq_len, ks_str))
+                        if (ZRCola::keyseq_db::GetSequenceAsText(seq.seq(), seq.seq_len(), ks_str))
                             m_shortcut->SetValue(ks_str);
                         else
                             m_shortcut->SetValue(wxEmptyString);
@@ -109,49 +265,43 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
                         m_shortcut->SetValue(wxEmptyString);
                 }
                 {
-                    char cc[sizeof(ZRCola::chrcat_db::chrcat)] = {};
-                    ((ZRCola::chrcat_db::chrcat*)cc)->id = chr.cat;
-                    size_t start;
-                    // Update character category.
-                    if (app->m_cc_db.idxChrCat.find(*((ZRCola::chrcat_db::chrcat*)cc), start)) {
-                        const auto &cat = app->m_cc_db.idxChrCat[start];
-                        m_category->SetValue(wxGetTranslation(wxString(cat.name, cat.name_len), wxT("ZRCola-zrcdb")));
+                    // Update character block.
+                    ZRCola::chrblk_db::indexChrId::size_type cb_start;
+                    if (app->m_cb_db.idxChrId.find(ZRCola::chrblk_db::chrblk(chr.blk), cb_start)) {
+                        const auto &blk = app->m_cb_db.idxChrId[cb_start];
+                        m_block->SetValue(wxGetTranslation(wxString(blk.name(), blk.name_len()), wxT("ZRCola-zrcdb")));
                     } else
-                        m_category->SetValue(wxEmptyString);
+                        m_block->SetValue(wxEmptyString);
                 }
                 // Update related characters.
-                m_gridRelated->SetCharacters(wxString(chr.data + chr.desc_len, chr.rel_len));
+                m_gridRelated->SetCharacters(wxString(chr.rel(), chr.rel_end()));
             } else {
                 m_description->SetValue(wxEmptyString);
                 m_shortcut->SetValue(wxEmptyString);
-                m_category->SetValue(wxEmptyString);
+                m_block->SetValue(wxEmptyString);
                 m_gridRelated->ClearGrid();
             }
 
             // Find character tags.
             std::list<std::wstring> tag_names;
-            ZRCola::chrtag_db::chrtag ct = { m_char };
-            size_t end;
-            if (app->m_ct_db.idxChr.find(ct, start, end)) {
-                for (size_t i = start; i < end; i++) {
-                    const ZRCola::chrtag_db::chrtag &ct = app->m_ct_db.idxChr[i];
-
+            std::unique_ptr<ZRCola::chrtag_db::chrtag> ct((ZRCola::chrtag_db::chrtag*)new char[sizeof(ZRCola::chrtag_db::chrtag) + sizeof(ZRCola::char_t)*m_char.length()]);
+            ct->ZRCola::chrtag_db::chrtag::chrtag(m_char.data(), m_char.length());
+            ZRCola::chrtag_db::indexChr::size_type ct_start, ct_end;
+            if (app->m_ct_db.idxChr.find(*ct, ct_start, ct_end)) {
+                for (auto i = ct_start; i < ct_end; i++) {
                     // Find tag names.
-                    char tn[sizeof(ZRCola::tagname_db::tagname)] = {};
-                    ((ZRCola::tagname_db::tagname*)tn)->locale = m_locale;
-                    ((ZRCola::tagname_db::tagname*)tn)->tag    = ct.tag;
-                    size_t start, end;
-                    if (app->m_tn_db.idxTag.find(*((ZRCola::tagname_db::tagname*)tn), start, end)) {
-                        for (size_t i = start; i < end; i++) {
-                            const ZRCola::tagname_db::tagname &tn = app->m_tn_db.idxTag[i];
+                    ZRCola::tagname_db::indexTag::size_type tn_start, tn_end;
+                    if (app->m_tn_db.idxTag.find(ZRCola::tagname_db::tagname(app->m_ct_db.idxChr[i].tag, m_locale), tn_start, tn_end)) {
+                        for (auto j = tn_start; j < tn_end; j++) {
+                            const auto &tn = app->m_tn_db.idxTag[j];
 
                             // Add tag name to the list (prevent duplicates).
                             for (auto name = tag_names.cbegin(), name_end = tag_names.cend();; ++name) {
                                 if (name == name_end) {
                                     // Add name to the list.
-                                    tag_names.push_back(std::wstring(tn.name, tn.name + tn.name_len));
+                                    tag_names.push_back(std::wstring(tn.name(), tn.name_end()));
                                     break;
-                                } else if (ZRCola::tagname_db::tagname::CompareName(m_locale, name->data(), (unsigned __int16)name->length(), tn.name, tn.name_len) == 0)
+                                } else if (ZRCola::tagname_db::tagname::CompareName(m_locale, name->data(), (uint16_t)name->length(), tn.name(), tn.name_len()) == 0)
                                     // Name is already on the list.
                                     break;
                             }
@@ -190,11 +340,11 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
 
             m_searchThread->m_search.assign(val.c_str(), val.Length());
 
-            // Select categories.
-            for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-                const auto &cc = app->m_cc_db.idxRnk[i];
-                if (m_categories->IsChecked(i))
-                    m_searchThread->m_cats.insert(cc.id);
+            // Select blocks.
+            for (size_t i = 0, n = app->m_cb_db.idxFirst.size(); i < n; i++) {
+                const auto &cb = app->m_cb_db.idxFirst[i];
+                if (m_blocks->IsChecked((unsigned int)i))
+                    m_searchThread->m_blks.insert(cb.id);
             }
 
             if (m_searchThread->Run() != wxTHREAD_NO_ERROR) {
@@ -234,43 +384,43 @@ void wxZRColaCharSelect::OnSearchMore(wxHyperlinkEvent& event)
 }
 
 
-void wxZRColaCharSelect::OnCategoriesAll(wxHyperlinkEvent& event)
+void wxZRColaCharSelect::OnBlocksAll(wxHyperlinkEvent& event)
 {
     event.StopPropagation();
 
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++)
-        m_categories->Check(i, true);
+    for (size_t i = 0, n = app->m_cb_db.idxFirst.size(); i < n; i++)
+        m_blocks->Check((unsigned int)i, true);
 
     m_searchChanged = true;
 }
 
 
-void wxZRColaCharSelect::OnCategoriesNone(wxHyperlinkEvent& event)
+void wxZRColaCharSelect::OnBlocksNone(wxHyperlinkEvent& event)
 {
     event.StopPropagation();
 
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++)
-        m_categories->Check(i, false);
+    for (size_t i = 0, n = app->m_cb_db.idxFirst.size(); i < n; i++)
+        m_blocks->Check((unsigned int)i, false);
 
     m_searchChanged = true;
 }
 
 
-void wxZRColaCharSelect::OnCategoriesInvert(wxHyperlinkEvent& event)
+void wxZRColaCharSelect::OnBlocksInvert(wxHyperlinkEvent& event)
 {
     event.StopPropagation();
 
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++)
-        m_categories->Check(i, !m_categories->IsChecked(i));
+    for (size_t i = 0, n = app->m_cb_db.idxFirst.size(); i < n; i++)
+        m_blocks->Check((unsigned int)i, !m_blocks->IsChecked((unsigned int)i));
 
     m_searchChanged = true;
 }
 
 
-void wxZRColaCharSelect::OnCategoriesToggle(wxCommandEvent& event)
+void wxZRColaCharSelect::OnBlocksToggle(wxCommandEvent& event)
 {
     event.Skip();
 
@@ -284,10 +434,10 @@ void wxZRColaCharSelect::OnSearchComplete(wxThreadEvent& event)
 
     if (m_searchThread) {
         // Display results.
-        wxString chars;
+        wxArrayString chars;
         chars.reserve(m_searchThread->m_hits.size());
         for (auto i = m_searchThread->m_hits.cbegin(), i_end = m_searchThread->m_hits.cend(); i != i_end; ++i)
-            chars += i->second;
+            chars.Add(i->second);
         m_gridResults->SetCharacters(chars);
 
         m_searchThread->Delete();
@@ -304,7 +454,7 @@ void wxZRColaCharSelect::OnResultSelectCell(wxGridEvent& event)
 
     wxString val(m_gridResults->GetCellValue(event.GetRow(), event.GetCol()));
     if (!val.IsEmpty())
-        NavigateTo(val[0]);
+        NavigateTo(val);
 }
 
 
@@ -314,9 +464,9 @@ void wxZRColaCharSelect::OnResultCellDClick(wxGridEvent& event)
 
     wxString val(m_gridResults->GetCellValue(event.GetRow(), event.GetCol()));
     if (!val.IsEmpty()) {
-        NavigateTo(val[0]);
+        NavigateTo(val);
         wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-        m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
+        m_buttonInsert->GetEventHandler()->ProcessEvent(e);
     }
 }
 
@@ -328,9 +478,9 @@ void wxZRColaCharSelect::OnResultsKeyDown(wxKeyEvent& event)
     case WXK_NUMPAD_ENTER:
         wxString val(m_gridResults->GetCellValue(m_gridResults->GetGridCursorRow(), m_gridResults->GetGridCursorCol()));
         if (!val.IsEmpty()) {
-            NavigateTo(val[0]);
+            NavigateTo(val);
             wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-            m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
+            m_buttonInsert->GetEventHandler()->ProcessEvent(e);
 
             event.StopPropagation();
             return;
@@ -347,7 +497,7 @@ void wxZRColaCharSelect::OnRecentSelectCell(wxGridEvent& event)
 
     wxString val(m_gridRecent->GetCellValue(event.GetRow(), event.GetCol()));
     if (!val.IsEmpty())
-        NavigateTo(val[0]);
+        NavigateTo(val);
 }
 
 
@@ -357,9 +507,9 @@ void wxZRColaCharSelect::OnRecentCellDClick(wxGridEvent& event)
 
     wxString val(m_gridRecent->GetCellValue(event.GetRow(), event.GetCol()));
     if (!val.IsEmpty()) {
-        NavigateTo(val[0]);
+        NavigateTo(val);
         wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-        m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
+        m_buttonInsert->GetEventHandler()->ProcessEvent(e);
     }
 }
 
@@ -371,9 +521,9 @@ void wxZRColaCharSelect::OnRecentKeyDown(wxKeyEvent& event)
     case WXK_NUMPAD_ENTER:
         wxString val(m_gridRecent->GetCellValue(m_gridRecent->GetGridCursorRow(), m_gridRecent->GetGridCursorCol()));
         if (!val.IsEmpty()) {
-            NavigateTo(val[0]);
+            NavigateTo(val);
             wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-            m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
+            m_buttonInsert->GetEventHandler()->ProcessEvent(e);
 
             event.StopPropagation();
             return;
@@ -431,24 +581,38 @@ void wxZRColaCharSelect::OnRelatedSelectCell(wxGridEvent& event)
 
     wxString val(m_gridRelated->GetCellValue(event.GetRow(), event.GetCol()));
     if (!val.IsEmpty())
-        NavigateTo(val[0]);
+        NavigateTo(val);
 }
 
 
-void wxZRColaCharSelect::OnOKButtonClick(wxCommandEvent& event)
+void wxZRColaCharSelect::OnInsertUpdateUI(wxUpdateUIEvent& event)
+{
+    event.Enable(!m_char.empty());
+}
+
+
+void wxZRColaCharSelect::OnInsert(wxCommandEvent& event)
 {
     event.Skip();
 
-    wxString
-        recent(m_gridRecent->GetCharacters()),
-        val(1, m_char);
-    for (size_t i = 0, n = recent.Length(); i < n; i++) {
-        const wxStringCharType c = recent[i];
+    const wxArrayString &recent = m_gridRecent->GetCharacters();
+    wxArrayString val;
+    val.reserve(recent.GetCount() + 1);
+    val.Add(m_char);
+    for (size_t i = 0, n = recent.GetCount(); i < n; i++) {
+        const wxString &c = recent[i];
         if (c != m_char)
-            val += c;
+            val.Add(c);
+    }
+    m_gridRecent->SetCharacters(val);
+
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    if (app->m_mainWnd) {
+        app->m_mainWnd->m_panel->m_source->WriteText(m_char);
+        app->m_mainWnd->m_panel->m_source->SetFocus();
     }
 
-    m_gridRecent->SetCharacters(val);
+    Show(false);
 }
 
 
@@ -457,13 +621,13 @@ void wxZRColaCharSelect::ResetResults()
     // Fill the results.
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     size_t i, n = app->m_chr_db.idxChr.size();
-    wxString val;
+    wxArrayString val;
     val.reserve(n);
     for (i = 0; i < n; i++) {
         const auto &chr = app->m_chr_db.idxChr[i];
-        auto idx = m_ccOrder.find(chr.cat);
-        if (idx == m_ccOrder.end() || m_categories->IsChecked(idx->second))
-            val += chr.chr;
+        auto idx = m_cbOrder.find(chr.blk);
+        if (idx == m_cbOrder.end() || m_blocks->IsChecked(idx->second))
+            val.Add(wxString(chr.chr(), chr.chr_len()));
     }
     m_gridResults->SetCharacters(val);
 }
@@ -507,7 +671,7 @@ void wxZRColaCharSelect::NavigateBy(int offset)
 }
 
 
-void wxZRColaCharSelect::NavigateTo(wchar_t c)
+void wxZRColaCharSelect::NavigateTo(const wxString &c)
 {
     if (m_char != c) {
         // Update history state
@@ -548,21 +712,21 @@ wxZRColaCharSelect::SearchThread::SearchThread(wxZRColaCharSelect *parent) :
 wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
 {
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    std::map<wchar_t, ZRCola::charrank_t> hits;
+    std::map<std::wstring, ZRCola::charrank_t> hits;
 
     if (TestDestroy()) return (wxThread::ExitCode)1;
 
     {
         // Search by tags: Get tags with given names. Then, get characters of found tags.
-        std::map<ZRCola::tagid_t, unsigned __int16> hits_tag;
+        std::map<ZRCola::tagid_t, uint16_t> hits_tag;
         if (!app->m_tn_db.Search(m_search.c_str(), m_parent->m_locale, hits_tag, TestDestroyS, this)) return (wxThread::ExitCode)1;
-        if (!app->m_ct_db.Search(hits_tag, app->m_chr_db, m_cats, hits, TestDestroyS, this)) return (wxThread::ExitCode)1;
+        if (!app->m_ct_db.Search(hits_tag, app->m_chr_db, m_blks, hits, TestDestroyS, this)) return (wxThread::ExitCode)1;
     }
 
     {
         // Search by description and merge results.
-        std::map<wchar_t, ZRCola::charrank_t> hits_sub;
-        if (!app->m_chr_db.Search(m_search.c_str(), m_cats, hits, hits_sub, TestDestroyS, this)) return (wxThread::ExitCode)1;
+        std::map<std::wstring, ZRCola::charrank_t> hits_sub;
+        if (!app->m_chr_db.Search(m_search.c_str(), m_blks, hits, hits_sub, TestDestroyS, this)) return (wxThread::ExitCode)1;
         for (auto i = hits_sub.cbegin(), i_end = hits_sub.cend(); i != i_end; ++i) {
             if (TestDestroy()) return (wxThread::ExitCode)1;
             auto idx = hits.find(i->first);
@@ -589,7 +753,7 @@ wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
         if (i->second > rank_threshold)
             m_hits.push_back(std::make_pair(i->second, i->first));
     }
-    std::qsort(m_hits.data(), m_hits.size(), sizeof(std::pair<ZRCola::charrank_t, wchar_t>), CompareHits);
+    std::qsort(m_hits.data(), m_hits.size(), sizeof(std::pair<ZRCola::charrank_t, std::wstring>), CompareHits);
 
     // Signal the event handler that this thread is going to be destroyed.
     // NOTE: here we assume that using the m_parent pointer is safe,
@@ -602,14 +766,14 @@ wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
 
 int __cdecl wxZRColaCharSelect::SearchThread::CompareHits(const void *a, const void *b)
 {
-    const std::pair<ZRCola::charrank_t, wchar_t> *_a = (const std::pair<ZRCola::charrank_t, wchar_t>*)a;
-    const std::pair<ZRCola::charrank_t, wchar_t> *_b = (const std::pair<ZRCola::charrank_t, wchar_t>*)b;
+    const std::pair<ZRCola::charrank_t, ZRCola::char_t> *_a = (const std::pair<ZRCola::charrank_t, ZRCola::char_t>*)a;
+    const std::pair<ZRCola::charrank_t, ZRCola::char_t> *_b = (const std::pair<ZRCola::charrank_t, ZRCola::char_t>*)b;
 
-         if (_a->first > _b->first) return -1;
-    else if (_a->first < _b->first) return  1;
+    if (_a->first > _b->first) return -1;
+    if (_a->first < _b->first) return  1;
 
-         if (_a->second < _b->second) return -1;
-    else if (_a->second > _b->second) return  1;
+    if (_a->second < _b->second) return -1;
+    if (_a->second > _b->second) return  1;
 
     return 0;
 }
@@ -625,25 +789,40 @@ bool __cdecl wxZRColaCharSelect::SearchThread::TestDestroyS(void *cookie)
 // wxPersistentZRColaCharSelect
 //////////////////////////////////////////////////////////////////////////
 
-wxPersistentZRColaCharSelect::wxPersistentZRColaCharSelect(wxZRColaCharSelect *wnd) : wxPersistentDialog(wnd)
+const int wxPersistentZRColaCharSelect::s_guiLevel = 1;
+
+
+wxPersistentZRColaCharSelect::wxPersistentZRColaCharSelect(wxZRColaCharSelect *wnd) : wxPersistentTLWEx(wnd)
 {
 }
 
 
 void wxPersistentZRColaCharSelect::Save() const
 {
-    wxPersistentDialog::Save();
+    SaveValue(wxT("guiLevel"), s_guiLevel);
+    wxPersistentTLWEx::Save();
 
     auto wnd = static_cast<const wxZRColaCharSelect*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
 
-    SaveValue(wxT("recentChars"), wnd->m_gridRecent->GetCharacters());
+    wxString str, str2;
+    auto &recent = wnd->m_gridRecent->GetCharacters();
+    for (size_t i = 0, n = recent.GetCount(); i < n; i++) {
+        if (i) str2 += wxT('|');
+        auto &chr = recent[i];
+        for (size_t j = 0, m = chr.Length(); j < m; j++) {
+            if (j) str2 += wxT('+');
+            str2 += wxString::Format(wxT("%04X"), chr[j]);
+        }
+        if (chr.Length() == 1)
+            str += chr[0];
+    }
+    SaveValue(wxT("recentChars" ), str ); // Save in legacy format for backward compatibility.
+    SaveValue(wxT("recentChars2"), str2); // Save in native format
 
-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-        const auto &cc = app->m_cc_db.idxRnk[i];
-        wxString name(wxT("category"));
-        name.Append(cc.id.data, _countof(cc.id.data));
-        SaveValue(name, wnd->m_categories->IsChecked(i));
+    for (size_t i = 0, n = app->m_cb_db.idxFirst.size(); i < n; i++) {
+        const auto &cb = app->m_cb_db.idxFirst[i];
+        SaveValue(wxString::Format(wxT("block%u"), cb.id), wnd->m_blocks->IsChecked((unsigned int)i));
     }
 
     SaveValue(wxT("searchPanel"), wnd->m_search_panel->IsShown());
@@ -655,17 +834,30 @@ bool wxPersistentZRColaCharSelect::Restore()
     auto wnd = dynamic_cast<wxZRColaCharSelect*>(GetWindow());
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
 
-    wxString recent;
-    if (RestoreValue(wxT("recentChars"), &recent))
-        wnd->m_gridRecent->SetCharacters(recent);
+    wxString str;
+    if (RestoreValue(wxT("recentChars2"), &str)) {
+        // Native format found.
+        wxArrayString val;
+        for (wxStringTokenizer tok(str, wxT("|")); tok.HasMoreTokens(); ) {
+            wxString chr;
+            for (wxStringTokenizer tok_chr(tok.GetNextToken(), wxT("+")); tok_chr.HasMoreTokens(); )
+                chr += (ZRCola::char_t)_tcstoul(tok_chr.GetNextToken().c_str(), NULL, 16);
+            val.Add(chr);
+        }
+        wnd->m_gridRecent->SetCharacters(val);
+    } else if (RestoreValue(wxT("recentChars"), &str)) {
+        // Legacy value found.
+        wxArrayString val;
+        for (size_t i = 0, n = str.Length(); i < n; i++)
+            val.Add(wxString(1, str[i]));
+        wnd->m_gridRecent->SetCharacters(val);
+    }
 
-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-        const auto &cc = app->m_cc_db.idxRnk[i];
-        wxString name(wxT("category"));
-        name.Append(cc.id.data, _countof(cc.id.data));
+    for (size_t i = 0, n = app->m_cb_db.idxFirst.size(); i < n; i++) {
+        const auto &cb = app->m_cb_db.idxFirst[i];
         bool val;
-        if (RestoreValue(name, &val))
-            wnd->m_categories->Check(i, val);
+        if (RestoreValue(wxString::Format(wxT("block%u"), cb.id), &val))
+            wnd->m_blocks->Check((unsigned int)i, val);
     }
 
     bool search_panel;
@@ -681,5 +873,6 @@ bool wxPersistentZRColaCharSelect::Restore()
 
     wnd->ResetResults();
 
-    return wxPersistentDialog::Restore();
+    int guiLevel;
+    return RestoreValue(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel ? wxPersistentTLWEx::Restore() : true;
 }

ZRCola/zrcolachrslct.h

@@ -1,20 +1,6 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
@@ -26,17 +12,115 @@ class wxPersistentZRColaCharSelect;
 
 #pragma once
 
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include "zrcolagui.h"
+#pragma warning(pop)
 #include <zrcola/character.h>
-#include <wxex/valhex.h>
-#include <wxex/persist/dialog.h>
+#include <wxex/persist/toplevel.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include <wx/validate.h>
 #include <wx/event.h>
 #include <wx/thread.h>
+#pragma warning(pop)
 #include <list>
 #include <map>
+#include <string>
 #include <vector>
 
 
+///
+/// Validator for Unicode character
+///
+class wxZRColaUTF16CharValidator : public wxValidator
+{
+public:
+    ///
+    /// Construct the validator with a value to store data
+    ///
+    wxZRColaUTF16CharValidator(ZRCola::char_t *val = NULL);
+
+    ///
+    /// Copies this validator
+    ///
+    virtual wxObject* Clone() const;
+
+    ///
+    /// Validates the value
+    ///
+    virtual bool Validate(wxWindow *parent);
+
+    ///
+    /// Transfers the value to the window
+    ///
+    virtual bool TransferToWindow();
+
+    ///
+    /// Transfers the value from the window
+    ///
+    virtual bool TransferFromWindow();
+
+    ///
+    /// Parses FQDN value
+    ///
+    static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, wchar_t *val_out = NULL);
+
+protected:
+    wchar_t *m_val; ///< Pointer to variable to receive control's parsed value
+
+private:
+    wxDECLARE_DYNAMIC_CLASS(wxZRColaUTF16CharValidator);
+    wxDECLARE_NO_ASSIGN_CLASS(wxZRColaUTF16CharValidator);
+};
+
+
+///
+/// Validator for Unicode dump
+///
+class wxZRColaUnicodeDumpValidator : public wxValidator
+{
+public:
+    ///
+    /// Construct the validator with a value to store data
+    ///
+    wxZRColaUnicodeDumpValidator(wxString *val = NULL);
+
+    ///
+    /// Copies this validator
+    ///
+    virtual wxObject* Clone() const;
+
+    ///
+    /// Validates the value
+    ///
+    virtual bool Validate(wxWindow *parent);
+
+    ///
+    /// Transfers the value to the window
+    ///
+    virtual bool TransferToWindow();
+
+    ///
+    /// Transfers the value from the window
+    ///
+    virtual bool TransferFromWindow();
+
+    ///
+    /// Parses Unicode dump value
+    ///
+    static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, wxString *val_out = NULL);
+
+protected:
+    wxString *m_val; ///< Pointer to variable to receive control's parsed value
+
+private:
+    wxDECLARE_DYNAMIC_CLASS(wxZRColaUnicodeDumpValidator);
+    wxDECLARE_NO_ASSIGN_CLASS(wxZRColaUnicodeDumpValidator);
+};
+
+
 wxDECLARE_EVENT(wxEVT_SEARCH_COMPLETE, wxThreadEvent);
 
 
@@ -56,10 +140,10 @@ protected:
     virtual void OnIdle(wxIdleEvent& event);
     virtual void OnSearchText(wxCommandEvent& event);
     virtual void OnSearchMore(wxHyperlinkEvent& event);
-    virtual void OnCategoriesAll(wxHyperlinkEvent& event);
-    virtual void OnCategoriesNone(wxHyperlinkEvent& event);
-    virtual void OnCategoriesInvert(wxHyperlinkEvent& event);
-    virtual void OnCategoriesToggle(wxCommandEvent& event);
+    virtual void OnBlocksAll(wxHyperlinkEvent& event);
+    virtual void OnBlocksNone(wxHyperlinkEvent& event);
+    virtual void OnBlocksInvert(wxHyperlinkEvent& event);
+    virtual void OnBlocksToggle(wxCommandEvent& event);
     void OnSearchComplete(wxThreadEvent& event);
     virtual void OnResultSelectCell(wxGridEvent& event);
     virtual void OnResultCellDClick(wxGridEvent& event);
@@ -72,19 +156,20 @@ protected:
     virtual void OnUnicodeText(wxCommandEvent& event);
     virtual void OnPreviewKeyDown(wxKeyEvent& event);
     virtual void OnRelatedSelectCell(wxGridEvent& event);
-    virtual void OnOKButtonClick(wxCommandEvent& event);
+    virtual void OnInsertUpdateUI(wxUpdateUIEvent& event);
+    virtual void OnInsert(wxCommandEvent& event);
 
     void ResetResults();
     void NavigateBy(int offset);
-    void NavigateTo(wchar_t c);
+    void NavigateTo(const wxString &c);
 
 public:
-    wchar_t m_char;                                 ///< Currently selected character (0 when none)
+    wxString m_char;                                ///< Currently selected character (empty when none)
 
 protected:
     LCID m_locale;                                  ///< Locale for tag lookup
-    bool m_searchChanged;                           ///< Did Search field or category selection change?
-    std::map<ZRCola::chrcatid_t, int> m_ccOrder;    ///< Character category order
+    bool m_searchChanged;                           ///< Did Search field or block selection change?
+    std::map<ZRCola::chrblkid_t, int> m_cbOrder;    ///< Character block order
     bool m_unicodeChanged;                          ///< Did Unicode field change?
 
 
@@ -103,8 +188,8 @@ protected:
 
     public:
         std::wstring m_search;                      ///< Search phrase
-        std::set<ZRCola::chrcatid_t> m_cats;        ///< Search categories
-        std::vector<std::pair<ZRCola::charrank_t, wchar_t> > m_hits; ///< Search results
+        std::set<ZRCola::chrblkid_t> m_blks;        ///< Search blocks
+        std::vector<std::pair<ZRCola::charrank_t, std::wstring> > m_hits; ///< Search results
 
     protected:
         wxZRColaCharSelect *m_parent;               ///< Thread owner
@@ -116,7 +201,7 @@ protected:
     ///
     struct NavigationState
     {
-        wchar_t m_char;
+        std::wstring m_char;
         struct {
             wxGridCellCoords m_selected;
         } m_related;
@@ -130,13 +215,16 @@ protected:
 ///
 /// Supports saving/restoring wxZRColaCharSelect state
 ///
-class wxPersistentZRColaCharSelect : public wxPersistentDialog
+class wxPersistentZRColaCharSelect : public wxPersistentTLWEx
 {
 public:
     wxPersistentZRColaCharSelect(wxZRColaCharSelect *wnd);
 
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 

ZRCola/zrcolacomppnl.cpp

@@ -1,23 +1,9 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -25,42 +11,66 @@
 //////////////////////////////////////////////////////////////////////////
 
 wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
-    m_decomposedChanged(false),
-    m_composedChanged(false),
-    m_selDecomposed(0, 0),
-    m_selComposed(0, 0),
+    m_sourceChanged(false),
+    m_destinationChanged(false),
+    m_sourceRestyled(false),
+    m_destinationRestyled(false),
+    m_styleNormal(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_stylePUA(*wxBLUE, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_styleZRColaUnicodeComposedIssues(*wxRED, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_selSource(0, 0),
+    m_selDestination(0, 0),
     wxZRColaComposerPanelBase(parent)
 {
-    m_decomposed->PushEventHandler(&m_keyhandler);
+    // RichEdit control has no inner margins by default.
+    m_source->SetMargins(FromDIP(wxPoint(5, 2)));
+    m_destination->SetMargins(FromDIP(wxPoint(5, 2)));
 
+    m_source->PushEventHandler(&m_keyhandler);
+}
+
+
+wxZRColaComposerPanel::~wxZRColaComposerPanel()
+{
+    m_source->PopEventHandler();
+
+    // This is a controlled exit. Purge saved state.
+    wxString fileName(GetStateFileName());
+    if (wxFileExists(fileName))
+        wxRemoveFile(fileName);
+}
+
+
+void wxZRColaComposerPanel::RestoreFromStateFile()
+{
     // Restore the previously saved state (if exists).
     wxString fileName(GetStateFileName());
     if (wxFileExists(fileName)) {
         wxFFile file(fileName, wxT("rb"));
         if (file.IsOpened()) {
-            // Load decomposed text.
-            unsigned __int64 n;
+            // Load source text.
+            uint64_t n;
             file.Read(&n, sizeof(n));
             if (!file.Error()) {
-                wxString decomposed;
-                file.Read(wxStringBuffer(decomposed, n), sizeof(wchar_t)*n);
+                wxString source;
+                file.Read(wxStringBuffer(source, (size_t)n), sizeof(wchar_t)*(size_t)n);
                 if (!file.Error()) {
-                    // Load composed text.
+                    // Load destination text.
                     file.Read(&n, sizeof(n));
                     if (!file.Error()) {
-                        wxString composed;
-                        file.Read(wxStringBuffer(composed, n), sizeof(wchar_t)*n);
+                        wxString destination;
+                        file.Read(wxStringBuffer(destination, (size_t)n), sizeof(wchar_t)*(size_t)n);
                         if (!file.Error()) {
                             // Restore state.
-                            m_decomposed->SetValue(decomposed);
-                            m_decomposed->GetSelection(&m_selDecomposed.first, &m_selDecomposed.second);
-                            SetHexValue(m_decomposedHex, m_selDecomposedHex, m_mappingDecomposedHex, decomposed.GetData(), decomposed.Length(), m_selDecomposed.first, m_selDecomposed.second);
-                            m_decomposedChanged = false;
+                            m_source->SetValue(source);
+                            m_source->GetSelection(&m_selSource.first, &m_selSource.second);
+                            SetHexValue(m_sourceHex, m_selSourceHex, m_mappingSourceHex, source.GetData(), source.Length(), m_selSource.first, m_selSource.second);
+                            m_sourceChanged = false;
 
-                            m_composed->SetValue(composed);
-                            m_composed->GetSelection(&m_selComposed.first, &m_selComposed.second);
-                            SetHexValue(m_composedHex, m_selComposedHex, m_mappingComposedHex, composed.GetData(), composed.Length(), m_selComposed.first, m_selComposed.second);
-                            m_composedChanged = false;
+                            m_destination->SetValue(destination);
+                            m_destination->GetSelection(&m_selDestination.first, &m_selDestination.second);
+                            SetHexValue(m_destinationHex, m_selDestinationHex, m_mappingDestinationHex, destination.GetData(), destination.Length(), m_selDestination.first, m_selDestination.second);
+                            m_destinationChanged = false;
                         }
                     }
                 }
@@ -70,208 +80,277 @@ wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
 }
 
 
-wxZRColaComposerPanel::~wxZRColaComposerPanel()
-{
-    m_decomposed->PopEventHandler();
-
-    // This is a controlled exit. Purge saved state.
-    wxString fileName(GetStateFileName());
-    if (wxFileExists(fileName))
-        wxRemoveFile(fileName);
-}
-
-
 void wxZRColaComposerPanel::SynchronizePanels()
 {
-    if (m_decomposedChanged) {
+    if (m_sourceChanged) {
         m_timerSave.Stop();
 
         auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-        wxString src;
-        size_t len = GetValue(m_decomposed, src);
 
-        std::wstring norm;
-        app->m_t_db.Decompose(src.data(), len, norm, &m_mapping1);
+        wxString src = m_source->GetValue();
+        size_t len = src.Length();
+        std::wstring dst(src.data(), len), dst2;
+        ZRCola::mapping_vector map;
 
-        std::wstring dst;
-        app->m_t_db.Compose(norm.data(), norm.size(), dst, &m_mapping2);
+        m_mapping.clear();
 
-        m_decomposed->GetSelection(&m_selDecomposed.first, &m_selDecomposed.second);
+        if (app->m_mainWnd->m_composition) {
+            // ZRCola decompose first, then re-compose.
+            app->m_t_db.TranslateInv(app->m_mainWnd->m_composition_id, dst.data(), dst.size(), dst2, &map);
+            m_mapping.push_back(std::move(map));
+            map.clear();
 
-        // Update decomposed HEX dump.
-        SetHexValue(m_decomposedHex, m_selDecomposedHex, m_mappingDecomposedHex, src.data(), len, m_selDecomposed.first, m_selDecomposed.second);
+            app->m_t_db.Translate(app->m_mainWnd->m_composition_id, dst2.data(), dst2.size(), dst, &map);
+            m_mapping.push_back(std::move(map));
+            map.clear();
+        }
 
-        // Update composed text, and its HEX dump.
-        m_composed->SetValue(dst);
-        m_composed->SetSelection(
-            m_selComposed.first  = m_mapping2.to_dst(m_mapping1.to_dst(m_selDecomposed.first )),
-            m_selComposed.second = m_mapping2.to_dst(m_mapping1.to_dst(m_selDecomposed.second)));
-        SetHexValue(m_composedHex, m_selComposedHex, m_mappingComposedHex, dst.data(), dst.length(), m_selComposed.first, m_selComposed.second);
+        // Other translations
+        const ZRCola::transetid_t *sets_begin, *sets_end;
+        GetTranslationSeq(sets_begin, sets_end);
+        for (auto s = sets_begin; s != sets_end; ++s) {
+            app->m_t_db.Translate(*s, dst.data(), dst.size(), dst2, &map);
+            m_mapping.push_back(std::move(map));
+            map.clear();
+            dst = std::move(dst2);
+            dst2.clear();
+        }
+
+        m_source->GetSelection(&m_selSource.first, &m_selSource.second);
+
+        // Update source HEX dump.
+        SetHexValue(m_sourceHex, m_selSourceHex, m_mappingSourceHex, src.data(), len, m_selSource.first, m_selSource.second);
+
+        // Update destination text, and its HEX dump.
+        m_destination->SetValue(dst);
+        m_destination->SetSelection(
+            m_selDestination.first  = (long)MapToDestination(m_selSource.first ),
+            m_selDestination.second = (long)MapToDestination(m_selSource.second));
+        SetHexValue(m_destinationHex, m_selDestinationHex, m_mappingDestinationHex, dst.data(), dst.length(), m_selDestination.first, m_selDestination.second);
 
         // Schedule state save after 3s.
         m_timerSave.Start(3000, true);
-    } else if (m_composedChanged) {
+    } else if (m_destinationChanged) {
         m_timerSave.Stop();
 
-        wxString src;
-        size_t len = GetValue(m_composed, src);
-
         auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-        std::wstring dst;
-        wxZRColaFrame *mainWnd = dynamic_cast<wxZRColaFrame*>(wxGetActiveWindow());
-        if (mainWnd)
-            app->m_t_db.Decompose(src.data(), len, &app->m_lc_db, mainWnd->m_settings->m_lang, dst, &m_mapping2);
-        else
-            app->m_t_db.Decompose(src.data(), len, dst, &m_mapping2);
 
-        m_mapping1.clear();
-        m_mapping2.invert();
+        wxString src = m_destination->GetValue();
+        size_t len = src.Length();
+        std::wstring dst(src.data(), len), dst2;
+        ZRCola::mapping_vector map;
 
-        m_composed->GetSelection(&m_selComposed.first, &m_selComposed.second);
+        m_mapping.clear();
 
-        // Update composed HEX dump.
-        SetHexValue(m_composedHex, m_selComposedHex, m_mappingComposedHex, src.data(), len, m_selComposed.first, m_selComposed.second);
+        // Other translations
+        const ZRCola::transetid_t *sets_begin, *sets_end;
+        GetTranslationSeq(sets_begin, sets_end);
+        for (auto s = sets_end; (s--) != sets_begin;) {
+            app->m_t_db.TranslateInv(*s, dst.data(), dst.size(), dst2, &map);
+            dst = std::move(dst2);
+            dst2.clear();
 
-        // Update decomposed text, and its HEX dump.
-        m_decomposed->SetValue(dst);
-        m_decomposed->SetSelection(
-            m_selDecomposed.first  = m_mapping1.to_src(m_mapping2.to_src(m_selComposed.first )),
-            m_selDecomposed.second = m_mapping1.to_src(m_mapping2.to_src(m_selComposed.second)));
-        SetHexValue(m_decomposedHex, m_selDecomposedHex, m_mappingDecomposedHex, dst.data(), dst.length(), m_selDecomposed.first, m_selDecomposed.second);
+            for (auto& m : map)
+                m.invert();
+            m_mapping.push_back(std::move(map));
+            map.clear();
+        }
+
+        if (app->m_mainWnd->m_composition) {
+            // ZRCola decompose.
+            app->m_t_db.TranslateInv(app->m_mainWnd->m_composition_id, dst.data(), dst.size(), &app->m_lc_db, app->m_mainWnd->m_settings->m_lang, dst2, &map);
+            dst = std::move(dst2);
+            dst2.clear();
+
+            for (auto& m : map)
+                m.invert();
+            m_mapping.push_back(std::move(map));
+            map.clear();
+        }
+
+        m_destination->GetSelection(&m_selDestination.first, &m_selDestination.second);
+
+        // Update destination HEX dump.
+        SetHexValue(m_destinationHex, m_selDestinationHex, m_mappingDestinationHex, src.data(), len, m_selDestination.first, m_selDestination.second);
+
+        // Update source text, and its HEX dump.
+        m_source->SetValue(dst);
+        m_source->SetSelection(
+            m_selSource.first  = (long)MapToSource(m_selDestination.first ),
+            m_selSource.second = (long)MapToSource(m_selDestination.second));
+        SetHexValue(m_sourceHex, m_selSourceHex, m_mappingSourceHex, dst.data(), dst.length(), m_selSource.first, m_selSource.second);
 
         // Schedule state save after 3s.
         m_timerSave.Start(3000, true);
     }
 
-    m_decomposedChanged = false;
-    m_composedChanged   = false;
+    m_sourceChanged      = false;
+    m_destinationChanged = false;
 }
 
 
-
-void wxZRColaComposerPanel::OnDecomposedPaint(wxPaintEvent& event)
+void wxZRColaComposerPanel::OnSourcePaint(wxPaintEvent& event)
 {
     event.Skip();
 
+    if (m_sourceRestyled)
+        return;
+
     long from, to;
-    m_decomposed->GetSelection(&from, &to);
+    m_source->GetSelection(&from, &to);
 
-    if (m_selDecomposed.first != from || m_selDecomposed.second != to) {
+    if (m_selSource.first != from || m_selSource.second != to) {
         // Save new selection first, to avoid loop.
-        m_selDecomposed.first  = from;
-        m_selDecomposed.second = to;
+        m_selSource.first  = from;
+        m_selSource.second = to;
 
-        m_decomposedHex->SetSelection(
-            m_selDecomposedHex.first  = m_mappingDecomposedHex.to_dst(from),
-            m_selDecomposedHex.second = m_mappingDecomposedHex.to_dst(to  ));
+        m_sourceHex->SetSelection(
+            m_selSourceHex.first  = (long)stdex::src2dst<size_t>(m_mappingSourceHex, from),
+            m_selSourceHex.second = (long)stdex::src2dst<size_t>(m_mappingSourceHex, to  ));
 
-        m_composed->SetSelection(
-            m_selComposed.first  = m_mapping2.to_dst(m_mapping1.to_dst(from)),
-            m_selComposed.second = m_mapping2.to_dst(m_mapping1.to_dst(to  )));
+        m_destination->SetSelection(
+            m_selDestination.first  = (long)MapToDestination(from),
+            m_selDestination.second = (long)MapToDestination(to  ));
 
-        m_composedHex->SetSelection(
-            m_selComposedHex.first  = m_mappingComposedHex.to_dst(m_selComposed.first ),
-            m_selComposedHex.second = m_mappingComposedHex.to_dst(m_selComposed.second));
+        m_destinationHex->SetSelection(
+            m_selDestinationHex.first  = (long)stdex::src2dst<size_t>(m_mappingDestinationHex, m_selDestination.first ),
+            m_selDestinationHex.second = (long)stdex::src2dst<size_t>(m_mappingDestinationHex, m_selDestination.second));
     }
 }
 
 
-void wxZRColaComposerPanel::OnDecomposedHexPaint(wxPaintEvent& event)
+void wxZRColaComposerPanel::OnSourceHexPaint(wxPaintEvent& event)
 {
     event.Skip();
 
     long from, to;
-    m_decomposedHex->GetSelection(&from, &to);
+    m_sourceHex->GetSelection(&from, &to);
 
-    if (m_selDecomposedHex.first != from || m_selDecomposedHex.second != to) {
+    if (m_selSourceHex.first != from || m_selSourceHex.second != to) {
         // Save new selection first, to avoid loop.
-        m_selDecomposedHex.first  = from;
-        m_selDecomposedHex.second = to;
+        m_selSourceHex.first  = from;
+        m_selSourceHex.second = to;
 
-        m_decomposed->SetSelection(
-            m_selDecomposed.first  = m_mappingDecomposedHex.to_src(from),
-            m_selDecomposed.second = m_mappingDecomposedHex.to_src(to  ));
+        m_source->SetSelection(
+            m_selSource.first  = (long)stdex::dst2src<size_t>(m_mappingSourceHex, from),
+            m_selSource.second = (long)stdex::dst2src<size_t>(m_mappingSourceHex, to  ));
 
-        m_composed->SetSelection(
-            m_selComposed.first  = m_mapping2.to_dst(m_mapping1.to_dst(m_selDecomposed.first )),
-            m_selComposed.second = m_mapping2.to_dst(m_mapping1.to_dst(m_selDecomposed.second)));
+        m_destination->SetSelection(
+            m_selDestination.first  = (long)MapToDestination(m_selSource.first ),
+            m_selDestination.second = (long)MapToDestination(m_selSource.second));
 
-        m_composedHex->SetSelection(
-            m_selComposedHex.first  = m_mappingComposedHex.to_dst(m_selComposed.first ),
-            m_selComposedHex.second = m_mappingComposedHex.to_dst(m_selComposed.second));
+        m_destinationHex->SetSelection(
+            m_selDestinationHex.first  = (long)stdex::src2dst<size_t>(m_mappingDestinationHex, m_selDestination.first ),
+            m_selDestinationHex.second = (long)stdex::src2dst<size_t>(m_mappingDestinationHex, m_selDestination.second));
     }
 }
 
 
-void wxZRColaComposerPanel::OnDecomposedText(wxCommandEvent& event)
+void wxZRColaComposerPanel::OnSourceText(wxCommandEvent& event)
 {
     event.Skip();
 
-    // Set the flag the decomposed text changed to trigger idle-time composition.
-    m_decomposedChanged = true;
+    if (m_sourceRestyled)
+        return;
+
+    // Set the flag the source text changed to trigger idle-time translation.
+    m_sourceChanged = true;
+
+    m_sourceRestyled = true;
+    m_source->SetStyle(0, GetWindowTextLength(m_source->GetHWND()), m_styleNormal);
+    m_sourceRestyled = false;
 }
 
 
-void wxZRColaComposerPanel::OnComposedPaint(wxPaintEvent& event)
+void wxZRColaComposerPanel::OnDestinationPaint(wxPaintEvent& event)
+{
+    event.Skip();
+
+    if (m_destinationRestyled)
+        return;
+
+    long from, to;
+    m_destination->GetSelection(&from, &to);
+
+    if (m_selDestination.first != from || m_selDestination.second != to) {
+        // Save new selection first, to avoid loop.
+        m_selDestination.first  = from;
+        m_selDestination.second = to;
+
+        m_destinationHex->SetSelection(
+            m_selDestinationHex.first  = (long)stdex::src2dst<size_t>(m_mappingDestinationHex, from),
+            m_selDestinationHex.second = (long)stdex::src2dst<size_t>(m_mappingDestinationHex, to  ));
+
+        m_source->SetSelection(
+            m_selSource.first  = (long)MapToSource(from),
+            m_selSource.second = (long)MapToSource(to  ));
+
+        m_sourceHex->SetSelection(
+            m_selSourceHex.first  = (long)stdex::src2dst<size_t>(m_mappingSourceHex, m_selSource.first ),
+            m_selSourceHex.second = (long)stdex::src2dst<size_t>(m_mappingSourceHex, m_selSource.second));
+    }
+}
+
+
+void wxZRColaComposerPanel::OnDestinationHexPaint(wxPaintEvent& event)
 {
     event.Skip();
 
     long from, to;
-    m_composed->GetSelection(&from, &to);
+    m_destinationHex->GetSelection(&from, &to);
 
-    if (m_selComposed.first != from || m_selComposed.second != to) {
+    if (m_selDestinationHex.first != from || m_selDestinationHex.second != to) {
         // Save new selection first, to avoid loop.
-        m_selComposed.first  = from;
-        m_selComposed.second = to;
+        m_selDestinationHex.first  = from;
+        m_selDestinationHex.second = to;
 
-        m_composedHex->SetSelection(
-            m_selComposedHex.first  = m_mappingComposedHex.to_dst(from),
-            m_selComposedHex.second = m_mappingComposedHex.to_dst(to  ));
+        m_destination->SetSelection(
+            m_selDestination.first  = (long)stdex::dst2src<size_t>(m_mappingDestinationHex, from),
+            m_selDestination.second = (long)stdex::dst2src<size_t>(m_mappingDestinationHex, to  ));
 
-        m_decomposed->SetSelection(
-            m_selDecomposed.first  = m_mapping1.to_src(m_mapping2.to_src(from)),
-            m_selDecomposed.second = m_mapping1.to_src(m_mapping2.to_src(to  )));
+        m_source->SetSelection(
+            m_selSource.first  = (long)MapToSource(m_selDestination.first ),
+            m_selSource.second = (long)MapToSource(m_selDestination.second));
 
-        m_decomposedHex->SetSelection(
-            m_selDecomposedHex.first  = m_mappingDecomposedHex.to_dst(m_selDecomposed.first ),
-            m_selDecomposedHex.second = m_mappingDecomposedHex.to_dst(m_selDecomposed.second));
+        m_sourceHex->SetSelection(
+            m_selSourceHex.first  = (long)stdex::src2dst<size_t>(m_mappingSourceHex, m_selSource.first ),
+            m_selSourceHex.second = (long)stdex::src2dst<size_t>(m_mappingSourceHex, m_selSource.second));
     }
 }
 
 
-void wxZRColaComposerPanel::OnComposedHexPaint(wxPaintEvent& event)
+void wxZRColaComposerPanel::OnDestinationText(wxCommandEvent& event)
 {
     event.Skip();
 
-    long from, to;
-    m_composedHex->GetSelection(&from, &to);
+    if (m_destinationRestyled)
+        return;
 
-    if (m_selComposedHex.first != from || m_selComposedHex.second != to) {
-        // Save new selection first, to avoid loop.
-        m_selComposedHex.first  = from;
-        m_selComposedHex.second = to;
+    // Set the flag the destination text changed to trigger idle-time inverse translation.
+    m_destinationChanged = true;
 
-        m_composed->SetSelection(
-            m_selComposed.first  = m_mappingComposedHex.to_src(from),
-            m_selComposed.second = m_mappingComposedHex.to_src(to  ));
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    m_destinationRestyled = true;
+    wxString src = m_destination->GetValue();
+    app->m_h_db.Highlight(src, src.Length(), [this, app, src](ZRCola::hlghtsetid_t set, size_t start, size_t end) {
+        switch (set) {
+        case ZRCOLA_HLGHTSETID_ZRCOLA_UNICODE_COMPOSED_ISSUES:
+            m_destination->SetStyle((long)start, (long)end, m_styleZRColaUnicodeComposedIssues);
+            break;
 
-        m_decomposed->SetSelection(
-            m_selDecomposed.first  = m_mapping1.to_src(m_mapping2.to_src(m_selComposed.first )),
-            m_selDecomposed.second = m_mapping1.to_src(m_mapping2.to_src(m_selComposed.second)));
-
-        m_decomposedHex->SetSelection(
-            m_selDecomposedHex.first  = m_mappingDecomposedHex.to_dst(m_selDecomposed.first ),
-            m_selDecomposedHex.second = m_mappingDecomposedHex.to_dst(m_selDecomposed.second));
-    }
-}
-
-
-void wxZRColaComposerPanel::OnComposedText(wxCommandEvent& event)
-{
-    event.Skip();
-
-    // Set the flag the composed text changed to trigger idle-time decomposition.
-    m_composedChanged = true;
+        default:
+            if (app->m_mainWnd->m_warnPUA) {
+                for (size_t i = start, j; i < end;) {
+                    bool pua_i = ZRCola::ispua(src[i]);
+                    for (j = i + 1; j < end && pua_i == ZRCola::ispua(src[j]); j++);
+                    m_destination->SetStyle((long)i, (long)j, pua_i ? m_stylePUA : m_styleNormal);
+                    i = j;
+                }
+            } else
+                m_destination->SetStyle((long)start, (long)end, m_styleNormal);
+        }
+    });
+    m_destinationRestyled = false;
 }
 
 
@@ -280,18 +359,21 @@ void wxZRColaComposerPanel::OnSaveTimer(wxTimerEvent& event)
     wxString fileName(GetStateFileName());
     wxFFile file(fileName, wxT("wb"));
     if (file.IsOpened()) {
-        wxString text;
-        size_t len;
+        {
+            // Save source text.
+            wxString text = m_source->GetValue();
+            size_t len = text.Length();
+            file.Write(&len, sizeof(len));
+            file.Write((const wchar_t*)text, sizeof(wchar_t)*len);
+        }
 
-        // Save decomposed text.
-        len = GetValue(m_decomposed, text);
-        file.Write(&len, sizeof(len));
-        file.Write((const wchar_t*)text, sizeof(wchar_t)*len);
-
-        // Save composed text.
-        len = GetValue(m_composed, text);
-        file.Write(&len, sizeof(len));
-        file.Write((const wchar_t*)text, sizeof(wchar_t)*len);
+        {
+            // Save destination text.
+            wxString text = m_destination->GetValue();
+            size_t len = text.Length();
+            file.Write(&len, sizeof(len));
+            file.Write((const wchar_t*)text, sizeof(wchar_t)*len);
+        }
     }
 
     event.Skip();
@@ -316,31 +398,6 @@ wxString wxZRColaComposerPanel::GetStateFileName()
 }
 
 
-size_t wxZRColaComposerPanel::GetValue(wxTextCtrl *wnd, wxString &text)
-{
-#ifdef __WINDOWS__
-    // Use Windows GetWindowText() function to avoid line ending conversion incompletely imposed by wxWidgets.
-    WXHWND hWnd = wnd->GetHWND();
-    size_t len = ::GetWindowTextLengthW(hWnd);
-    if (len < 0x100) {
-        WCHAR buf[0x100];
-        ::GetWindowTextW(hWnd, buf, len + 1);
-        text.assign(buf, len);
-    } else {
-        LPWSTR buf = new WCHAR[len + 1];
-        ::GetWindowTextW(hWnd, buf, len + 1);
-        text.assign(buf, len);
-        delete [] buf;
-    }
-
-    return len;
-#else
-    text = wnd->GetValue();
-    return text.Length();
-#endif
-}
-
-
 void wxZRColaComposerPanel::SetHexValue(wxTextCtrl *wnd, std::pair<long, long> &range, ZRCola::mapping_vector &mapping, const wchar_t *src, size_t len, long from, long to)
 {
     wxString hex;
@@ -349,8 +406,8 @@ void wxZRColaComposerPanel::SetHexValue(wxTextCtrl *wnd, std::pair<long, long> &
     mapping.clear();
     for (size_t i = 0; i < len && src[i]; i++) {
         wchar_t c = src[i];
-        if (c == L'\n' || c == '\r') {
-            hex += c;
+        if (c == L'\n') {
+            hex += L"\r\n";
             first = true;
         } else {
             hex += wxString::Format(first ? wxT("%04X") : wxT(" %04X"), src[i]);
@@ -361,8 +418,8 @@ void wxZRColaComposerPanel::SetHexValue(wxTextCtrl *wnd, std::pair<long, long> &
 
     wnd->SetValue(hex);
     wnd->SetSelection(
-        range.first  = mapping.to_dst(from),
-        range.second = mapping.to_dst(to  ));
+        range.first  = (long)stdex::src2dst<size_t>(mapping, from),
+        range.second = (long)stdex::src2dst<size_t>(mapping, to  ));
 }
 
 
@@ -370,6 +427,9 @@ void wxZRColaComposerPanel::SetHexValue(wxTextCtrl *wnd, std::pair<long, long> &
 // wxPersistentZRColaComposerPanel
 //////////////////////////////////////////////////////////////////////////
 
+const int wxPersistentZRColaComposerPanel::s_guiLevel = 1;
+
+
 wxPersistentZRColaComposerPanel::wxPersistentZRColaComposerPanel(wxZRColaComposerPanel *wnd) : wxPersistentWindow<wxZRColaComposerPanel>(wnd)
 {
 }
@@ -383,10 +443,12 @@ wxString wxPersistentZRColaComposerPanel::GetKind() const
 
 void wxPersistentZRColaComposerPanel::Save() const
 {
-    auto const wnd = static_cast<const wxZRColaComposerPanel*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
+    auto wnd = static_cast<wxZRColaComposerPanel*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
-    SaveValue(wxT("splitDecomposed"), wnd->m_splitterDecomposed->GetSashPosition());
-    SaveValue(wxT("splitComposed"  ), wnd->m_splitterComposed  ->GetSashPosition());
+    SaveValue(wxT("guiLevel"       ), s_guiLevel);
+    SaveValue(wxT("dpiX"           ), wxClientDC(wnd).GetPPI().x);
+    SaveValue(wxT("splitDecomposed"), wnd->m_splitterSource     ->GetSashPosition());
+    SaveValue(wxT("splitComposed"  ), wnd->m_splitterDestination->GetSashPosition());
 }
 
 
@@ -394,18 +456,27 @@ bool wxPersistentZRColaComposerPanel::Restore()
 {
     auto wnd = dynamic_cast<wxZRColaComposerPanel*>(GetWindow());
 
+    int guiLevel;
+    if (!RestoreValue(wxT("guiLevel"), &guiLevel) || guiLevel != s_guiLevel)
+        return true;
+
+    int dpiHorz = wxClientDC(wnd).GetPPI().x;
+    int dpiHorzVal;
     int sashVal;
 
+    if (!RestoreValue(wxT("dpiX"), &dpiHorzVal))
+        dpiHorzVal = 96;
+
     if (RestoreValue(wxT("splitDecomposed"), &sashVal)) {
         // wxFormBuilder sets initial splitter stash in idle event handler after GUI settles. Overriding our loaded value. Disconnect it's idle event handler.
-        wnd->m_splitterDecomposed->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterDecomposedOnIdle ), NULL, wnd );
-        wnd->m_splitterDecomposed->SetSashPosition(sashVal);
+        wnd->m_splitterSource->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterSourceOnIdle ), NULL, wnd );
+        wnd->m_splitterSource->SetSashPosition(wxMulDivInt32(sashVal, dpiHorz, dpiHorzVal));
     }
 
     if (RestoreValue(wxT("splitComposed"), &sashVal)) {
         // wxFormBuilder sets initial splitter stash in idle event handler after GUI settles. Overriding our loaded value. Disconnect it's idle event handler.
-        wnd->m_splitterComposed->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterComposedOnIdle ), NULL, wnd );
-        wnd->m_splitterComposed->SetSashPosition(sashVal);
+        wnd->m_splitterDestination->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterDestinationOnIdle ), NULL, wnd );
+        wnd->m_splitterDestination->SetSashPosition(wxMulDivInt32(sashVal, dpiHorz, dpiHorzVal));
     }
 
     return true;

ZRCola/zrcolacomppnl.h

@@ -1,20 +1,6 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
@@ -25,11 +11,19 @@ class wxZRColaComposerPanel;
 
 #pragma once
 
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include "zrcolagui.h"
+#pragma warning(pop)
 #include "zrcolakeyhndlr.h"
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/persist/window.h>
 #include <wx/timer.h>
+#pragma warning(pop)
 #include <utility>
+#include <vector>
 
 
 ///
@@ -41,36 +35,45 @@ public:
     wxZRColaComposerPanel(wxWindow* parent);
     virtual ~wxZRColaComposerPanel();
 
+    void RestoreFromStateFile();
     void SynchronizePanels();
 
     friend class wxPersistentZRColaComposerPanel;   // Allow saving/restoring window state.
 
 protected:
-    virtual void OnDecomposedPaint(wxPaintEvent& event);
-    virtual void OnDecomposedHexPaint(wxPaintEvent& event);
-    virtual void OnDecomposedText(wxCommandEvent& event);
-    virtual void OnComposedPaint(wxPaintEvent& event);
-    virtual void OnComposedHexPaint(wxPaintEvent& event);
-    virtual void OnComposedText(wxCommandEvent& event);
+    virtual void OnSourcePaint(wxPaintEvent& event);
+    virtual void OnSourceHexPaint(wxPaintEvent& event);
+    virtual void OnSourceText(wxCommandEvent& event);
+    virtual void OnDestinationPaint(wxPaintEvent& event);
+    virtual void OnDestinationHexPaint(wxPaintEvent& event);
+    virtual void OnDestinationText(wxCommandEvent& event);
     virtual void OnSaveTimer(wxTimerEvent& event);
+    inline size_t MapToDestination(_In_ size_t src) const;
+    inline size_t MapToSource(_In_ size_t dst) const;
+    inline void GetTranslationSeq(_Out_ const ZRCola::transetid_t *&sets_begin, _Out_ const ZRCola::transetid_t *&sets_end) const;
 
     static wxString GetStateFileName();
-    static size_t GetValue(wxTextCtrl *wnd, wxString &text);
     static void SetHexValue(wxTextCtrl *wnd, std::pair<long, long> &range, ZRCola::mapping_vector &mapping, const wchar_t *src, size_t len, long from, long to);
 
 protected:
-    bool m_decomposedChanged;                       ///< Boolean flag to mark decomposed text "dirty" to trigger composition
-    bool m_composedChanged;                         ///< Boolean flag to mark composed text "dirty" to trigger decomposition
-    ZRCola::mapping_vector m_mapping1;              ///< Character index mapping vector between decomposed and normalized text
-    ZRCola::mapping_vector m_mapping2;              ///< Character index mapping vector between normalized and composed text
+    bool m_sourceChanged;                           ///< Boolean flag to mark source text "dirty" to trigger translation
+    bool m_destinationChanged;                      ///< Boolean flag to mark destination text "dirty" to trigger inverse translation
+    volatile bool
+        m_sourceRestyled,                           ///< Boolean flag to mark source text is being restyled
+        m_destinationRestyled;                      ///< Boolean flag to mark destination text is being restyled
+    wxTextAttr
+        m_styleNormal,                              ///< Normal text style
+        m_stylePUA,                                 ///< PUA character text style
+        m_styleZRColaUnicodeComposedIssues;         ///< ZRCola Unicode Composed issues character text style
+    std::vector<ZRCola::mapping_vector> m_mapping;  ///< Character index mapping vector between source and normalized text
     std::pair<long, long>
-        m_selDecomposed,                            ///< Character index of selected text in decomposed text control
-        m_selDecomposedHex,                         ///< Character index of selected text in decomposed HEX dump text control
-        m_selComposed,                              ///< Character index of selected text in composed text control
-        m_selComposedHex;                           ///< Character index of selected text in composed HEX dump text control
-    wxZRColaKeyHandler m_keyhandler;                ///< Key handler for decomposed window
-    ZRCola::mapping_vector m_mappingDecomposedHex;  ///< Character index mapping vector between decomposed text and its HEX dump
-    ZRCola::mapping_vector m_mappingComposedHex;    ///< Character index mapping vector between composed text and its HEX dump
+        m_selSource,                                ///< Character index of selected text in source text control
+        m_selSourceHex,                             ///< Character index of selected text in source HEX dump text control
+        m_selDestination,                           ///< Character index of selected text in destination text control
+        m_selDestinationHex;                        ///< Character index of selected text in destination HEX dump text control
+    wxZRColaKeyHandler m_keyhandler;                ///< Key handler for source window
+    ZRCola::mapping_vector m_mappingSourceHex;      ///< Character index mapping vector between source text and its HEX dump
+    ZRCola::mapping_vector m_mappingDestinationHex; ///< Character index mapping vector between destination text and its HEX dump
 };
 
 
@@ -85,9 +88,54 @@ public:
     virtual wxString GetKind() const;
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 
+inline size_t wxZRColaComposerPanel::MapToDestination(_In_ size_t src) const
+{
+    for (auto m = m_mapping.cbegin(), m_end = m_mapping.cend(); m != m_end; ++m)
+        src = stdex::src2dst(*m, src);
+
+    return src;
+}
+
+
+inline size_t wxZRColaComposerPanel::MapToSource(_In_ size_t dst) const
+{
+    for (auto m = m_mapping.crbegin(), m_end = m_mapping.crend(); m != m_end; ++m)
+        dst = stdex::dst2src(*m, dst);
+
+    return dst;
+}
+
+
+inline void wxZRColaComposerPanel::GetTranslationSeq(_Out_ const ZRCola::transetid_t *&sets_begin, _Out_ const ZRCola::transetid_t *&sets_end) const
+{
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    if (app->m_mainWnd->m_transeq_id == ZRCOLA_TRANSEQID_DEFAULT) {
+        sets_begin = NULL;
+        sets_end   = NULL;
+    } else if (app->m_mainWnd->m_transeq_id == ZRCOLA_TRANSEQID_CUSTOM) {
+        sets_begin = app->m_mainWnd->m_transeq->m_transeq.data();
+        sets_end   = sets_begin + app->m_mainWnd->m_transeq->m_transeq.size();
+    } else {
+        size_t start;
+        if (app->m_tsq_db.idxTranSeq.find(ZRCola::transeq_db::transeq(app->m_mainWnd->m_transeq_id), start)) {
+            const auto &ts = app->m_tsq_db.idxTranSeq[start];
+            sets_begin = ts.sets();
+            sets_end   = ts.sets_end();
+        } else {
+            sets_begin = NULL;
+            sets_end   = NULL;
+        }
+    }
+}
+
+
 inline wxPersistentObject *wxCreatePersistentObject(wxZRColaComposerPanel *wnd)
 {
     return new wxPersistentZRColaComposerPanel(wnd);

ZRCola/zrcolafrm.cpp

@@ -1,23 +1,9 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -25,52 +11,86 @@
 //////////////////////////////////////////////////////////////////////////
 
 wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
-    EVT_MENU           (wxID_EXIT                                  , wxZRColaFrame::OnExit                       )
+    EVT_MENU           (wxID_EXIT                                             , wxZRColaFrame::OnExit                       )
 
-    EVT_UPDATE_UI_RANGE(wxID_CUT                  , wxID_CLEAR     , wxZRColaFrame::OnForwardEventUpdate         )
-    EVT_MENU_RANGE     (wxID_CUT                  , wxID_CLEAR     , wxZRColaFrame::OnForwardEvent               )
-    EVT_UPDATE_UI      (wxID_SELECTALL                             , wxZRColaFrame::OnForwardEventUpdate         )
-    EVT_MENU           (wxID_SELECTALL                             , wxZRColaFrame::OnForwardEvent               )
+    EVT_UPDATE_UI_RANGE(wxID_CUT                  , wxID_CLEAR                , wxZRColaFrame::OnForwardEventUpdate         )
+    EVT_MENU_RANGE     (wxID_CUT                  , wxID_CLEAR                , wxZRColaFrame::OnForwardEvent               )
+    EVT_UPDATE_UI      (wxID_SELECTALL                                        , wxZRColaFrame::OnForwardEventUpdate         )
+    EVT_MENU           (wxID_SELECTALL                                        , wxZRColaFrame::OnForwardEvent               )
 
-    EVT_MENU           (wxID_CHARACTER_SELECTOR                    , wxZRColaFrame::OnInsertCharacter            )
+    EVT_UPDATE_UI      (wxID_CHARACTER_SELECTOR                               , wxZRColaFrame::OnInsertCharacterUpdate      )
+    EVT_MENU           (wxID_CHARACTER_SELECTOR                               , wxZRColaFrame::OnInsertCharacter            )
 
-    EVT_UPDATE_UI_RANGE(wxID_SEND_COMPOSED        , wxID_SEND_ABORT, wxZRColaFrame::OnSendUpdate                 )
-    EVT_MENU           (wxID_SEND_COMPOSED                         , wxZRColaFrame::OnSendComposed               )
-    EVT_MENU           (wxID_SEND_DECOMPOSED                       , wxZRColaFrame::OnSendDecomposed             )
-    EVT_MENU           (wxID_SEND_ABORT                            , wxZRColaFrame::OnSendAbort                  )
+    EVT_UPDATE_UI_RANGE(wxID_SEND_DESTINATION     , wxID_SEND_ABORT           , wxZRColaFrame::OnSendUpdate                 )
+    EVT_MENU           (wxID_COPY_DESTINATION_AND_RETURN                      , wxZRColaFrame::OnCopyDestinationAndReturn   )
+    EVT_MENU           (wxID_SEND_DESTINATION                                 , wxZRColaFrame::OnSendDestination            )
+    EVT_MENU           (wxID_COPY_SOURCE_AND_RETURN                           , wxZRColaFrame::OnCopySourceAndReturn        )
+    EVT_MENU           (wxID_SEND_SOURCE                                      , wxZRColaFrame::OnSendSource                 )
+    EVT_MENU           (wxID_SEND_ABORT                                       , wxZRColaFrame::OnSendAbort                  )
 
-    EVT_MENU           (wxID_SETTINGS                              , wxZRColaFrame::OnSettings                   )
+    EVT_MENU           (wxID_COMPOSITION_NONE                                 , wxZRColaFrame::OnCompositionNone            )
+    EVT_MENU           (wxID_COMPOSITION_ZRCOLA                               , wxZRColaFrame::OnCompositionZRCola          )
+    EVT_MENU           (wxID_COMPOSITION_UNICODE                              , wxZRColaFrame::OnCompositionUnicode         )
+    EVT_MENU           (wxID_WARN_PUA                                         , wxZRColaFrame::OnWarnPUA                    )
+    EVT_MENU_RANGE     (wxID_TRANSLATION_SEQ_DEFAULT, wxID_TRANSLATION_SEQ_END, wxZRColaFrame::OnTranslationSeqMenu         )
 
-    EVT_UPDATE_UI      (wxID_TOOLBAR_EDIT                          , wxZRColaFrame::OnToolbarEditUpdate          )
-    EVT_MENU           (wxID_TOOLBAR_EDIT                          , wxZRColaFrame::OnToolbarEdit                )
-    EVT_UPDATE_UI      (wxID_TOOLBAR_COMPOSE                       , wxZRColaFrame::OnToolbarComposeUpdate       )
-    EVT_MENU           (wxID_TOOLBAR_COMPOSE                       , wxZRColaFrame::OnToolbarCompose             )
-    EVT_UPDATE_UI      (wxID_PANEL_CHRGRPS                         , wxZRColaFrame::OnPanelCharacterCatalogUpdate)
-    EVT_MENU           (wxID_PANEL_CHRGRPS                         , wxZRColaFrame::OnPanelCharacterCatalog      )
-    EVT_MENU           (wxID_FOCUS_CHARACTER_CATALOG               , wxZRColaFrame::OnPanelCharacterCatalogFocus )
+    EVT_MENU           (wxID_SETTINGS                                         , wxZRColaFrame::OnSettings                   )
 
-    EVT_MENU           (wxID_HELP_INSTRUCTIONS                     , wxZRColaFrame::OnHelpInstructions           )
-    EVT_MENU           (wxID_HELP_SHORTCUTS                        , wxZRColaFrame::OnHelpShortcuts              )
+    EVT_UPDATE_UI      (wxID_TOOLBAR_EDIT                                     , wxZRColaFrame::OnToolbarEditUpdate          )
+    EVT_MENU           (wxID_TOOLBAR_EDIT                                     , wxZRColaFrame::OnToolbarEdit                )
+    EVT_UPDATE_UI      (wxID_TOOLBAR_TRANSLATE                                , wxZRColaFrame::OnToolbarTranslateUpdate     )
+    EVT_MENU           (wxID_TOOLBAR_TRANSLATE                                , wxZRColaFrame::OnToolbarTranslate           )
+    EVT_UPDATE_UI      (wxID_PANEL_CHRGRPS                                    , wxZRColaFrame::OnPanelCharacterCatalogUpdate)
+    EVT_MENU           (wxID_PANEL_CHRGRPS                                    , wxZRColaFrame::OnPanelCharacterCatalog      )
+    EVT_MENU           (wxID_FOCUS_CHARACTER_CATALOG                          , wxZRColaFrame::OnPanelCharacterCatalogFocus )
 
-    EVT_MENU           (wxID_HELP_REQCHAR                          , wxZRColaFrame::OnHelpReqChar                )
-    EVT_MENU           (wxID_HELP_UPDATE                           , wxZRColaFrame::OnHelpUpdate                 )
-    EVT_MENU           (wxID_ABOUT                                 , wxZRColaFrame::OnHelpAbout                  )
+    EVT_MENU           (wxID_HELP_INSTRUCTIONS                                , wxZRColaFrame::OnHelpInstructions           )
+    EVT_MENU           (wxID_HELP_SHORTCUTS                                   , wxZRColaFrame::OnHelpShortcuts              )
+
+    EVT_MENU           (wxID_HELP_REQCHAR                                     , wxZRColaFrame::OnHelpReqChar                )
+    EVT_MENU           (wxID_HELP_UPDATE                                      , wxZRColaFrame::OnHelpUpdate                 )
+    EVT_MENU           (wxID_ABOUT                                            , wxZRColaFrame::OnHelpAbout                  )
 wxEND_EVENT_TABLE()
 
 
+const int wxZRColaFrame::s_guiLevel = 1;
+
+
 wxZRColaFrame::wxZRColaFrame() :
     m_hWndSource(NULL),
+    m_wasIconised(false),
     m_chrSelect(NULL),
     m_settings(NULL),
     m_chrReq(NULL),
+    m_composition(true),
+    m_composition_id(ZRCOLA_TRANSETID_DEFAULT),
+    m_warnPUA(false),
+    m_transeq_id(ZRCOLA_TRANSEQID_DEFAULT),
+    m_transeq(NULL),
     wxZRColaFrameBase(NULL)
 {
+    // Populate list of translation sequences.
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    m_toolTranslationSeq->Clear();
     {
-        // wxFrameBuilder 3.5 does not support wxAUI_TB_HORIZONTAL flag. Add it manually.
-        wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarCompose);
-        paneInfo.LeftDockable(false);
-        paneInfo.RightDockable(false);
-        m_toolbarCompose->SetWindowStyleFlag(m_toolbarCompose->GetWindowStyleFlag() | wxAUI_TB_HORIZONTAL);
+        wxString name_tran(_("No Translation"));
+        m_menuTranslationSeq->AppendRadioItem(wxID_TRANSLATION_SEQ_DEFAULT, name_tran);
+        m_toolTranslationSeq->Append(name_tran, reinterpret_cast<void*>(ZRCOLA_TRANSEQID_DEFAULT));
+    }
+    for (size_t i = 0, n = app->m_tsq_db.idxRank.size(); ; i++) {
+        if (i < n) {
+            const ZRCola::transeq_db::transeq &ts = app->m_tsq_db.idxRank[i];
+            wxString
+                name(ts.name(), ts.name_len()),
+                name_tran(wxGetTranslation(name, wxT("ZRCola-zrcdb")));
+            m_menuTranslationSeq->AppendRadioItem((int)(wxID_TRANSLATION_SEQ_START + i), name_tran);
+            m_toolTranslationSeq->Append(name_tran, reinterpret_cast<void*>(ts.seq));
+        } else {
+            wxString name_tran(_("Custom Translation..."));
+            m_menuTranslationSeq->AppendRadioItem((int)(wxID_TRANSLATION_SEQ_START + i), name_tran);
+            m_toolTranslationSeq->Append(name_tran, reinterpret_cast<void*>(ZRCOLA_TRANSEQID_CUSTOM));
+            break;
+        }
     }
 
     // Load main window icons.
@@ -92,31 +112,38 @@ wxZRColaFrame::wxZRColaFrame() :
     } else {
         // Taskbar icon creation failed. Not the end of the world. No taskbar icon then.
         delete m_taskBarIcon;
+        m_taskBarIcon = NULL;
     }
 
+    wxPersistenceManager &persist_mgr = wxPersistenceManager::Get();
+
     m_settings = new wxZRColaSettings(this);
-    wxPersistentRegisterAndRestore<wxZRColaSettings>(m_settings);
+    persist_mgr.RegisterAndRestore(m_settings, new wxPersistentZRColaSettings(m_settings));
+
+    m_transeq = new wxZRColaTranslationSeq(this);
+    persist_mgr.RegisterAndRestore(m_transeq, new wxPersistentZRColaTranslationSeq(m_transeq));
 
     m_chrSelect = new wxZRColaCharSelect(this);
-    wxPersistentRegisterAndRestore<wxZRColaCharSelect>(m_chrSelect);
+    persist_mgr.RegisterAndRestore(m_chrSelect, new wxPersistentZRColaCharSelect(m_chrSelect));
 
     m_chrReq = new wxZRColaCharRequest(this);
-    wxPersistentRegisterAndRestore<wxZRColaCharRequest>(m_chrReq);
+    persist_mgr.RegisterAndRestore(m_chrReq, new wxPersistentZRColaCharRequest(m_chrReq));
 
     // Set focus.
-    m_panel->m_decomposed->SetFocus();
+    m_panel->m_source->SetFocus();
 
 #if defined(__WXMSW__)
     // Register notification sink for language detection.
     m_ulRefCount = 1;
     m_tfSource = NULL;
+    m_dwCookie = MAXDWORD;
     ITfInputProcessorProfiles *pProfiles;
     HRESULT hr = CoCreateInstance(CLSID_TF_InputProcessorProfiles, NULL, CLSCTX_INPROC_SERVER, IID_ITfInputProcessorProfiles, (LPVOID*)&pProfiles);
     if(SUCCEEDED(hr)) {
         hr = pProfiles->QueryInterface(IID_ITfSource, (LPVOID*)&m_tfSource);
         if(SUCCEEDED(hr)) {
             hr = m_tfSource->AdviseSink(IID_ITfLanguageProfileNotifySink, (ITfLanguageProfileNotifySink*)this, &m_dwCookie);
-            if (FAILED(hr) || m_dwCookie == -1) {
+            if (FAILED(hr) || m_dwCookie == MAXDWORD) {
                 m_tfSource->Release();
                 m_tfSource = NULL;
             }
@@ -133,13 +160,54 @@ wxZRColaFrame::wxZRColaFrame() :
         SetAcceleratorTable(wxAcceleratorTable(_countof(entries), entries));
     }
 
-    // Restore persistent state of wxAuiManager manually, since m_mgr is not on the heap.
-    wxPersistentAuiManager(&m_mgr).Restore();
+    int guiLevel;
+    if (wxConfigBase::Get()->Read(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel) {
+        // Restore persistent state of wxAuiManager manually, since m_mgr is not a standalone heap object
+        // and cannot be registered for persistence.
+        wxPersistentAuiManager(&m_mgr).Restore();
+    }
+    persist_mgr.RegisterAndRestore(this, new wxPersistentZRColaFrame(this));
+
+    // Update (de)composition selection.
+    if (m_composition && m_composition_id == ZRCOLA_TRANSETID_DEFAULT) {
+        m_menuItemCompositionZRCola->Check(true);
+        m_toolComposition->Select(1);
+    } else if (m_composition && m_composition_id == ZRCOLA_TRANSETID_UNICODE) {
+        m_menuItemCompositionUnicode->Check(true);
+        m_toolComposition->Select(2);
+    } else {
+        m_menuItemCompositionNone->Check(true);
+        m_toolComposition->Select(0);
+    }
+
+    if (m_warnPUA) {
+        m_menuItemWarnPUA->Check(true);
+        m_toolWarnPUA->SetState(m_toolWarnPUA->GetState() | wxAUI_BUTTON_STATE_CHECKED);
+    } else {
+        m_menuItemWarnPUA->Check(false);
+        m_toolWarnPUA->SetState(m_toolWarnPUA->GetState() & ~wxAUI_BUTTON_STATE_CHECKED);
+    }
+
+    // Update translation sequence selection.
+    for (unsigned int i = 0, n = m_toolTranslationSeq->GetCount(); ; i++) {
+        if (i < n) {
+            if (static_cast<ZRCola::transeqid_t>((size_t)m_toolTranslationSeq->GetClientData(i)) == m_transeq_id) {
+                m_menuTranslationSeq->Check(wxID_TRANSLATION_SEQ_DEFAULT + i, true);
+                m_toolTranslationSeq->SetSelection(i);
+                break;
+            }
+        } else {
+            m_transeq_id = ZRCOLA_TRANSEQID_DEFAULT;
+            m_menuTranslationSeq->Check(wxID_TRANSLATION_SEQ_DEFAULT, true);
+            m_toolTranslationSeq->SetSelection(0);
+            break;
+        }
+    }
 
     // Register global hotkey(s).
-    if (!RegisterHotKey(wxZRColaHKID_INVOKE_COMPOSE, wxMOD_WIN, VK_F5))
+    if (!RegisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE, wxMOD_WIN, VK_F5))
         wxMessageBox(_("ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
-    if (!RegisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE, wxMOD_WIN, VK_F6))
+    if (!RegisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE_INV, wxMOD_WIN, VK_F6))
         wxMessageBox(_("ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
 }
 
@@ -147,8 +215,14 @@ wxZRColaFrame::wxZRColaFrame() :
 wxZRColaFrame::~wxZRColaFrame()
 {
     // Unregister global hotkey(s).
-    UnregisterHotKey(wxZRColaHKID_INVOKE_DECOMPOSE);
-    UnregisterHotKey(wxZRColaHKID_INVOKE_COMPOSE);
+    UnregisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE_INV);
+    UnregisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE    );
+
+    // Save wxAuiManager's state before destructor is finished.
+    // m_mgr is not a standalone heap object and is bound to wxZRColaFrame, which is being destroyed.
+    wxConfigBase::Get()->Write(wxT("guiLevel"), s_guiLevel);
+    wxPersistentAuiManager(&m_mgr).Save();
+    wxPersistenceManager::Get().SaveAndUnregister(this);
 
 #if defined(__WXMSW__)
     if (m_tfSource) {
@@ -164,16 +238,6 @@ wxZRColaFrame::~wxZRColaFrame()
 }
 
 
-void wxZRColaFrame::OnClose(wxCloseEvent& event)
-{
-    event.Skip();
-
-    // Save wxAuiManager's state before destructor.
-    // Since the destructor calls m_mgr.UnInit() the regular persistence mechanism is useless to save wxAuiManager's state.
-    wxPersistentAuiManager(&m_mgr).Save();
-}
-
-
 void wxZRColaFrame::OnExit(wxCommandEvent& event)
 {
     Close();
@@ -200,12 +264,15 @@ void wxZRColaFrame::OnForwardEvent(wxCommandEvent& event)
 }
 
 
+void wxZRColaFrame::OnInsertCharacterUpdate(wxUpdateUIEvent& event)
+{
+    event.Check(m_chrSelect->IsVisible());
+}
+
+
 void wxZRColaFrame::OnInsertCharacter(wxCommandEvent& event)
 {
-    if (m_chrSelect->ShowModal() == wxID_OK && m_chrSelect->m_char) {
-        m_panel->m_decomposed->WriteText(m_chrSelect->m_char);
-        m_panel->m_decomposed->SetFocus();
-    }
+    m_chrSelect->Show(!m_chrSelect->IsVisible());
 }
 
 
@@ -215,19 +282,37 @@ void wxZRColaFrame::OnSendUpdate(wxUpdateUIEvent& event)
 }
 
 
-void wxZRColaFrame::OnSendComposed(wxCommandEvent& event)
+void wxZRColaFrame::OnSendDestination(wxCommandEvent& event)
 {
     if (m_hWndSource)
-        DoSend(m_panel->m_composed->GetValue());
+        DoSend(m_panel->m_destination->GetValue());
 
     event.Skip();
 }
 
 
-void wxZRColaFrame::OnSendDecomposed(wxCommandEvent& event)
+void wxZRColaFrame::OnCopyDestinationAndReturn(wxCommandEvent& event)
 {
     if (m_hWndSource)
-        DoSend(m_panel->m_decomposed->GetValue());
+        DoCopyAndReturn(m_panel->m_destination->GetValue());
+
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnSendSource(wxCommandEvent& event)
+{
+    if (m_hWndSource)
+        DoSend(m_panel->m_source->GetValue());
+
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnCopySourceAndReturn(wxCommandEvent& event)
+{
+    if (m_hWndSource)
+        DoCopyAndReturn(m_panel->m_source->GetValue());
 
     event.Skip();
 }
@@ -237,14 +322,67 @@ void wxZRColaFrame::OnSendAbort(wxCommandEvent& event)
 {
     if (m_hWndSource) {
         // Return focus to the source window.
+        if (m_wasIconised) Iconize();
         ::SetActiveWindow(m_hWndSource);
         ::SetForegroundWindow(m_hWndSource);
         m_hWndSource = NULL;
     }
 
     // Select all input in composer to prepare for the overwrite next time.
-    m_panel->m_decomposed->SelectAll();
-    m_panel->m_composed->SelectAll();
+    m_panel->m_source     ->SelectAll();
+    m_panel->m_destination->SelectAll();
+
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnCompositionNone(wxCommandEvent& event)
+{
+    DoSetComposition(false, ZRCOLA_TRANSETID_DEFAULT);
+    m_toolbarTranslate->Refresh();
+
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnCompositionZRCola(wxCommandEvent& event)
+{
+    DoSetComposition(true, ZRCOLA_TRANSETID_DEFAULT);
+    m_toolbarTranslate->Refresh();
+
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnCompositionUnicode(wxCommandEvent& event)
+{
+    DoSetComposition(true, ZRCOLA_TRANSETID_UNICODE);
+    m_toolbarTranslate->Refresh();
+
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnCompositionChoice(wxCommandEvent& event)
+{
+    switch (event.GetSelection()) {
+    case 0: DoSetComposition(false, ZRCOLA_TRANSETID_DEFAULT); break;
+    case 1: DoSetComposition(true, ZRCOLA_TRANSETID_DEFAULT); break;
+    case 2: DoSetComposition(true, ZRCOLA_TRANSETID_UNICODE); break;
+    }
+}
+
+
+void wxZRColaFrame::OnWarnPUA(wxCommandEvent& event)
+{
+    m_warnPUA = !m_warnPUA;
+    m_menuItemWarnPUA->Check(m_warnPUA);
+    m_toolWarnPUA->SetState((m_toolWarnPUA->GetState() & ~wxAUI_BUTTON_STATE_CHECKED) | (m_warnPUA ? wxAUI_BUTTON_STATE_CHECKED : 0));
+    m_toolbarTranslate->Refresh();
+
+    // Notify destination text something changed and should re-paint.
+    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+    m_panel->m_destination->ProcessWindowEvent(event2);
 
     event.Skip();
 }
@@ -266,8 +404,8 @@ void wxZRColaFrame::OnIdle(wxIdleEvent& event)
 
 void wxZRColaFrame::OnTaskbarIconClick(wxTaskBarIconEvent& event)
 {
-    Iconize(false);
     Show(true);
+    Iconize(false);
     Raise();
 
     event.Skip();
@@ -297,20 +435,45 @@ void wxZRColaFrame::OnToolbarEdit(wxCommandEvent& event)
 }
 
 
-void wxZRColaFrame::OnToolbarComposeUpdate(wxUpdateUIEvent& event)
+void wxZRColaFrame::OnToolbarTranslateUpdate(wxUpdateUIEvent& event)
 {
-    event.Check(m_mgr.GetPane(m_toolbarCompose).IsShown());
+    event.Check(m_mgr.GetPane(m_toolbarTranslate).IsShown());
 }
 
 
-void wxZRColaFrame::OnToolbarCompose(wxCommandEvent& event)
+void wxZRColaFrame::OnToolbarTranslate(wxCommandEvent& event)
 {
-    wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarCompose);
+    wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarTranslate);
     paneInfo.Show(!paneInfo.IsShown());
     m_mgr.Update();
 }
 
 
+void wxZRColaFrame::OnTranslationSeqMenu(wxCommandEvent& event)
+{
+    int idx = event.GetId() - wxID_TRANSLATION_SEQ_DEFAULT;
+    ZRCola::transeqid_t transeq_id = static_cast<ZRCola::transeqid_t>((size_t)m_toolTranslationSeq->GetClientData(idx));
+
+    DoSetTranslationSeq(idx, transeq_id);
+
+    m_toolTranslationSeq->Select(idx);
+}
+
+
+void wxZRColaFrame::OnTranslationSeqChoice(wxCommandEvent& event)
+{
+    int idx = event.GetSelection();
+    ZRCola::transeqid_t transeq_id = static_cast<ZRCola::transeqid_t>((size_t)event.GetClientData());
+
+    DoSetTranslationSeq(idx, transeq_id);
+
+    if (m_transeq_id == ZRCOLA_TRANSEQID_DEFAULT)
+        m_menuTranslationSeq->Check(wxID_TRANSLATION_SEQ_DEFAULT, true);
+    else
+        m_menuTranslationSeq->Check(wxID_TRANSLATION_SEQ_DEFAULT + idx, true);
+}
+
+
 void wxZRColaFrame::OnPanelCharacterCatalogUpdate(wxUpdateUIEvent& event)
 {
     event.Check(m_mgr.GetPane(m_panelChrCat).IsShown());
@@ -349,10 +512,11 @@ void wxZRColaFrame::OnHelpShortcuts(wxCommandEvent& event)
 
 #ifdef __WXMSW__
     // Search and try to launch installed PDF.
+    #pragma warning(suppress: 26812) // INSTALLSTATE is unscoped.
     INSTALLSTATE pdf_is = ::MsiGetComponentPath(_T(PRODUCT_VERSION_GUID), _T("{68AC2C38-10E2-41A3-B92C-844C03FFDF6A}"), pdf_path);
     if ((pdf_is == INSTALLSTATE_LOCAL || pdf_is == INSTALLSTATE_SOURCE) &&
         wxFileExists(pdf_path) &&
-        (int)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return;
+        (intptr_t)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return;
 #endif
 
     // Search and try to launch local PDF copy.
@@ -360,7 +524,7 @@ void wxZRColaFrame::OnHelpShortcuts(wxCommandEvent& event)
     pdf_path  = app->GetDatabasePath();
     pdf_path += _T("ZRCola_keyboard.pdf");
     if (wxFileExists(pdf_path) &&
-        (int)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return;
+        (intptr_t)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return;
 
     // When everything else fail, try the online version.
     wxLaunchDefaultBrowser(_("http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"));
@@ -450,10 +614,10 @@ void wxZRColaFrame::DoSend(const wxString& str)
 {
     // Prepare the INPUT table.
     wxString::size_type n = str.length();
-    auto i_str = str.begin();
+    wxString::const_iterator i_str = str.begin();
     std::vector<INPUT> input;
     input.reserve(n*2);
-    for (std::vector<INPUT>::size_type i = 0; i < n; i++, i_str++) {
+    for (std::vector<INPUT>::size_type i = 0; i < n; i++, ++i_str) {
         wxString::char_type c = *i_str;
 
         // Add key down event.
@@ -468,15 +632,88 @@ void wxZRColaFrame::DoSend(const wxString& str)
     }
 
     // Return focus to the source window and send the input.
+    if (m_wasIconised) Iconize();
     ::SetActiveWindow(m_hWndSource);
     ::SetForegroundWindow(m_hWndSource);
     ::Sleep(200);
-    ::SendInput(input.size(), input.data(), sizeof(INPUT));
+    ::SendInput((UINT)input.size(), input.data(), sizeof(INPUT));
     m_hWndSource = NULL;
 
-    // Select all input in composer and decomposed to prepare for the overwrite next time.
-    m_panel->m_decomposed->SelectAll();
-    m_panel->m_composed->SelectAll();
+    // Select all input in source and destination to prepare for the overwrite next time.
+    m_panel->m_source     ->SelectAll();
+    m_panel->m_destination->SelectAll();
+}
+
+
+void wxZRColaFrame::DoCopyAndReturn(const wxString& str)
+{
+    if (wxTheClipboard->Open()) {
+        wxTheClipboard->SetData(new wxTextDataObject(str));
+        wxTheClipboard->Close();
+    }
+
+    // Return focus to the source window.
+    if (m_wasIconised) Iconize();
+    ::SetActiveWindow(m_hWndSource);
+    ::SetForegroundWindow(m_hWndSource);
+    m_hWndSource = NULL;
+
+    // Select all input in composer and source to prepare for the overwrite next time.
+    m_panel->m_source->SelectAll();
+    m_panel->m_destination->SelectAll();
+}
+
+
+void wxZRColaFrame::DoSetComposition(bool enable, ZRCola::transetid_t transet_id)
+{
+    if (enable && transet_id == ZRCOLA_TRANSETID_DEFAULT) {
+        m_composition = true;
+        m_composition_id = ZRCOLA_TRANSETID_DEFAULT;
+        m_menuItemCompositionZRCola->Check(true);
+        m_toolComposition->Select(1);
+    } else if (enable && transet_id == ZRCOLA_TRANSETID_UNICODE) {
+        m_composition = true;
+        m_composition_id = ZRCOLA_TRANSETID_UNICODE;
+        m_menuItemCompositionUnicode->Check(true);
+        m_toolComposition->Select(2);
+    } else {
+        m_composition = false;
+        m_menuItemCompositionNone->Check(true);
+        m_toolComposition->Select(0);
+    }
+
+    // Notify source text something changed and should re-translate.
+    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+    m_panel->m_source->ProcessWindowEvent(event2);
+}
+
+
+void wxZRColaFrame::DoSetTranslationSeq(int idx, ZRCola::transeqid_t transeq_id)
+{
+    if (transeq_id == ZRCOLA_TRANSEQID_CUSTOM) {
+        // Prompt user to modify translation.
+        if (m_transeq->ShowModal() != wxID_OK)
+            return;
+
+        if (m_transeq->m_transeq.empty()) {
+            // User submitted an empty translation. Revert to "No Translation" case.
+            m_transeq_id = ZRCOLA_TRANSEQID_DEFAULT;
+            m_menuTranslationSeq->Check(wxID_TRANSLATION_SEQ_DEFAULT, true);
+            m_toolTranslationSeq->SetSelection(0);
+        } else {
+            m_transeq_id = ZRCOLA_TRANSEQID_CUSTOM;
+            m_menuTranslationSeq->Check(wxID_TRANSLATION_SEQ_DEFAULT + idx, true);
+        }
+    } else if (m_transeq_id != transeq_id) {
+        // User choose a new translation sequence.
+        m_transeq_id = transeq_id;
+        m_menuTranslationSeq->Check(wxID_TRANSLATION_SEQ_DEFAULT + idx, true);
+    } else
+        return;
+
+    // Notify source text something changed and should re-translate.
+    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+    m_panel->m_source->ProcessWindowEvent(event2);
 }
 
 
@@ -489,8 +726,8 @@ WXLRESULT wxZRColaFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM
         WXHWND hWndSource = ::GetForegroundWindow();
 
         switch (wParam) {
-        case wxZRColaHKID_INVOKE_COMPOSE  : m_panel->m_decomposed->SetFocus(); break;
-        case wxZRColaHKID_INVOKE_DECOMPOSE: m_panel->m_composed  ->SetFocus(); break;
+        case wxZRColaHKID_INVOKE_TRANSLATE: m_panel->m_source->SetFocus(); break;
+        case wxZRColaHKID_INVOKE_TRANSLATE_INV: m_panel->m_destination->SetFocus(); break;
         default:
             wxFAIL_MSG(wxT("not our registered shortcut"));
             return wxZRColaFrameBase::MSWWindowProc(message, wParam, lParam);
@@ -502,12 +739,13 @@ WXLRESULT wxZRColaFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM
         }
 
         m_hWndSource = hWndSource;
+        m_wasIconised = IsIconized();
 
         //if (m_state == wxABS_FLOAT) {
-            if (IsIconized())
-                ::SendMessage(m_hWnd, WM_SYSCOMMAND, SC_RESTORE, 0);
-            ::SetActiveWindow(m_hWnd);
-            ::SetForegroundWindow(m_hWnd);
+        Show(true);
+        Iconize(false);
+        Raise();
+        ::SetActiveWindow(m_hWnd);
         //} else if (wxAppBarIsDocked(m_state)) {
         //    // ZRCola window is currently docked.
 
@@ -522,7 +760,8 @@ WXLRESULT wxZRColaFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM
         //    wxFAIL_MSG(wxT("unsupported application bar state"));
 
         return 0;
-    } else
+    }
+    else
         return wxZRColaFrameBase::MSWWindowProc(message, wParam, lParam);
 }
 
@@ -533,17 +772,26 @@ WXLRESULT wxZRColaFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM
 // wxPersistentZRColaFrame
 //////////////////////////////////////////////////////////////////////////
 
-wxPersistentZRColaFrame::wxPersistentZRColaFrame(wxZRColaFrame *wnd) : wxPersistentTLW(wnd)
+const int wxPersistentZRColaFrame::s_guiLevel = 1;
+
+
+wxPersistentZRColaFrame::wxPersistentZRColaFrame(wxZRColaFrame *wnd) : wxPersistentTLWEx(wnd)
 {
 }
 
 
 void wxPersistentZRColaFrame::Save() const
 {
-    wxPersistentTLW::Save();
+    SaveValue(wxT("guiLevel"), s_guiLevel);
+    wxPersistentTLWEx::Save();
 
     auto wnd = static_cast<const wxZRColaFrame*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
+    SaveValue(wxT("composition"), wnd->m_composition);
+    SaveValue(wxT("compositionId"), static_cast<int>(wnd->m_composition_id));
+    SaveValue(wxT("warnPUA"), wnd->m_warnPUA);
+    SaveValue(wxT("transeqId"), static_cast<int>(wnd->m_transeq_id));
+
     wxPersistentZRColaComposerPanel(wnd->m_panel).Save();
     wxPersistentZRColaCharacterCatalogPanel(wnd->m_panelChrCat).Save();
 }
@@ -556,5 +804,22 @@ bool wxPersistentZRColaFrame::Restore()
     wxPersistentZRColaCharacterCatalogPanel(wnd->m_panelChrCat).Restore();
     wxPersistentZRColaComposerPanel(wnd->m_panel).Restore();
 
-    return wxPersistentTLW::Restore();
+    int num;
+    if (RestoreValue(wxT("transeqId"), &num))
+        wnd->m_transeq_id = (ZRCola::transeqid_t)num;
+
+    bool b;
+    if (RestoreValue(wxT("composition"), &b))
+        wnd->m_composition = b;
+    else
+        wnd->m_composition = wnd->m_transeq_id == ZRCOLA_TRANSEQID_DEFAULT;
+    if (RestoreValue(wxT("compositionId"), &num))
+        wnd->m_composition_id = (ZRCola::transetid_t)num;
+    if (RestoreValue(wxT("warnPUA"), &b))
+        wnd->m_warnPUA = b;
+    else
+        wnd->m_warnPUA = false;
+
+    int guiLevel;
+    return RestoreValue(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel ? wxPersistentTLWEx::Restore() : true;
 }

ZRCola/zrcolafrm.h

@@ -1,37 +1,33 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
 /// Forward declarations
 ///
 class wxZRColaFrame;
+class wxPersistentZRColaFrame;
 
 
 #pragma once
 
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include "zrcolagui.h"
+#pragma warning(pop)
 #include "zrcolachrslct.h"
 #include "zrcolachrreq.h"
 #include "zrcolasettings.h"
+#include "zrcolatranseq.h"
 #include <zrcola/language.h>
+#include <zrcola/translate.h>
+#include <wxex/persist/toplevel.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/taskbar.h>
-#include <wx/persist/toplevel.h>
+#pragma warning(pop)
 #if defined(__WXMSW__)
 #include <msctf.h>
 #endif
@@ -40,8 +36,8 @@ class wxZRColaFrame;
 ///
 /// Global hotkey message identifiers
 ///
-#define wxZRColaHKID_INVOKE_COMPOSE     0
-#define wxZRColaHKID_INVOKE_DECOMPOSE   1
+#define wxZRColaHKID_INVOKE_TRANSLATE       0
+#define wxZRColaHKID_INVOKE_TRANSLATE_INV   1
 
 
 ///
@@ -57,6 +53,9 @@ public:
     enum
     {
         wxID_FOCUS_CHARACTER_CATALOG = 2000,
+        wxID_TRANSLATION_SEQ_DEFAULT = 2001,
+        wxID_TRANSLATION_SEQ_START   = 2002,
+        wxID_TRANSLATION_SEQ_END     = 2100,
     };
 
     wxZRColaFrame();
@@ -66,23 +65,32 @@ public:
     friend class wxZRColaComposerPanel;
 
 protected:
-    virtual void OnClose(wxCloseEvent& event);
     void OnExit(wxCommandEvent& event);
     void OnForwardEventUpdate(wxUpdateUIEvent& event);
     void OnForwardEvent(wxCommandEvent& event);
+    void OnInsertCharacterUpdate(wxUpdateUIEvent& event);
     void OnInsertCharacter(wxCommandEvent& event);
     void OnSendUpdate(wxUpdateUIEvent& event);
-    void OnSendComposed(wxCommandEvent& event);
-    void OnSendDecomposed(wxCommandEvent& event);
+    void OnSendDestination(wxCommandEvent& event);
+    void OnCopyDestinationAndReturn(wxCommandEvent& event);
+    void OnSendSource(wxCommandEvent& event);
+    void OnCopySourceAndReturn(wxCommandEvent& event);
     void OnSendAbort(wxCommandEvent& event);
+    void OnCompositionNone(wxCommandEvent& event);
+    void OnCompositionZRCola(wxCommandEvent& event);
+    void OnCompositionUnicode(wxCommandEvent& event);
+    virtual void OnCompositionChoice(wxCommandEvent& event);
+    void OnWarnPUA(wxCommandEvent& event);
     void OnSettings(wxCommandEvent& event);
     virtual void OnIdle(wxIdleEvent& event);
     void OnTaskbarIconClick(wxTaskBarIconEvent& event);
     virtual void OnIconize(wxIconizeEvent& event);
     void OnToolbarEditUpdate(wxUpdateUIEvent& event);
     void OnToolbarEdit(wxCommandEvent& event);
-    void OnToolbarComposeUpdate(wxUpdateUIEvent& event);
-    void OnToolbarCompose(wxCommandEvent& event);
+    void OnToolbarTranslateUpdate(wxUpdateUIEvent& event);
+    void OnToolbarTranslate(wxCommandEvent& event);
+    void OnTranslationSeqMenu(wxCommandEvent& event);
+    virtual void OnTranslationSeqChoice(wxCommandEvent& event);
     void OnPanelCharacterCatalogUpdate(wxUpdateUIEvent& event);
     void OnPanelCharacterCatalog(wxCommandEvent& event);
     void OnPanelCharacterCatalogFocus(wxCommandEvent& event);
@@ -111,6 +119,9 @@ protected:
 
 private:
     void DoSend(const wxString& str);
+    void DoCopyAndReturn(const wxString& str);
+    void DoSetComposition(bool enable, ZRCola::transetid_t transet_id);
+    void DoSetTranslationSeq(int idx, ZRCola::transeqid_t transeq_id);
 
 protected:
 #ifdef __WXMSW__
@@ -118,24 +129,36 @@ protected:
 #endif
 
 protected:
-    WXHWND m_hWndSource;                ///< Handle of the active window, when the ZRCola hotkey was pressed
-    wxTaskBarIcon *m_taskBarIcon;       ///< Taskbar icon
-    wxZRColaCharSelect *m_chrSelect;    ///< Character selection dialog
-    wxZRColaCharRequest *m_chrReq;      ///< Request a New Character dialog
-    wxZRColaSettings *m_settings;       ///< Configuration dialog
+    static const int s_guiLevel;        ///< Persisted placements/sizing are considered incompatible between different GUI levels
+
+protected:
+    WXHWND m_hWndSource;                    ///< Handle of the active window, when the ZRCola hotkey was pressed
+    bool m_wasIconised;                     ///< Was the ZRCola window iconized, when the ZRCola hotkey was pressed
+    wxTaskBarIcon *m_taskBarIcon;           ///< Taskbar icon
+    wxZRColaCharSelect *m_chrSelect;        ///< Character selection dialog
+    wxZRColaCharRequest *m_chrReq;          ///< Request a New Character dialog
+    wxZRColaSettings *m_settings;           ///< Configuration dialog
+    bool m_composition;                     ///< Is (de)composition enabled?
+    ZRCola::transetid_t m_composition_id;   ///< Which (de)composition is enabled
+    bool m_warnPUA;                         ///< Mark Private-Use-Area characters in destination text
+    ZRCola::transeqid_t m_transeq_id;       ///< Translation sequence ID
+    wxZRColaTranslationSeq *m_transeq;      ///< Custom translation sequence dialog
 };
 
 
 ///
 /// Supports saving/restoring wxZRColaFrame GUI state
 ///
-class wxPersistentZRColaFrame : public wxPersistentTLW
+class wxPersistentZRColaFrame : public wxPersistentTLWEx
 {
 public:
     wxPersistentZRColaFrame(wxZRColaFrame *wnd);
 
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 

ZRCola/zrcolagui.h

@@ -1,368 +1,430 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __ZRCOLAGUI_H__
-#define __ZRCOLAGUI_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/cshelp.h>
-#include <wx/intl.h>
-class wxZRColaCharGrid;
-
-#include <wx/string.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/menu.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/aui/aui.h>
-#include <wx/aui/auibar.h>
-class wxZRColaCharacterCatalogPanel;
-class wxZRColaComposerPanel;
-#include <wx/statusbr.h>
-#include <wx/frame.h>
-#include <wx/textctrl.h>
-#include <wx/sizer.h>
-#include <wx/statbox.h>
-#include <wx/panel.h>
-#include <wx/splitter.h>
-#include <wx/timer.h>
-#include <wx/choice.h>
-#include <wx/grid.h>
-#include <wx/checkbox.h>
-#include <wx/srchctrl.h>
-#include <wx/hyperlink.h>
-#include <wx/checklst.h>
-#include <wx/stattext.h>
-#include <wx/button.h>
-#include <wx/dialog.h>
-#include <wx/radiobut.h>
-#include <wx/listbox.h>
-#include <wx/listbook.h>
-#include <wx/listctrl.h>
-#include <wx/statbmp.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxZRColaFrameBase
-///////////////////////////////////////////////////////////////////////////////
-class wxZRColaFrameBase : public wxFrame 
-{
-	private:
-	
-	protected:
-		enum
-		{
-			wxID_CHARACTER_SELECTOR = 1000,
-			wxID_SEND_COMPOSED,
-			wxID_SEND_DECOMPOSED,
-			wxID_SEND_ABORT,
-			wxID_SETTINGS,
-			wxID_TOOLBAR_EDIT,
-			wxID_TOOLBAR_COMPOSE,
-			wxID_PANEL_CHRGRPS,
-			wxID_HELP_INSTRUCTIONS,
-			wxID_HELP_SHORTCUTS,
-			wxID_HELP_REQCHAR,
-			wxID_HELP_UPDATE
-		};
-		
-		wxMenuBar* m_menubar;
-		wxMenu* m_menuProgram;
-		wxMenu* m_menuEdit;
-		wxMenu* m_menuView;
-		wxMenu* m_menuHelp;
-		wxAuiToolBar* m_toolbarEdit;
-		wxAuiToolBarItem* m_toolEditCut; 
-		wxAuiToolBarItem* m_toolEditCopy; 
-		wxAuiToolBarItem* m_toolEditPaste; 
-		wxAuiToolBar* m_toolbarCompose;
-		wxAuiToolBarItem* m_toolCharSelect; 
-		wxAuiToolBarItem* m_toolSendComposed; 
-		wxAuiToolBarItem* m_toolSendDecomposed; 
-		wxZRColaCharacterCatalogPanel* m_panelChrCat;
-		wxStatusBar* m_statusBar;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
-		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxZRColaComposerPanel* m_panel;
-		
-		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") );
-		wxAuiManager m_mgr;
-		
-		~wxZRColaFrameBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxZRColaComposerPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxZRColaComposerPanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		enum
-		{
-			wxID_TIMER_SAVE = 1000
-		};
-		
-		wxSplitterWindow* m_splitterDecomposed;
-		wxPanel* m_panelDecomposedEdit;
-		wxPanel* m_panelDecomposedHex;
-		wxTextCtrl* m_decomposedHex;
-		wxSplitterWindow* m_splitterComposed;
-		wxPanel* m_panelComposedEdit;
-		wxPanel* m_panelComposedHex;
-		wxTextCtrl* m_composedHex;
-		wxTimer m_timerSave;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnDecomposedPaint( wxPaintEvent& event ) { event.Skip(); }
-		virtual void OnDecomposedText( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDecomposedHexPaint( wxPaintEvent& event ) { event.Skip(); }
-		virtual void OnComposedPaint( wxPaintEvent& event ) { event.Skip(); }
-		virtual void OnComposedText( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnComposedHexPaint( wxPaintEvent& event ) { event.Skip(); }
-		virtual void OnSaveTimer( wxTimerEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxTextCtrl* m_decomposed;
-		wxTextCtrl* m_composed;
-		
-		wxZRColaComposerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaComposerPanel") ); 
-		~wxZRColaComposerPanelBase();
-		
-		void m_splitterDecomposedOnIdle( wxIdleEvent& )
-		{
-			m_splitterDecomposed->SetSashPosition( -5 );
-			m_splitterDecomposed->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterDecomposedOnIdle ), NULL, this );
-		}
-		
-		void m_splitterComposedOnIdle( wxIdleEvent& )
-		{
-			m_splitterComposed->SetSashPosition( -5 );
-			m_splitterComposed->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterComposedOnIdle ), NULL, this );
-		}
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxZRColaCharacterCatalogPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxZRColaCharacterCatalogPanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		wxChoice* m_choice;
-		wxZRColaCharGrid* m_grid;
-		wxCheckBox* m_show_all;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnChoice( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnGridClick( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnGridKeyDown( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnShowAll( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxZRColaCharacterCatalogPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaCharacterCatalog") ); 
-		~wxZRColaCharacterCatalogPanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxZRColaCharSelectBase
-///////////////////////////////////////////////////////////////////////////////
-class wxZRColaCharSelectBase : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxSearchCtrl* m_search;
-		wxHyperlinkCtrl* m_search_more;
-		wxPanel* m_search_panel;
-		wxCheckListBox* m_categories;
-		wxHyperlinkCtrl* m_categoriesAll;
-		wxHyperlinkCtrl* m_categoriesNone;
-		wxHyperlinkCtrl* m_categoriesInvert;
-		wxZRColaCharGrid* m_gridResults;
-		wxZRColaCharGrid* m_gridRecent;
-		wxStaticText* m_labelUnicode;
-		wxTextCtrl* m_unicode;
-		wxTextCtrl* m_shortcut;
-		wxGrid* m_gridPreview;
-		wxTextCtrl* m_description;
-		wxTextCtrl* m_tags;
-		wxTextCtrl* m_category;
-		wxHyperlinkCtrl* m_navigateBack;
-		wxHyperlinkCtrl* m_navigateForward;
-		wxZRColaCharGrid* m_gridRelated;
-		wxStdDialogButtonSizer* m_sdbSizerButtons;
-		wxButton* m_sdbSizerButtonsOK;
-		wxButton* m_sdbSizerButtonsCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
-		virtual void OnSearchText( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSearchMore( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnCategoriesToggle( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCategoriesAll( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnCategoriesNone( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnCategoriesInvert( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnResultCellDClick( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnResultSelectCell( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnResultsKeyDown( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnRecentCellDClick( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnRecentSelectCell( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnRecentKeyDown( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnUnicodeText( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPreviewKeyDown( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnNavigateBack( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnNavigateForward( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnRelatedSelectCell( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Character Search"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharSelect") ); 
-		~wxZRColaCharSelectBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxZRColaSettingsBase
-///////////////////////////////////////////////////////////////////////////////
-class wxZRColaSettingsBase : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxListbook* m_listbook;
-		wxPanel* m_panelLanguage;
-		wxStaticText* m_langLabel;
-		wxRadioButton* m_langAuto;
-		wxRadioButton* m_langManual;
-		wxListBox* m_languages;
-		wxPanel* m_panelAutoStart;
-		wxStaticText* m_autoStartLabel;
-		wxCheckBox* m_autoStart;
-		wxStdDialogButtonSizer* m_sdbSizerButtons;
-		wxButton* m_sdbSizerButtonsOK;
-		wxButton* m_sdbSizerButtonsApply;
-		wxButton* m_sdbSizerButtonsCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
-		virtual void OnLangAuto( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLangManual( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnApplyButtonClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxZRColaSettingsBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaSettings") ); 
-		~wxZRColaSettingsBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxZRColaAboutBase
-///////////////////////////////////////////////////////////////////////////////
-class wxZRColaAboutBase : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapIcon;
-		wxStaticText* m_staticTextZRCola;
-		wxStaticText* m_staticTextVersion;
-		wxStaticText* m_staticTextColophone;
-		wxStaticText* m_staticTextCopyright;
-		wxHyperlinkCtrl* m_hyperlink;
-		wxStaticText* m_staticTextDeclaration;
-		wxTextCtrl* m_declaration;
-		wxStdDialogButtonSizer* m_sdbSizerButtons;
-		wxButton* m_sdbSizerButtonsOK;
-	
-	public:
-		
-		wxZRColaAboutBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaAbout") ); 
-		~wxZRColaAboutBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxZRColaUpdaterBase
-///////////////////////////////////////////////////////////////////////////////
-class wxZRColaUpdaterBase : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxTextCtrl* m_log;
-		wxButton* m_buttonUpdate;
-		wxButton* m_buttonClose;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
-		virtual void OnUpdate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Product Update"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaUpdater") ); 
-		~wxZRColaUpdaterBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxZRColaCharRequestBase
-///////////////////////////////////////////////////////////////////////////////
-class wxZRColaCharRequestBase : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxStaticText* m_characterLbl;
-		wxTextCtrl* m_character;
-		wxStaticText* m_characterNote;
-		wxStaticText* m_contextLbl;
-		wxTextCtrl* m_context;
-		wxStaticText* m_note;
-		wxStdDialogButtonSizer* m_sdbSizerButtons;
-		wxButton* m_sdbSizerButtonsOK;
-		wxButton* m_sdbSizerButtonsCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Request a New Character"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharRequest") ); 
-		~wxZRColaCharRequestBase();
-	
-};
-
-#endif //__ZRCOLAGUI_H__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO *NOT* EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/cshelp.h>
+#include <wx/intl.h>
+class wxZRColaCharGrid;
+
+#include <wx/string.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/menu.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/aui/aui.h>
+#include <wx/aui/auibar.h>
+#include <wx/choice.h>
+class wxZRColaCharacterCatalogPanel;
+class wxZRColaComposerPanel;
+#include <wx/statusbr.h>
+#include <wx/frame.h>
+#include <wx/textctrl.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/panel.h>
+#include <wx/splitter.h>
+#include <wx/timer.h>
+#include <wx/grid.h>
+#include <wx/checkbox.h>
+#include <wx/srchctrl.h>
+#include <wx/hyperlink.h>
+#include <wx/checklst.h>
+#include <wx/stattext.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+#include <wx/radiobut.h>
+#include <wx/listbox.h>
+#include <wx/listbook.h>
+#include <wx/listctrl.h>
+#include <wx/statbmp.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaFrameBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaFrameBase : public wxFrame
+{
+	private:
+
+	protected:
+		enum
+		{
+			wxID_CHARACTER_SELECTOR = 6000,
+			wxID_SEND_DESTINATION,
+			wxID_COPY_DESTINATION_AND_RETURN,
+			wxID_SEND_SOURCE,
+			wxID_COPY_SOURCE_AND_RETURN,
+			wxID_SEND_ABORT,
+			wxID_COMPOSITION_NONE,
+			wxID_COMPOSITION_ZRCOLA,
+			wxID_COMPOSITION_UNICODE,
+			wxID_WARN_PUA,
+			wxID_SETTINGS,
+			wxID_TOOLBAR_EDIT,
+			wxID_TOOLBAR_TRANSLATE,
+			wxID_PANEL_CHRGRPS,
+			wxID_HELP_INSTRUCTIONS,
+			wxID_HELP_SHORTCUTS,
+			wxID_HELP_REQCHAR,
+			wxID_HELP_UPDATE,
+		};
+
+		wxMenuBar* m_menubar;
+		wxMenu* m_menuProgram;
+		wxMenu* m_menuEdit;
+		wxMenuItem* m_menuItemCompositionNone;
+		wxMenuItem* m_menuItemCompositionZRCola;
+		wxMenuItem* m_menuItemCompositionUnicode;
+		wxMenu* m_menuTranslationSeq;
+		wxMenuItem* m_menuItemWarnPUA;
+		wxMenu* m_menuView;
+		wxMenu* m_menuHelp;
+		wxAuiToolBar* m_toolbarEdit;
+		wxAuiToolBarItem* m_toolEditCut;
+		wxAuiToolBarItem* m_toolEditCopy;
+		wxAuiToolBarItem* m_toolEditPaste;
+		wxAuiToolBar* m_toolbarTranslate;
+		wxAuiToolBarItem* m_toolCharSelect;
+		wxAuiToolBarItem* m_toolSendDestination;
+		wxAuiToolBarItem* m_toolSendSource;
+		wxChoice* m_toolComposition;
+		wxChoice* m_toolTranslationSeq;
+		wxAuiToolBarItem* m_toolWarnPUA;
+		wxZRColaCharacterCatalogPanel* m_panelChrCat;
+		wxStatusBar* m_statusBar;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
+		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnCompositionChoice( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+		wxZRColaComposerPanel* m_panel;
+
+		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") );
+		wxAuiManager m_mgr;
+
+		~wxZRColaFrameBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaComposerPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaComposerPanelBase : public wxPanel
+{
+	private:
+
+	protected:
+		enum
+		{
+			wxID_TIMER_SAVE = 6000,
+		};
+
+		wxSplitterWindow* m_splitterSource;
+		wxPanel* m_panelSourceEdit;
+		wxPanel* m_panelSourceHex;
+		wxTextCtrl* m_sourceHex;
+		wxSplitterWindow* m_splitterDestination;
+		wxPanel* m_panelDestinationEdit;
+		wxPanel* m_panelDestinationHex;
+		wxTextCtrl* m_destinationHex;
+		wxTimer m_timerSave;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnSourcePaint( wxPaintEvent& event ) { event.Skip(); }
+		virtual void OnSourceText( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSourceHexPaint( wxPaintEvent& event ) { event.Skip(); }
+		virtual void OnDestinationPaint( wxPaintEvent& event ) { event.Skip(); }
+		virtual void OnDestinationText( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDestinationHexPaint( wxPaintEvent& event ) { event.Skip(); }
+		virtual void OnSaveTimer( wxTimerEvent& event ) { event.Skip(); }
+
+
+	public:
+		wxTextCtrl* m_source;
+		wxTextCtrl* m_destination;
+
+		wxZRColaComposerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaComposerPanel") );
+
+		~wxZRColaComposerPanelBase();
+
+		void m_splitterSourceOnIdle( wxIdleEvent& )
+		{
+			m_splitterSource->SetSashPosition( FromDIP(-5) );
+			m_splitterSource->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterSourceOnIdle ), NULL, this );
+		}
+
+		void m_splitterDestinationOnIdle( wxIdleEvent& )
+		{
+			m_splitterDestination->SetSashPosition( FromDIP(-5) );
+			m_splitterDestination->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterDestinationOnIdle ), NULL, this );
+		}
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaCharacterCatalogPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaCharacterCatalogPanelBase : public wxPanel
+{
+	private:
+
+	protected:
+		wxChoice* m_choice;
+		wxZRColaCharGrid* m_grid;
+		wxCheckBox* m_show_all;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnChoice( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnGridClick( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnGridKeyDown( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnShowAll( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaCharacterCatalogPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaCharacterCatalog") );
+
+		~wxZRColaCharacterCatalogPanelBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaCharSelectBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaCharSelectBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxSearchCtrl* m_search;
+		wxHyperlinkCtrl* m_search_more;
+		wxPanel* m_search_panel;
+		wxCheckListBox* m_blocks;
+		wxHyperlinkCtrl* m_blocksAll;
+		wxHyperlinkCtrl* m_blocksNone;
+		wxHyperlinkCtrl* m_blocksInvert;
+		wxZRColaCharGrid* m_gridResults;
+		wxZRColaCharGrid* m_gridRecent;
+		wxStaticText* m_labelUnicode;
+		wxTextCtrl* m_unicode;
+		wxTextCtrl* m_shortcut;
+		wxGrid* m_gridPreview;
+		wxTextCtrl* m_description;
+		wxTextCtrl* m_tags;
+		wxTextCtrl* m_block;
+		wxHyperlinkCtrl* m_navigateBack;
+		wxHyperlinkCtrl* m_navigateForward;
+		wxZRColaCharGrid* m_gridRelated;
+		wxButton* m_buttonInsert;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnSearchText( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSearchMore( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnBlocksToggle( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnBlocksAll( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnBlocksNone( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnBlocksInvert( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnResultCellDClick( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnResultSelectCell( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnResultsKeyDown( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnRecentCellDClick( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnRecentSelectCell( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnRecentKeyDown( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnUnicodeText( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPreviewKeyDown( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnNavigateBack( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnNavigateForward( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnRelatedSelectCell( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnInsert( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInsertUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Character Search"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharSelect") );
+
+		~wxZRColaCharSelectBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaSettingsBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaSettingsBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxListbook* m_listbook;
+		wxPanel* m_panelLanguage;
+		wxStaticText* m_langLabel;
+		wxRadioButton* m_langAuto;
+		wxRadioButton* m_langManual;
+		wxListBox* m_languages;
+		wxPanel* m_panelAutoStart;
+		wxStaticText* m_autoStartLabel;
+		wxCheckBox* m_autoStart;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+		wxButton* m_sdbSizerButtonsApply;
+		wxButton* m_sdbSizerButtonsCancel;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		virtual void OnLanguageUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void OnApplyButtonClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaSettingsBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaSettings") );
+
+		~wxZRColaSettingsBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaAboutBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaAboutBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapIcon;
+		wxStaticText* m_staticTextZRCola;
+		wxStaticText* m_staticTextVersion;
+		wxStaticText* m_staticTextColophone;
+		wxStaticText* m_staticTextCopyright;
+		wxHyperlinkCtrl* m_hyperlink;
+		wxStaticText* m_staticTextDeclaration;
+		wxTextCtrl* m_declaration;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+
+	public:
+
+		wxZRColaAboutBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaAbout") );
+
+		~wxZRColaAboutBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaUpdaterBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaUpdaterBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxTextCtrl* m_log;
+		wxButton* m_buttonUpdate;
+		wxButton* m_buttonClose;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnUpdate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnClose( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Product Update"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaUpdater") );
+
+		~wxZRColaUpdaterBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaCharRequestBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaCharRequestBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxStaticText* m_characterLbl;
+		wxTextCtrl* m_character;
+		wxStaticText* m_characterNote;
+		wxStaticText* m_contextLbl;
+		wxTextCtrl* m_context;
+		wxStaticText* m_note;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+		wxButton* m_sdbSizerButtonsCancel;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Request a New Character"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharRequest") );
+
+		~wxZRColaCharRequestBase();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaTranslationSeqBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaTranslationSeqBase : public wxDialog
+{
+	private:
+
+	protected:
+		wxStaticText* m_transLbl;
+		wxStaticText* m_availableLbl;
+		wxListBox* m_available;
+		wxButton* m_add;
+		wxButton* m_remove;
+		wxStaticText* m_selectedLbl;
+		wxListBox* m_selected;
+		wxButton* m_selectedUp;
+		wxButton* m_selectedDown;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+		wxButton* m_sdbSizerButtonsCancel;
+
+		// Virtual event handlers, override them in your derived class
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		virtual void OnUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void OnAvailableChar( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnAvailableDClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAdd( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRemove( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectedChar( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnSelectedDClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectedUp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectedDown( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		wxZRColaTranslationSeqBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Custom Translation Sequence"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaTranslationSeq") );
+
+		~wxZRColaTranslationSeqBase();
+
+};
+

ZRCola/zrcolakeyhndlr.cpp

@@ -1,23 +1,9 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -47,7 +33,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
             if (!chr) {
                 int key = e.GetKeyCode();
                 if (WXK_NUMPAD0 <= key && key <= WXK_NUMPAD9)
-                    chr = '0' + (key - WXK_NUMPAD0);
+                    chr = '0' + (wxChar)(key - WXK_NUMPAD0);
             }
             wxFrame *pFrame = wxDynamicCast(dynamic_cast<ZRColaApp*>(wxTheApp)->m_mainWnd, wxFrame);
             if (('0' <= chr && chr <= '9' || 'A' <= chr && chr <= 'F') && m_insert_seq.size() < 4) {
@@ -81,14 +67,14 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
             {
                 // Parse key event and save it at the end of the key sequence.
                 ZRCola::keyseq_db::keyseq::key_t key;
-                key.key = e.GetRawKeyCode();
+                key.key = (wchar_t)e.GetRawKeyCode();
 #if defined(__WXMSW__)
                 // Translate from local keyboard to scan code.
-                key.key = ::MapVirtualKey(key.key, MAPVK_VK_TO_VSC);
+                key.key = static_cast<wchar_t>(::MapVirtualKey(key.key, MAPVK_VK_TO_VSC) & 0xffff);
 
                 // Translate from scan code to U.S. Keyboard.
                 static const HKL s_hkl = ::LoadKeyboardLayout(_T("00000409"), 0);
-                key.key = ::MapVirtualKeyEx(key.key, MAPVK_VSC_TO_VK, s_hkl);
+                key.key = static_cast<wchar_t>(::MapVirtualKeyEx(key.key, MAPVK_VSC_TO_VK, s_hkl) & 0xffff);
 #endif
                 key.modifiers =
                     (e.ShiftDown()   ? ZRCola::keyseq_db::keyseq::SHIFT : 0) |
@@ -96,13 +82,9 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
                     (e.AltDown()     ? ZRCola::keyseq_db::keyseq::ALT   : 0);
                 m_seq.push_back(key);
 
-                auto n = m_seq.size();
-                ZRCola::keyseq_db::keyseq *ks = (ZRCola::keyseq_db::keyseq*)new char[sizeof(ZRCola::keyseq_db::keyseq) + sizeof(ZRCola::keyseq_db::keyseq::key_t)*n];
-                ks->chr = 0;
-                ks->seq_len = n;
-                memcpy(ks->seq, m_seq.data(), sizeof(ZRCola::keyseq_db::keyseq::key_t)*n);
+                std::unique_ptr<ZRCola::keyseq_db::keyseq> ks((ZRCola::keyseq_db::keyseq*)new char[sizeof(ZRCola::keyseq_db::keyseq) + sizeof(ZRCola::keyseq_db::keyseq::key_t)*m_seq.size()]);
+                ks->ZRCola::keyseq_db::keyseq::keyseq(m_seq.data(), m_seq.size());
                 found = app->m_ks_db.idxKey.find(*ks, start);
-                delete ks;
             }
 
             if (found) {
@@ -116,14 +98,14 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
                 wxObject *obj = event.GetEventObject();
                 if (obj && obj->IsKindOf(wxCLASSINFO(wxTextCtrl))) {
                     // Push text to source control.
-                    ((wxTextCtrl*)obj)->WriteText(ks.chr);
+                    ((wxTextCtrl*)obj)->WriteText(wxString(ks.chr(), ks.chr_len()));
 
                     // Event is fully processed now.
                     event.StopPropagation();
                     return true;
                 }
             } else if (start < app->m_ks_db.idxKey.size() &&
-                ZRCola::keyseq_db::keyseq::CompareSequence(m_seq.data(), m_seq.size(), app->m_ks_db.idxKey[start].seq, std::min<unsigned __int16>(app->m_ks_db.idxKey[start].seq_len, m_seq.size())) == 0)
+                ZRCola::keyseq_db::keyseq::CompareSequence(m_seq.data(), m_seq.size(), app->m_ks_db.idxKey[start].seq(), std::min<size_t>(app->m_ks_db.idxKey[start].seq_len(), m_seq.size())) == 0)
             {
                 // The sequence is a partial match. Continue watching.
                 if (pFrame && pFrame->GetStatusBar())
@@ -151,7 +133,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
             if (count) {
                 // Zero terminate sequence and parse the Unicode value.
                 m_insert_seq.push_back(0);
-                wchar_t chr = strtoul(m_insert_seq.data(), NULL, 16);
+                wchar_t chr = (wchar_t)strtoul(m_insert_seq.data(), NULL, 16);
 
                 if (chr) {
                     wxObject *obj = event.GetEventObject();

ZRCola/zrcolakeyhndlr.h

@@ -1,20 +1,6 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
@@ -27,7 +13,11 @@ class wxZRColaKeyHandler;
 
 #include <zrcolaui/keyboard.h>
 
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/event.h>
+#pragma warning(pop)
 #include <vector>
 
 

ZRCola/zrcolasettings.cpp

@@ -1,189 +1,171 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "stdafx.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// wxZRColaSettings
-//////////////////////////////////////////////////////////////////////////
-
-wxZRColaSettings::wxZRColaSettings(wxWindow* parent) :
-    m_lang_auto(true),
-    m_lang(ZRCola::langid_t::blank),
-    wxZRColaSettingsBase(parent)
-{
-    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    m_languages->Clear();
-    for (size_t i = 0, n = app->m_lang_db.idxLng.size(); i < n; i++) {
-        const auto &lang = app->m_lang_db.idxLng[i];
-        wxString
-            label(lang.name, lang.name_len),
-            label_tran(wxGetTranslation(label, wxT("ZRCola-zrcdb")));
-        m_languages->Insert(label_tran, i);
-    }
-}
-
-
-void wxZRColaSettings::OnInitDialog(wxInitDialogEvent& event)
-{
-    event.Skip();
-
-    // Set state of auto-start according to Startup folder shortcut presence.
-#if defined(__WXMSW__)
-    wxString linkName(wxExpandEnvVars("%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\\ZRCola.lnk"));
-    m_autoStart->SetValue(wxFileExists(linkName));
-#else
-    m_autoStart->SetValue(false);
-    m_panelAutoStart->Enable(false);
-#endif
-
-    m_languages->Enable(!m_lang_auto);
-    (m_lang_auto ? m_langAuto : m_langManual)->SetValue(true);
-
-    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    char l[sizeof(ZRCola::language_db::language)] = {};
-    ((ZRCola::language_db::language*)l)->id = m_lang;
-    ZRCola::language_db::indexLang::size_type start;
-    m_languages->Select(app->m_lang_db.idxLng.find(*(ZRCola::language_db::language*)l, start) ? start : -1);
-}
-
-
-void wxZRColaSettings::OnLangAuto(wxCommandEvent& event)
-{
-    m_languages->Enable(!event.IsChecked());
-}
-
-
-void wxZRColaSettings::OnLangManual(wxCommandEvent& event)
-{
-    m_languages->Enable(event.IsChecked());
-}
-
-
-void wxZRColaSettings::OnApplyButtonClick(wxCommandEvent& event)
-{
-    event.Skip();
-
-#if defined(__WXMSW__)
-    wxString linkName(wxExpandEnvVars("%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\\ZRCola.lnk"));
-    if (m_autoStart->IsChecked()) {
-        // Create the shortcut.
-        IShellLink *sl;
-        HRESULT hr = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID*)&sl);
-        if (SUCCEEDED(hr)) {
-            // Setup ZRCola shortcut.
-            sl->SetPath(wxTheApp->argv[0]);
-            sl->SetDescription(_("Start ZRCola automatically on logon"));
-            sl->SetShowCmd(SW_SHOWMINNOACTIVE);
-
-            // Query IShellLink for the IPersistFile interface, used for saving the
-            // shortcut in persistent storage.
-            IPersistFile *pf;
-            hr = sl->QueryInterface(IID_IPersistFile, (LPVOID*)&pf);
-            if (SUCCEEDED(hr)) {
-                // Save the link by calling IPersistFile::Save.
-                hr = pf->Save(linkName, TRUE);
-                pf->Release();
-            }
-
-            sl->Release();
-        }
-    } else if (wxFileExists(linkName)) {
-        // The shortcut already exists. Remove it.
-        wxRemoveFile(linkName);
-    }
-#endif
-
-    if (m_langAuto->GetValue()) {
-        m_lang_auto = true;
-#if defined(__WXMSW__)
-        // Set update keyboard language.
-        HKL hkl = ::GetKeyboardLayout(0);
-        ZRCola::LangConvert(LOWORD(hkl), m_lang);
-#endif
-    } else {
-        m_lang_auto = false;
-
-        auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-        const auto &lang = app->m_lang_db.idxLng[m_languages->GetSelection()];
-
-        if (m_lang != lang.id) {
-            m_lang = lang.id;
-
-            // Notify composed text something changed and should re-decompose.
-            wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
-            app->m_mainWnd->m_panel->m_composed->ProcessWindowEvent(event2);
-        }
-    }
-}
-
-
-
-void wxZRColaSettings::OnOKButtonClick(wxCommandEvent& event)
-{
-    wxZRColaSettings::OnApplyButtonClick(event);
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// wxPersistentZRColaSettings
-//////////////////////////////////////////////////////////////////////////
-
-wxPersistentZRColaSettings::wxPersistentZRColaSettings(wxZRColaSettings *wnd) : wxPersistentDialog(wnd)
-{
-}
-
-
-void wxPersistentZRColaSettings::Save() const
-{
-    wxPersistentDialog::Save();
-
-    auto wnd = static_cast<const wxZRColaSettings*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
-
-    SaveValue(wxT("langAuto"), wnd->m_lang_auto);
-    SaveValue(wxT("lang"    ), wxString::FromAscii(wnd->m_lang.data, _countof(wnd->m_lang.data)));
-}
-
-
-bool wxPersistentZRColaSettings::Restore()
-{
-    auto wnd = dynamic_cast<wxZRColaSettings*>(GetWindow());
-    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    wxString lang;
-
-    // Restore automatic language detection setting first.
-    RestoreValue(wxT("langAuto"), &(wnd->m_lang_auto));
-    if (wnd->m_lang_auto) {
-#if defined(__WXMSW__)
-        // Set keyboard language.
-        HKL hkl = ::GetKeyboardLayout(0);
-        ZRCola::LangConvert(LOWORD(hkl), wnd->m_lang);
-#endif
-    } else if (RestoreValue(wxT("lang"), &lang) && lang.Length() == 3) {
-        // The language was read from configuration.
-        wnd->m_lang = lang.c_str();
-    } else if (!app->m_lang_db.idxLng.empty()) {
-        const auto &lang = app->m_lang_db.idxLng[0];
-        wnd->m_lang = lang.id;
-    } else
-        wnd->m_lang = ZRCola::langid_t::blank;
-
-    return wxPersistentDialog::Restore();
-}
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+*/
+
+#include "pch.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+// wxZRColaSettings
+//////////////////////////////////////////////////////////////////////////
+
+wxZRColaSettings::wxZRColaSettings(wxWindow* parent) :
+    m_lang_auto(true),
+    wxZRColaSettingsBase(parent)
+{
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    m_languages->Clear();
+    for (size_t i = 0, n = app->m_lang_db.idxLang.size(); i < n; i++) {
+        const auto &lang = app->m_lang_db.idxLang[i];
+        wxString
+            label(lang.name(), lang.name_len()),
+            label_tran(wxGetTranslation(label, wxT("ZRCola-zrcdb")));
+        m_languages->Insert(label_tran, (unsigned int)i);
+    }
+}
+
+
+void wxZRColaSettings::OnInitDialog(wxInitDialogEvent& event)
+{
+    event.Skip();
+
+    // Set state of auto-start according to Startup folder shortcut presence.
+#if defined(__WXMSW__)
+    wxString linkName(wxExpandEnvVars("%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\\ZRCola.lnk"));
+    m_autoStart->SetValue(wxFileExists(linkName));
+#else
+    m_autoStart->SetValue(false);
+    m_panelAutoStart->Enable(false);
+#endif
+
+    m_languages->Enable(!m_lang_auto);
+    (m_lang_auto ? m_langAuto : m_langManual)->SetValue(true);
+
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    ZRCola::language_db::indexLang::size_type start;
+    m_languages->Select(app->m_lang_db.idxLang.find(ZRCola::language_db::language(m_lang), start) ? (int)start : -1);
+}
+
+
+void wxZRColaSettings::OnLanguageUpdate(wxUpdateUIEvent& event)
+{
+    m_languages->Enable(m_langManual->GetValue());
+
+    wxZRColaSettingsBase::OnLanguageUpdate(event);
+}
+
+
+void wxZRColaSettings::OnApplyButtonClick(wxCommandEvent& event)
+{
+    event.Skip();
+
+#if defined(__WXMSW__)
+    wxString linkName(wxExpandEnvVars("%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\\ZRCola.lnk"));
+    if (m_autoStart->IsChecked()) {
+        // Create the shortcut.
+        IShellLink *sl;
+        HRESULT hr = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID*)&sl);
+        if (SUCCEEDED(hr)) {
+            // Setup ZRCola shortcut.
+            sl->SetPath(wxTheApp->argv[0]);
+            sl->SetDescription(_("Start ZRCola automatically on logon"));
+            sl->SetShowCmd(SW_SHOWMINNOACTIVE);
+
+            // Query IShellLink for the IPersistFile interface, used for saving the
+            // shortcut in persistent storage.
+            IPersistFile *pf;
+            hr = sl->QueryInterface(IID_IPersistFile, (LPVOID*)&pf);
+            if (SUCCEEDED(hr)) {
+                // Save the link by calling IPersistFile::Save.
+                hr = pf->Save(linkName, TRUE);
+                pf->Release();
+            }
+
+            sl->Release();
+        }
+    } else if (wxFileExists(linkName)) {
+        // The shortcut already exists. Remove it.
+        wxRemoveFile(linkName);
+    }
+#endif
+
+    if (m_langAuto->GetValue()) {
+        m_lang_auto = true;
+#if defined(__WXMSW__)
+        // Set update keyboard language.
+        HKL hkl = ::GetKeyboardLayout(0);
+        ZRCola::LangConvert(LOWORD(hkl), m_lang);
+#endif
+    } else {
+        m_lang_auto = false;
+
+        auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+        const auto &lang = app->m_lang_db.idxLang[m_languages->GetSelection()];
+
+        if (m_lang != lang.lang) {
+            m_lang = lang.lang;
+
+            // Notify destination text something changed and should re-inverse translate.
+            wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+            app->m_mainWnd->m_panel->m_destination->ProcessWindowEvent(event2);
+        }
+    }
+}
+
+
+void wxZRColaSettings::OnOKButtonClick(wxCommandEvent& event)
+{
+    wxZRColaSettings::OnApplyButtonClick(event);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// wxPersistentZRColaSettings
+//////////////////////////////////////////////////////////////////////////
+
+const int wxPersistentZRColaSettings::s_guiLevel = 1;
+
+
+wxPersistentZRColaSettings::wxPersistentZRColaSettings(wxZRColaSettings *wnd) : wxPersistentTLWEx(wnd)
+{
+}
+
+
+void wxPersistentZRColaSettings::Save() const
+{
+    SaveValue(wxT("guiLevel"), s_guiLevel);
+    wxPersistentTLWEx::Save();
+
+    auto wnd = static_cast<const wxZRColaSettings*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
+
+    SaveValue(wxT("langAuto"), wnd->m_lang_auto);
+    SaveValue(wxT("lang"    ), wxString::FromAscii(wnd->m_lang.data, _countof(wnd->m_lang.data)));
+}
+
+
+bool wxPersistentZRColaSettings::Restore()
+{
+    auto wnd = dynamic_cast<wxZRColaSettings*>(GetWindow());
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    wxString lang;
+
+    // Restore automatic language detection setting first.
+    RestoreValue(wxT("langAuto"), &(wnd->m_lang_auto));
+    if (wnd->m_lang_auto) {
+#if defined(__WXMSW__)
+        // Set keyboard language.
+        HKL hkl = ::GetKeyboardLayout(0);
+        ZRCola::LangConvert(LOWORD(hkl), wnd->m_lang);
+#endif
+    } else if (RestoreValue(wxT("lang"), &lang) && lang.Length() == 3) {
+        // The language was read from configuration.
+        wnd->m_lang = lang.c_str();
+    } else if (!app->m_lang_db.idxLang.empty()) {
+        wnd->m_lang = app->m_lang_db.idxLang[0].lang;
+    } else
+        wnd->m_lang = ZRCola::langid_t();
+
+    int guiLevel;
+    return RestoreValue(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel ? wxPersistentTLWEx::Restore() : true;
+}

ZRCola/zrcolasettings.h

@@ -1,20 +1,6 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
@@ -26,8 +12,13 @@ class wxPersistentZRColaSettings;
 
 #pragma once
 
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include "zrcolagui.h"
-#include <wxex/persist/dialog.h>
+#pragma warning(pop)
+#include <wxex/persist/toplevel.h>
+#include <vector>
 
 
 ///
@@ -42,27 +33,29 @@ public:
 
 protected:
     virtual void OnInitDialog(wxInitDialogEvent& event);
-    virtual void OnLangAuto(wxCommandEvent& event);
-    virtual void OnLangManual(wxCommandEvent& event);
+    virtual void OnLanguageUpdate(wxUpdateUIEvent& event);
     virtual void OnApplyButtonClick(wxCommandEvent& event);
     virtual void OnOKButtonClick(wxCommandEvent& event);
 
 public:
-    bool m_lang_auto;           ///< Is language for decomposing resolved using currently selected keyboard
-    ZRCola::langid_t m_lang;    ///< Language for decomposing
+    bool m_lang_auto;           ///< Is language for inverse translation resolved using currently selected keyboard
+    ZRCola::langid_t m_lang;    ///< Language for inverse translation
 };
 
 
 ///
 /// Supports saving/restoring wxZRColaSettings state
 ///
-class wxPersistentZRColaSettings : public wxPersistentDialog
+class wxPersistentZRColaSettings : public wxPersistentTLWEx
 {
 public:
     wxPersistentZRColaSettings(wxZRColaSettings *wnd);
 
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 

ZRCola/zrcolatranseq.cpp

@@ -0,0 +1,244 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+*/
+
+#include "pch.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+// wxZRColaTranslationSeq
+//////////////////////////////////////////////////////////////////////////
+
+wxZRColaTranslationSeq::wxZRColaTranslationSeq(wxWindow* parent) :
+    wxZRColaTranslationSeqBase(parent)
+{
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    m_available->Clear();
+    for (size_t i = 0, n = app->m_ts_db.idxTranSet.size(); i < n; i++) {
+        const ZRCola::transet_db::transet &ts = app->m_ts_db.idxTranSet[i];
+        wxString
+            src(ts.src(), ts.src_len()),
+            dst(ts.dst(), ts.dst_len()),
+            src_tran(wxGetTranslation(src, wxT("ZRCola-zrcdb"))),
+            dst_tran(wxGetTranslation(dst, wxT("ZRCola-zrcdb"))),
+            label_tran(wxString::Format(wxT("%s \x00bb %s"), src_tran.c_str(), dst_tran.c_str()));
+        m_available->Append(label_tran, (void*)ts.set);
+    }
+}
+
+
+void wxZRColaTranslationSeq::OnInitDialog(wxInitDialogEvent& event)
+{
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    m_selected->Clear();
+    for (auto s = m_transeq.cbegin(), s_end = m_transeq.cend(); s != s_end; ++s) {
+        ZRCola::transet_db::indexTranSet::size_type start;
+        if (app->m_ts_db.idxTranSet.find(ZRCola::transet_db::transet(*s), start)) {
+            const ZRCola::transet_db::transet &ts = app->m_ts_db.idxTranSet[start];
+            wxString
+                src(ts.src(), ts.src_len()),
+                dst(ts.dst(), ts.dst_len()),
+                src_tran(wxGetTranslation(src, wxT("ZRCola-zrcdb"))),
+                dst_tran(wxGetTranslation(dst, wxT("ZRCola-zrcdb"))),
+                label_tran(wxString::Format(wxT("%s \x00bb %s"), src_tran.c_str(), dst_tran.c_str()));
+            m_selected->Append(label_tran, (void*)ts.set);
+        } else {
+            wxString label_tran(wxString::Format(_("Unknown translation (%u)"), (unsigned int)*s));
+            m_selected->Append(label_tran, (void*)*s);
+        }
+    }
+
+    wxZRColaTranslationSeqBase::OnInitDialog(event);
+}
+
+
+void wxZRColaTranslationSeq::OnUpdate(wxUpdateUIEvent& event)
+{
+    m_add->Enable(m_available->GetSelection() != wxNOT_FOUND);
+
+    int idx = m_selected->GetSelection();
+    m_remove      ->Enable(idx != wxNOT_FOUND);
+    m_selectedUp  ->Enable(idx != wxNOT_FOUND && (unsigned int)idx > 0);
+    m_selectedDown->Enable(idx != wxNOT_FOUND && (unsigned int)idx < m_selected->GetCount() - 1);
+
+    wxZRColaTranslationSeqBase::OnUpdate(event);
+}
+
+
+void wxZRColaTranslationSeq::OnAvailableChar(wxKeyEvent& event)
+{
+    if (event.GetRawKeyCode() == VK_INSERT) {
+        int idx = m_available->GetSelection();
+        if (idx != wxNOT_FOUND) {
+            m_selected->Append(
+                m_available->GetString(idx),
+                m_available->GetClientData(idx));
+        }
+    }
+
+    wxZRColaTranslationSeqBase::OnAvailableChar(event);
+}
+
+
+void wxZRColaTranslationSeq::OnAvailableDClick(wxCommandEvent& event)
+{
+    int idx = m_available->GetSelection();
+    if (idx != wxNOT_FOUND) {
+        m_selected->Append(
+            m_available->GetString(idx),
+            m_available->GetClientData(idx));
+    }
+
+    wxZRColaTranslationSeqBase::OnAvailableDClick(event);
+}
+
+
+void wxZRColaTranslationSeq::OnAdd(wxCommandEvent& event)
+{
+    int idx = m_available->GetSelection();
+    wxASSERT_MSG(idx != wxNOT_FOUND, wxT("no available translation selected"));
+    m_selected->Append(
+        m_available->GetString(idx),
+        m_available->GetClientData(idx));
+
+    wxZRColaTranslationSeqBase::OnAdd(event);
+}
+
+
+void wxZRColaTranslationSeq::OnRemove(wxCommandEvent& event)
+{
+    int idx = m_selected->GetSelection();
+    wxASSERT_MSG(idx != wxNOT_FOUND, wxT("no active translation selected"));
+    m_selected->Delete(idx);
+
+    wxZRColaTranslationSeqBase::OnRemove(event);
+}
+
+
+void wxZRColaTranslationSeq::OnSelectedChar(wxKeyEvent& event)
+{
+    if (event.GetRawKeyCode() == VK_DELETE) {
+        int idx = m_selected->GetSelection();
+        if (idx != wxNOT_FOUND)
+            m_selected->Delete(idx);
+    }
+
+    wxZRColaTranslationSeqBase::OnSelectedChar(event);
+}
+
+
+void wxZRColaTranslationSeq::OnSelectedDClick(wxCommandEvent& event)
+{
+    int idx = m_selected->GetSelection();
+    if (idx != wxNOT_FOUND)
+        m_selected->Delete(idx);
+
+    wxZRColaTranslationSeqBase::OnSelectedDClick(event);
+}
+
+
+void wxZRColaTranslationSeq::OnSelectedUp(wxCommandEvent& event)
+{
+    int idx = m_selected->GetSelection();
+    wxASSERT_MSG(idx != wxNOT_FOUND && (unsigned int)idx > 0, wxT("no or first active translation selected"));
+    wxString label = m_selected->GetString(idx);
+    void *data = m_selected->GetClientData(idx);
+    m_selected->Delete(idx);
+    m_selected->Insert(label, idx - 1, data);
+    m_selected->Select(idx - 1);
+
+    wxZRColaTranslationSeqBase::OnSelectedUp(event);
+}
+
+
+void wxZRColaTranslationSeq::OnSelectedDown(wxCommandEvent& event)
+{
+    int idx = m_selected->GetSelection();
+    wxASSERT_MSG(idx != wxNOT_FOUND && (unsigned int)idx < m_selected->GetCount() - 1, wxT("no or last active translation selected"));
+    wxString label = m_selected->GetString(idx);
+    void *data = m_selected->GetClientData(idx);
+    m_selected->Delete(idx);
+    m_selected->Insert(label, idx + 1, data);
+    m_selected->Select(idx + 1);
+
+    wxZRColaTranslationSeqBase::OnSelectedDown(event);
+}
+
+
+void wxZRColaTranslationSeq::OnApplyButtonClick(wxCommandEvent& event)
+{
+    event.Skip();
+
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    m_transeq.clear();
+    for (unsigned int i = 0, n = m_selected->GetCount(); i < n; i++)
+        m_transeq.push_back(static_cast<ZRCola::transetid_t>((size_t)m_selected->GetClientData(i)));
+
+    // Notify source text something changed and should re-translate.
+    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+    app->m_mainWnd->m_panel->m_source->ProcessWindowEvent(event2);
+}
+
+
+void wxZRColaTranslationSeq::OnOKButtonClick(wxCommandEvent& event)
+{
+    wxZRColaTranslationSeq::OnApplyButtonClick(event);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// wxPersistentZRColaTranslationSeq
+//////////////////////////////////////////////////////////////////////////
+
+const int wxPersistentZRColaTranslationSeq::s_guiLevel = 1;
+
+
+wxPersistentZRColaTranslationSeq::wxPersistentZRColaTranslationSeq(wxZRColaTranslationSeq *wnd) : wxPersistentTLWEx(wnd)
+{
+}
+
+
+void wxPersistentZRColaTranslationSeq::Save() const
+{
+    SaveValue(wxT("guiLevel"), s_guiLevel);
+    wxPersistentTLWEx::Save();
+
+    auto wnd = static_cast<const wxZRColaTranslationSeq*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
+
+    wxString str;
+    bool first = true;
+    for (auto s = wnd->m_transeq.cbegin(), s_end = wnd->m_transeq.cend(); s != s_end; ++s, first = false)
+        str += wxString::Format(first ? wxT("%u") : wxT("|%u"), *s);
+    SaveValue(wxT("transeq"), str);
+}
+
+
+bool wxPersistentZRColaTranslationSeq::Restore()
+{
+    auto wnd = dynamic_cast<wxZRColaTranslationSeq*>(GetWindow());
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    wxString str;
+    if (RestoreValue(wxT("transeq"), &str)) {
+        std::vector<ZRCola::transetid_t> transet;
+        for (wxStringTokenizer tok(str, wxT("|")); tok.HasMoreTokens(); ) {
+            ZRCola::transetid_t val = (ZRCola::transetid_t)_tcstoul(tok.GetNextToken().c_str(), NULL, 10);
+            for (size_t i = 0, n = app->m_ts_db.idxTranSet.size(); i < n; i++) {
+                const ZRCola::transet_db::transet &cg = app->m_ts_db.idxTranSet[i];
+                if (cg.set == val) {
+                    transet.push_back(val);
+                    break;
+                }
+            }
+        }
+        if (!transet.empty())
+            wnd->m_transeq = std::move(transet);
+    }
+
+    int guiLevel;
+    return RestoreValue(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel ? wxPersistentTLWEx::Restore() : true;
+}

ZRCola/zrcolatranseq.h

@@ -0,0 +1,73 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+*/
+
+///
+/// Forward declarations
+///
+class wxZRColaTranslationSeq;
+class wxPersistentZRColaTranslationSeq;
+
+
+#pragma once
+
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include "zrcolagui.h"
+#pragma warning(pop)
+#include <zrcola/translate.h>
+#include <wxex/persist/toplevel.h>
+#include <vector>
+
+
+///
+/// Configuration dialog
+///
+class wxZRColaTranslationSeq : public wxZRColaTranslationSeqBase
+{
+public:
+    wxZRColaTranslationSeq(wxWindow* parent);
+
+    friend class wxPersistentZRColaTranslationSeq;    // Allow saving/restoring window state.
+
+protected:
+    virtual void OnInitDialog(wxInitDialogEvent& event);
+    virtual void OnUpdate(wxUpdateUIEvent& event);
+    virtual void OnAvailableChar(wxKeyEvent& event);
+    virtual void OnAvailableDClick(wxCommandEvent& event);
+    virtual void OnAdd(wxCommandEvent& event);
+    virtual void OnRemove(wxCommandEvent& event);
+    virtual void OnSelectedChar(wxKeyEvent& event);
+    virtual void OnSelectedDClick(wxCommandEvent& event);
+    virtual void OnSelectedUp(wxCommandEvent& event);
+    virtual void OnSelectedDown(wxCommandEvent& event);
+    virtual void OnApplyButtonClick(wxCommandEvent& event);
+    virtual void OnOKButtonClick(wxCommandEvent& event);
+
+public:
+    std::vector<ZRCola::transetid_t> m_transeq; ///< Custom translation set sequence
+};
+
+
+///
+/// Supports saving/restoring wxZRColaTranslationSeq state
+///
+class wxPersistentZRColaTranslationSeq : public wxPersistentTLWEx
+{
+public:
+    wxPersistentZRColaTranslationSeq(wxZRColaTranslationSeq *wnd);
+
+    virtual void Save() const;
+    virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
+};
+
+
+inline wxPersistentObject *wxCreatePersistentObject(wxZRColaTranslationSeq *wnd)
+{
+    return new wxPersistentZRColaTranslationSeq(wnd);
+}

ZRCola/zrcolaupdater.cpp

@@ -1,23 +1,9 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -41,6 +27,7 @@ wxZRColaUpdater::wxZRColaUpdater(wxWindow* parent) :
 
     // Prepare Updater.
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    #pragma warning(suppress: 26812) // wxLanguage is unscoped.
     m_updater = new wxUpdCheckThread(app->m_lang_ui == wxLANGUAGE_DEFAULT ? wxT("en_US") : wxLocale::GetLanguageCanonicalName(app->m_lang_ui), this);
     //if (m_updater->Run() != wxTHREAD_NO_ERROR) {
     //    wxFAIL_MSG(wxT("Can't create the thread!"));
@@ -80,7 +67,7 @@ wxZRColaUpdater::~wxZRColaUpdater()
 void wxZRColaUpdater::OnIdle(wxIdleEvent& event)
 {
     if (!m_finished) {
-        m_buttonUpdate->Enable(m_updater->CheckForUpdate() == wxUpdCheckThread::wxUpdUpdateAvailable);
+        m_buttonUpdate->Enable(m_updater->CheckForUpdate() == wxUpdCheckThread::wxResult::UpdateAvailable);
         m_finished = true;
     }
 }

ZRCola/zrcolaupdater.h

@@ -1,20 +1,6 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
 */
 
 ///
@@ -25,11 +11,16 @@ class wxZRColaUpdater;
 
 #pragma once
 
+#include <wxex/common.h>
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include "zrcolagui.h"
-
+#pragma warning(pop)
 #include <Updater/chkthread.h>
-
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
 #include <wx/log.h>
+#pragma warning(pop)
 
 
 ///

ZRColaCompile/ZRColaCompile.props

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\WinStd\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

ZRColaCompile/ZRColaCompile.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -15,44 +15,49 @@
     <RootNamespace>ZRColaCompile</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Debug.props" />
-    <Import Project="ZRColaCompile.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\Win32.props" />
-    <Import Project="..\include\Release.props" />
-    <Import Project="ZRColaCompile.props" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\WinStd\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="dbsource.cpp" />
     <ClCompile Include="main.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    <ClCompile Include="parse.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="dbsource.h" />
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="parse.h" />
+    <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\lib\libZRColaUI\build\libZRColaUI.vcxproj">
@@ -61,11 +66,8 @@
     <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
       <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-10.0.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendDll-10.0.vcxproj">
-      <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
+      <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

ZRColaCompile/ZRColaCompile.vcxproj.filters

@@ -19,7 +19,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
@@ -28,14 +28,20 @@
     <ClCompile Include="dbsource.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="parse.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="dbsource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="parse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ZRColaCompile.rc">

ZRColaCompile/locale/ZRColaCompile.pot

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRColaCompile\n"
-"POT-Creation-Date: 2016-10-13 11:49+0200\n"
+"POT-Creation-Date: 2022-02-17 13:30+0100\n"
 "PO-Revision-Date: 2016-04-13 18:11+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -10,26 +10,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.4.2\n"
 "X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: main.cpp:102
+#: main.cpp:239
 msgid "Show this help message"
 msgstr ""
 
-#: main.cpp:103
-msgid "<input file>"
+#: main.cpp:240
+msgid "<Input file>"
 msgstr ""
 
-#: main.cpp:104
-msgid "<output file>"
+#: main.cpp:241
+msgid "<Output file>"
 msgstr ""
 
-#: main.cpp:105
-msgid "<output POT catalog>"
+#: main.cpp:242
+msgid "Output POT catalog"
 msgstr ""

ZRColaCompile/parse.cpp

@@ -0,0 +1,198 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2018-2022 Amebis
+*/
+
+#include "pch.h"
+
+using namespace std;
+using namespace stdex;
+using namespace winstd;
+
+
+//////////////////////////////////////////////////////////////////////////
+// ZRCola::DecompParser
+//////////////////////////////////////////////////////////////////////////
+
+ZRCola::DecompParser::DecompParser(_In_ const std::wstring &decomposed) : m_decomposed(decomposed)
+{
+    if (m_decomposed.empty()) {
+        m_sym = 0;
+        m_idx = 0;
+    } else {
+        m_sym = m_decomposed[0];
+        m_idx = 1;
+    }
+}
+
+
+void ZRCola::DecompParser::ParsePrefixes(_Inout_ std::vector<wchar_t> &prefix)
+{
+    for (;;) {
+        if (
+            m_sym == 0x203F                    || // Undertie
+            0xE0F0 <= m_sym && m_sym <= 0xE0F3 || // 1st Set of Prefix Modifiers
+            m_sym == 0xE0F6                    || // Above
+            m_sym == 0xE0F7                    || // Below
+            0xE0F8 <= m_sym && m_sym <= 0xE0FC)   // 2nd Set of Prefix Modifiers
+        {
+            // Prefix modifier
+            prefix.push_back(m_sym);
+            NextChar();
+        } else
+            break;
+    }
+}
+
+
+void ZRCola::DecompParser::ParseModifiers(_Inout_ std::vector<wchar_t> &mod)
+{
+    for (;;) {
+        if (0xE000 <= m_sym && m_sym <= 0xE05B || // 1st Set of Modifiers
+            0xE063 <= m_sym && m_sym <= 0xE0BE || // 2nd Set of Modifiers
+            m_sym == 0x0023                    || // Number Sign
+            m_sym == 0x003A                    || // Colon
+            m_sym == 0x02DE                    || // Rhotic Hook
+            m_sym == 0x2019                    || // Right Single Quotation Mark
+            0x02B0 <= m_sym && m_sym <= 0x02FF || // Standard Unicode Modifiers
+            m_sym == 0xE0C0                    || // Circle
+            m_sym == 0xE0C2                    || // Square
+            m_sym == 0xE0CA                    || // Diamond
+            m_sym == 0xE0CD)                      // Not Circle
+        {
+            mod.push_back(m_sym);
+            NextChar();
+        } else
+            break;
+    }
+}
+
+
+ZRCola::DecompParser::Expression* ZRCola::DecompParser::ParseParentheses(_In_ wchar_t open, _In_ wchar_t close)
+{
+    if (m_sym == open) {
+        // Parenthesis Start
+        NextChar();
+        if (m_sym == 0xE037) {
+            // EVA Parenthesis End
+            unique_ptr<Character> res(new Character(close));
+            NextChar();
+            return res.release();
+        } else {
+            unique_ptr<Parentheses> res(new Parentheses(open, close, ParseExpression()));
+            if (m_sym == close) {
+                // Parenthesis End
+                NextChar();
+            } else if (m_sym == open && m_idx < m_decomposed.length() && m_decomposed[m_idx] == 0xE037) {
+                // Decomposed Parenthesis End
+                NextChar();
+                NextChar();
+            } else
+                throw invalid_argument(string_printf("%lc is unexpected. Should end with %lc.", m_sym, close));
+            return res.release();
+        }
+    } else
+        return NULL;
+}
+
+
+ZRCola::DecompParser::Expression* ZRCola::DecompParser::ParseCharacter()
+{
+    Expression *res_p;
+    if ((res_p = ParseParentheses(0xE0C5, 0xE0C6)) != NULL || // Superscript
+        (res_p = ParseParentheses(0xE0CE, 0xE0CF)) != NULL || // Subscript
+        (res_p = ParseParentheses(0xE2E0, 0xE2E1)) != NULL || // EVA Double
+        (res_p = ParseParentheses(0xE2E2, 0xE2E3)) != NULL || // EVA Condensed
+        (res_p = ParseParentheses(0xE2E4, 0xE2E5)) != NULL || // EVA Emphasis
+        (res_p = ParseParentheses(0xE2E6, 0xE2E7)) != NULL || // EVA Strike
+        (res_p = ParseParentheses(0xE2E8, 0xE2E9)) != NULL || // EVA Undeal
+        (res_p = ParseParentheses(0xE2EA, 0xE2EB)) != NULL || // EVA Italic
+        (res_p = ParseParentheses(0xE2EC, 0xE2ED)) != NULL || // EVA Superscript
+        (res_p = ParseParentheses(0xE2EE, 0xE2EF)) != NULL)   // EVA Subscript
+    {
+        return res_p;
+    }
+
+    unique_ptr<Character> res(new Character());
+
+    ParsePrefixes(res->m_prefix);
+
+    if (m_sym < 0xE000 || 0xE0FC < m_sym ||
+        m_sym == 0xE0D6 ||                      // Clockwise Top Semicircle Arrow
+        m_sym == 0xE0D7)                        // Anticlockwise Top Semicircle Arrow
+    {
+        // Base Character
+        res->m_char = m_sym;
+        NextChar();
+    }
+
+    ParseModifiers(res->m_mod);
+
+    return res.release();
+}
+
+
+ZRCola::DecompParser::Expression* ZRCola::DecompParser::ParseTerm()
+{
+    unique_ptr<Ligature> res(new Ligature(ParseCharacter()));
+    while (m_sym == 0xE0C4) {
+        // Ligature
+        std::unique_ptr<Ligature::Element> res2(new Ligature::Element(m_sym));
+        NextChar();
+        ParseModifiers(res2->m_mod);
+        res2->m_el.reset(ParseCharacter());
+        res->m_rest.push_back(std::move(res2));
+    }
+
+    if (res->m_rest.empty()) {
+        // A ligature of, well one single character, is rather a character alone.
+        return res->m_first.release();
+    } else
+        return res.release();
+}
+
+
+ZRCola::DecompParser::Expression* ZRCola::DecompParser::ParseExpression()
+{
+    unique_ptr<Expression> res(ParseTerm());
+    if (0xE05C <= m_sym && m_sym <= 0xE062 ||
+        m_sym == 0xE0C1                    || // Two Characters in Circle
+        m_sym == 0xE0C3                    || // Two Characters in Square
+        m_sym == 0xE0C7                    || // Breved below
+        m_sym == 0xE0CB                    || // Inverse tilded
+        m_sym == 0xE0CC                    || // Diagonally Barred
+        0xE0D0 <= m_sym && m_sym <= 0xE0D5)
+    {
+        // Joiner of two terms
+        unique_ptr<Joined2> res_j(new Joined2(m_sym, res.release()));
+        NextChar();
+
+        ParseModifiers(res_j->m_mod);
+
+        res_j->m_second.reset(ParseTerm());
+        return res_j.release();
+    } else if (
+        m_sym == 0xE0C8 || // Inverse breved
+        m_sym == 0xE0C9)   // Breved below
+    {
+        // Joiner of three terms
+        unique_ptr<Joined3> res_j(new Joined3(m_sym, res.release()));
+        NextChar();
+
+        ParseModifiers(res_j->m_mod);
+
+        res_j->m_second.reset(ParseTerm());
+        res_j->m_third.reset(ParseTerm());
+        return res_j.release();
+    } else
+        return res.release();
+}
+
+
+ZRCola::DecompParser::Expression* ZRCola::DecompParser::Parse()
+{
+    unique_ptr<Expression> res(ParseExpression());
+    if (m_sym)
+        throw invalid_argument("Unexpected trailing character(s).");
+    return res.release();
+}

ZRColaCompile/parse.h

@@ -0,0 +1,140 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2018-2022 Amebis
+*/
+
+#pragma once
+
+#include <sal.h>
+#include <list>
+#include <memory>
+#include <string>
+#include <vector>
+
+
+namespace ZRCola {
+    ///
+    /// Decomposed sequence parser
+    ///
+    class DecompParser
+    {
+    public:
+        ///
+        /// Base class for expressions
+        ///
+        class Expression
+        {
+        };
+
+
+        ///
+        /// Expression in "parentheses"
+        ///
+        class Parentheses : public Expression
+        {
+        public:
+            inline Parentheses(_In_opt_ wchar_t open = 0, _In_opt_ wchar_t close = 0, _In_opt_ Expression *expr = NULL) : m_open(open), m_close(close), m_expr(expr) {}
+
+        public:
+            wchar_t m_open, m_close;
+            std::unique_ptr<Expression> m_expr;
+        };
+
+
+        ///
+        /// Operator
+        ///
+        class Operator : public Expression
+        {
+        public:
+            inline Operator(_In_opt_ wchar_t chr = 0) : m_char(chr) {}
+
+            wchar_t m_char;
+            std::vector<wchar_t> m_mod;
+        };
+
+
+        ///
+        /// Character
+        ///
+        class Character : public Operator
+        {
+        public:
+            inline Character(_In_opt_ wchar_t chr = 0) : Operator(chr) {}
+
+            std::vector<wchar_t> m_prefix;
+        };
+
+
+        ///
+        /// Ligature
+        ///
+        class Ligature : public Expression
+        {
+        public:
+            class Element : public Operator
+            {
+            public:
+                inline Element(_In_opt_ wchar_t chr = 0) : Operator(chr) {}
+
+                std::unique_ptr<Expression> m_el;
+            };
+
+            inline Ligature(_In_opt_ Expression *first = NULL) : m_first(first) {}
+
+            std::unique_ptr<Expression> m_first;
+            std::list<std::unique_ptr<Element> > m_rest;
+        };
+
+
+        ///
+        /// Two joined terms
+        ///
+        class Joined2 : public Operator
+        {
+        public:
+            Joined2(_In_opt_ wchar_t chr = 0, _In_opt_ Expression *first = NULL) : Operator(chr), m_first(first) {}
+
+            std::unique_ptr<Expression> m_first, m_second;
+        };
+
+
+        ///
+        /// Three joined terms
+        ///
+        class Joined3 : public Joined2
+        {
+        public:
+            Joined3(_In_opt_ wchar_t chr = 0, _In_opt_ Expression *first = NULL) : Joined2(chr, first) {}
+
+            std::unique_ptr<Expression> m_third;
+        };
+
+
+    public:
+        DecompParser(_In_ const std::wstring &decomposed);
+
+    protected:
+        inline void NextChar();
+        void ParsePrefixes(_Inout_ std::vector<wchar_t> &prefix);
+        void ParseModifiers(_Inout_ std::vector<wchar_t> &mod);
+        Expression* ParseParentheses(_In_ wchar_t open, _In_ wchar_t close);
+        Expression* ParseCharacter();
+        Expression* ParseTerm();
+        Expression* ParseExpression();
+
+    public:
+        Expression* Parse();
+
+    protected:
+        std::wstring::size_type m_idx;      ///< Index of current character
+        const std::wstring &m_decomposed;   ///< Decomposed character sequence to analyse
+        wchar_t m_sym;                      ///< Current character
+    };
+}
+
+
+inline void ZRCola::DecompParser::NextChar()
+{
+    m_sym = m_idx < m_decomposed.length() ? m_decomposed[m_idx++] : 0;
+}

ZRColaCompile/pch.cpp

@@ -0,0 +1,6 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+*/
+
+#include "pch.h"

ZRColaCompile/pch.h

@@ -0,0 +1,45 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2022 Amebis
+*/
+
+#pragma once
+
+#include "../include/version.h"
+#include "dbsource.h"
+#include "parse.h"
+
+#include <wxex/common.h>
+#include <wxex/comutils.h>
+
+#pragma warning(push)
+#pragma warning(disable: WXWIDGETS_CODE_ANALYSIS_WARNINGS)
+#include <wx/app.h>
+#include <wx/cmdline.h>
+#include <wx/config.h>
+#include <wx/intl.h>
+#pragma warning(pop)
+
+#include <zrcola/idrec.h>
+
+#include <WinStd/Common.h>
+
+#include <initguid.h> // GUID helper to prevent LNK2001 errors (unresolved external symbol IID_IADO...)
+#pragma warning(push)
+#pragma warning(disable: 4091)
+#include <adoint.h>
+#include <adoid.h>
+#pragma warning(pop)
+
+#include <process.h>
+#include <tchar.h>
+
+#include <stdlib.h>
+
+#include <algorithm>
+#include <codecvt>
+#include <cwctype>
+#include <fstream>
+#include <memory>
+#include <set>
+#include <vector>

ZRColaCompile/stdafx.cpp

@@ -1,20 +0,0 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "stdafx.h"

ZRColaCompile/stdafx.h

@@ -1,58 +0,0 @@
-/*
-    Copyright 2015-2017 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../include/version.h"
-#include "dbsource.h"
-
-#include <zrcola/language.h>
-#include <zrcola/translate.h>
-#include <zrcola/tag.h>
-#include <zrcolaui/chargroup.h>
-#include <zrcolaui/keyboard.h>
-
-#include <wx/app.h>
-#include <wx/cmdline.h>
-#include <wx/config.h>
-#include <wx/intl.h>
-
-#include <wxex/common.h>
-#include <wxex/comutils.h>
-
-#include <stdex/idrec.h>
-
-#include <WinStd/Common.h>
-
-#include <initguid.h> // GUID helper to prevent LNK2001 errors (unresolved external symbol IID_IADO...)
-#include <adoint.h>
-#include <adoid.h>
-
-#include <process.h>
-#include <tchar.h>
-
-#include <stdlib.h>
-
-#include <algorithm>
-#include <codecvt>
-#include <cwctype>
-#include <fstream>
-#include <memory>
-#include <set>
-#include <vector>