Merge pull request #192 from chewing/draw-with-d2d

refactor: draw UI window with Direct2D

.clang-format

@@ -0,0 +1,2 @@
+BasedOnStyle: Google
+IndentWidth: 4

.gitignore

@@ -1 +1,4 @@
-/build
+/build
+/.cache
+/rustlib/target
+/tsfreg/target

CMakeLists.txt

@@ -9,23 +9,16 @@ add_definitions(
 	/D_UNICODE=1 /DUNICODE=1 # do Unicode build
 	/D_CRT_SECURE_NO_WARNINGS # disable warnings about old libc functions
 )
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8") # set source code encoding to UTF-8
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-") # turn off C++ RTTI
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8") # set source code encoding to UTF-8
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GL /Gw")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Gw")
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-set(CMAKE_INTERPROCEDURAL_OPTIMIZATION $<CONFIG:Release>)
+set(CMAKE_CXX_STANDARD 17)
 
-enable_testing()
+if (MSVC)
+	add_compile_options(/utf-8)
+endif()
 
-set(PROJECT_LIBCHEWING ${PROJECT_SOURCE_DIR}/libchewing)
-set(CHEWING_DATA_PREFIX ${PROJECT_BINARY_DIR}/libchewing/data)
+# Static link MSVC runtime
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
 
-add_subdirectory(${PROJECT_LIBCHEWING})
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/libIME)
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/ChewingTextService)
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/ChewingPreferences)
+add_subdirectory(libchewing)
+add_subdirectory(libIME)
+add_subdirectory(ChewingTextService)
+add_subdirectory(ChewingPreferences)

ChewingPreferences/CMakeLists.txt

@@ -36,4 +36,4 @@ add_executable(ChewingPreferences WIN32
 )
 target_link_libraries(ChewingPreferences
 	comctl32.lib
-)
+)

ChewingPreferences/ChewingPreferences.cpp

@@ -17,9 +17,6 @@
 //	Boston, MA  02110-1301, USA.
 //
 
-#include <Windows.h>
-#include <libIME/WindowsVersion.h>
-#include <libIME/ComPtr.h>
 #include "TypingPropertyPage.h"
 #include "UiPropertyPage.h"
 #include "KeyboardPropertyPage.h"
@@ -31,6 +28,9 @@
 #include <CommCtrl.h>
 #include <Msctf.h>
 
+#include <Unknwn.h>
+#include <winrt/base.h>
+
 namespace Chewing {
 
 // {F4D1E543-FB2C-48D7-B78D-20394F355381} // global compartment GUID for config change notification
@@ -51,8 +51,7 @@ static void initControls() {
 static void configDialog(HINSTANCE hInstance) {
 	initControls();
 
-	Ime::WindowsVersion winVer;
-	Config config(winVer);
+	Config config;
 	config.load();
 
 	Ime::PropertyDialog dlg;
@@ -76,14 +75,14 @@ static void configDialog(HINSTANCE hInstance) {
 			stamp = 0;
 		// set global compartment value to notify existing ChewingTextService instances
 		::CoInitialize(NULL); // initialize COM
-		Ime::ComPtr<ITfThreadMgr> threadMgr;
-		if(CoCreateInstance(CLSID_TF_ThreadMgr, NULL, CLSCTX_INPROC_SERVER, IID_ITfThreadMgr, (void**)&threadMgr) == S_OK) {
+		winrt::com_ptr<ITfThreadMgr> threadMgr;
+		if(CoCreateInstance(CLSID_TF_ThreadMgr, NULL, CLSCTX_INPROC_SERVER, IID_ITfThreadMgr, threadMgr.put_void()) == S_OK) {
 			TfClientId clientId = 0;
 			if(threadMgr->Activate(&clientId) == S_OK) {
-				Ime::ComPtr<ITfCompartmentMgr> compartmentMgr;
-				if(threadMgr->GetGlobalCompartment(&compartmentMgr) == S_OK) {
-					Ime::ComPtr<ITfCompartment> compartment;
-					if(compartmentMgr->GetCompartment(g_configChangedGuid, &compartment) == S_OK) {
+				winrt::com_ptr<ITfCompartmentMgr> compartmentMgr;
+				if(threadMgr->GetGlobalCompartment(compartmentMgr.put()) == S_OK) {
+					winrt::com_ptr<ITfCompartment> compartment;
+					if(compartmentMgr->GetCompartment(g_configChangedGuid, compartment.put()) == S_OK) {
 						VARIANT var;
 						VariantInit(&var);
 						var.vt = VT_I4;

ChewingPreferences/SymbolsPropertyPage.cpp

@@ -20,7 +20,6 @@
 #include "SymbolsPropertyPage.h"
 #include "resource.h"
 #include <ShlObj.h>
-#include <libIME/Utils.h>
 
 namespace Chewing {
 

ChewingTextService/CMakeLists.txt

@@ -1,11 +1,6 @@
 project(ChewingTextService)
 
-if(NOT DEFINED PROJECT_LIBCHEWING)
-    message(FATAL_ERROR "PROJECT_LIBCHEWING must be provided")
-endif()
-
 include_directories(
-    ${PROJECT_LIBCHEWING}/include
     ${CMAKE_SOURCE_DIR}
 )
 
@@ -28,3 +23,7 @@ target_link_libraries(ChewingTextService
     libchewing
     libIME_static
 )
+target_link_options(ChewingTextService
+    PRIVATE /NODEFAULTLIB:MSVCRT
+    PRIVATE /NODEFAULTLIB:MSVCRTD
+)

ChewingTextService/ChewingConfig.cpp

@@ -17,8 +17,11 @@
 //	Boston, MA  02110-1301, USA.
 //
 
-#include "ChewingConfig.h"
 #include <Aclapi.h>
+#include <Windows.h>
+#include <VersionHelpers.h>
+
+#include "ChewingConfig.h"
 
 namespace Chewing {
 
@@ -54,8 +57,7 @@ const wchar_t* Config::convEngines[]={
 #define SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE 0x00000001L
 #endif
 
-Config::Config(Ime::WindowsVersion winver):
-	winVer_(winver) {
+Config::Config() {
 	// Configuration
 	keyboardLayout = 0;
 	candPerRow = 3;
@@ -175,7 +177,7 @@ void Config::save() {
 		::RegCloseKey(hk);
 
 		// grant access to app containers in Windows 8
-		if(winVer_.isWindows8Above())
+		if(IsWindows8OrGreater())
 			grantAppContainerAccess(L"CURRENT_USER\\Software\\ChewingTextService", SE_REGISTRY_KEY, KEY_READ);
 	}
 }

ChewingTextService/ChewingConfig.h

@@ -22,13 +22,12 @@
 
 #include <Windows.h>
 #include <AccCtrl.h>
-#include <libIME/WindowsVersion.h>
 
 namespace Chewing {
 
 class Config {
 public:
-	Config(Ime::WindowsVersion winver);
+	Config();
 	~Config(void);
 
 	void load();
@@ -76,7 +75,6 @@ class Config {
 
 private:
 	DWORD stamp; // timestamp used to check if the config values are up to date
-	Ime::WindowsVersion winVer_;
 };
 
 }

ChewingTextService/ChewingImeModule.cpp

@@ -31,8 +31,7 @@ const CLSID g_textServiceClsid = {
 };
 
 ImeModule::ImeModule(HMODULE module):
-	Ime::ImeModule(module, g_textServiceClsid),
-	config_(windowsVersion()) {
+	Ime::ImeModule(module, g_textServiceClsid) {
 
 	config_.load(); // load configurations