이벤트 테스트 코드 추가.

TestApp1/TestApp1.cpp

@@ -10,53 +10,56 @@
 
 class TestApp1 : public DKApplication
 {
-	DKObject<DKThread> thread;
+	DKObject<DKWindow> window;
 public:
 	void OnInitialize(void) override
 	{
 		DKLog("%s", __PRETTY_FUNCTION__);
+		window = DKWindow::Create("DefaultWindow");
+		window->Activate();
 
-		DKLog("---- SystemPath ----");
-		DKLog("SystemRoot: %ls", (const wchar_t*)DefaultPath(SystemPath::SystemRoot));
-		DKLog("AppRoot: %ls", (const wchar_t*)DefaultPath(SystemPath::AppRoot));
-		DKLog("AppResource: %ls", (const wchar_t*)DefaultPath(SystemPath::AppResource));
-		DKLog("AppExecutable: %ls", (const wchar_t*)DefaultPath(SystemPath::AppExecutable));
-		DKLog("AppData: %ls", (const wchar_t*)DefaultPath(SystemPath::AppData));
-		DKLog("UserHome: %ls", (const wchar_t*)DefaultPath(SystemPath::UserHome));
-		DKLog("UserDocuments: %ls", (const wchar_t*)DefaultPath(SystemPath::UserDocuments));
-		DKLog("UserPreferences: %ls", (const wchar_t*)DefaultPath(SystemPath::UserPreferences));
-		DKLog("UserCache: %ls", (const wchar_t*)DefaultPath(SystemPath::UserCache));
-		DKLog("UserTemp: %ls", (const wchar_t*)DefaultPath(SystemPath::UserTemp));
-		DKLog("---- ProcessInfo ----");
-		DKLog("HostName: %ls", (const wchar_t*)ProcessInfoString(ProcessInfo::HostName));
-		DKLog("OsName: %ls", (const wchar_t*)ProcessInfoString(ProcessInfo::OsName));
-		DKLog("UserName: %ls", (const wchar_t*)ProcessInfoString(ProcessInfo::UserName));
-		DKLog("ModulePath: %ls", (const wchar_t*)ProcessInfoString(ProcessInfo::ModulePath));
-
-		thread = DKThread::Create(DKFunction([this]()
-		{
-			DKLog("Running new thread!");
-			this->EventLoop()->Post(DKFunction([&]()
+		window->AddEventHandler(this,
+			DKFunction([this](const DKWindow::WindowEvent& e)
 			{
-				DKLog("test1");
-			})->Invocation(), 2);
-			this->EventLoop()->Post(DKFunction([&]()
+				DKLog("WindowEvent: %d, origin:(%.1f, %.1f), size:(%.1f x %.1f), content:(%.1f, %.1f), scale:%f",
+					  e.type,
+					  e.windowRect.origin.x, e.windowRect.origin.y,
+					  e.windowRect.size.width, e.windowRect.size.height,
+					  e.contentRect.size.width, e.contentRect.size.height,
+					  e.contentScaleFactor);
+				if (e.type == DKWindow::WindowEvent::WindowClosed)
+					DKApplication::Instance()->Terminate(0);
+			}),
+			DKFunction([this](const DKWindow::KeyboardEvent& e)
 			{
-				DKLog("test2");
-			})->Invocation(), 4);
-			this->EventLoop()->Post(DKFunction([&]()
+				if (e.type == DKWindow::KeyboardEvent::KeyUp)
+				{
+					if (e.key == DKVK_ENTER)
+					{
+						window->SetTextInputEnabled(0, !window->IsTextInputEnabled(0));
+						DKLog("TextInput: %d", window->IsTextInputEnabled(0));
+					}
+					else if (e.key == DKVK_ESCAPE)
+					{
+						window->HoldMouse(0, !window->IsMouseHeld(0));
+						DKLog("HoldMouse: %d", window->IsMouseHeld(0));
+					}
+				}
+				DKLog("KeyboardEvent: %d, %ls, %ls",
+					  e.type,
+					  (const wchar_t*)DKWindow::GetVKName(e.key),
+					  (const wchar_t*)e.text);
+			}),
+			DKFunction([this](const DKWindow::MouseEvent& e)
 			{
-				DKLog("Terminate!!");
-				DKApplication::Instance()->Terminate(0);
-			})->Invocation(), 10);
-
-		})->Invocation());
+				DKLog("MouseEvent: %d, btn:%d, location:%.1f, %.1f, delta:%.1f, %.1f",
+					  e.type, e.buttonId, e.location.x, e.location.y, e.delta.x, e.delta.y);
+			})
+		);
 	}
 	void OnTerminate(void) override
 	{
 		DKLog("%s", __PRETTY_FUNCTION__);
-		DKLog("Waiting for worker thread!");
-		thread->WaitTerminate();
 	}
 };
 

TestApp1/TestApp1.xcodeproj/project.pbxproj

@@ -484,6 +484,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.icondb.TestApp1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
@@ -497,12 +498,14 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.icondb.TestApp1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};
 		844A9A711DD0BEDD007DCC89 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = F599L375TZ;
@@ -519,6 +522,7 @@
 		844A9A721DD0BEDD007DCC89 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = F599L375TZ;