...

2 files changed, 42 insertions, 5 deletions

diff --git a/src/win/native/input_method.cpp b/src/win/native/input_method.cpp
index 4edfdc5f..837d0ed7 100644
--- a/src/win/native/input_method.cpp
+++ b/src/win/native/input_method.cpp
@@ -17,6 +17,11 @@ WinInputMethodContextRef::WinInputMethodContextRef(WinNativeWindow* window)
   handle_ = ::ImmGetContext(window_handle_);
 
   // TODO: Events
+
+  event_revoker_guards_.push_back(
+      EventRevokerGuard(window->NativeMessageEvent()->AddHandler(
+          std::bind(&WinInputMethodContextRef::OnWindowNativeMessage, this,
+                    std::placeholders::_1))));
 }
 
 WinInputMethodContextRef::~WinInputMethodContextRef() {
@@ -34,7 +39,7 @@ void WinInputMethodContextRef::Reset() {
   }
 }
 
-std::string WinInputMethodContextRef::GetCompositionString() {
+std::string WinInputMethodContextRef::GetCompositionText() {
   const auto length =
       ::ImmGetCompositionStringW(handle_, GCS_RESULTREADSTR, NULL, 0) +
       sizeof(wchar_t);
@@ -65,11 +70,43 @@ void WinInputMethodContextRef::SetCandidateWindowPosition(const Point& point) {
         "position.");
 }
 
+IEvent<std::nullptr_t>* WinInputMethodContextRef::CompositionStartEvent() {
+  return &composition_start_event_;
+}
+
+IEvent<std::nullptr_t>* WinInputMethodContextRef::CompositionEndEvent() {
+  return &composition_end_event_;
+};
+
 IEvent<std::string>* WinInputMethodContextRef::CompositionTextChangeEvent() {
   return &composition_text_change_event_;
 }
 
-IEvent<std::string>* WinInputMethodContextRef::CharEvent() {
-  return &char_event_;
+void WinInputMethodContextRef::OnWindowNativeMessage(
+    WindowNativeMessageEventArgs& args) {
+  const auto message = args.GetWindowMessage();
+  switch (message.msg) {
+    case WM_IME_COMPOSITION: {
+      composition_text_change_event_.Raise(this->GetCompositionText());
+      args.HandleWithResult(0);
+      break;
+    }
+    case WM_IME_STARTCOMPOSITION: {
+      composition_start_event_.Raise(nullptr);
+      args.HandleWithResult(0);
+      break;
+    }
+    case WM_IME_ENDCOMPOSITION: {
+      composition_end_event_.Raise(nullptr);
+      args.HandleWithResult(0);
+      break;
+    }
+    case WM_IME_SETCONTEXT: {
+      const auto new_l_param =
+          message.l_param & (~static_cast<LPARAM>(ISC_SHOWUICOMPOSITIONWINDOW));
+      args.HandleWithResult(::DefWindowProcW(message.hwnd, message.msg,
+                                             message.w_param, new_l_param));
+    }
+  }
 }
 }  // namespace cru::platform::native::win
diff --git a/src/win/native/window_manager.cpp b/src/win/native/window_manager.cpp
index e1b14f4b..205a139c 100644
--- a/src/win/native/window_manager.cpp
+++ b/src/win/native/window_manager.cpp
@@ -25,7 +25,7 @@ WindowManager::WindowManager(WinUiApplication* application) {
 }
 
 WindowManager::~WindowManager() {
-  for (const auto [key, window] : window_map_) delete window;
+  for (const auto& [key, window] : window_map_) delete window;
 }
 
 void WindowManager::RegisterWindow(HWND hwnd, WinNativeWindow* window) {
@@ -50,7 +50,7 @@ WinNativeWindow* WindowManager::FromHandle(HWND hwnd) {
 
 std::vector<WinNativeWindow*> WindowManager::GetAllWindows() const {
   std::vector<WinNativeWindow*> windows;
-  for (auto [key, value] : window_map_) windows.push_back(value);
+  for (const auto& [key, value] : window_map_) windows.push_back(value);
   return windows;
 }
 }  // namespace cru::platform::native::win