3 files changed, 26 insertions, 10 deletions
diff --git a/include/cru/platform/native/input_method.hpp b/include/cru/platform/native/input_method.hpp
index ecc47fd8..6ca85852 100644
--- a/include/cru/platform/native/input_method.hpp
+++ b/include/cru/platform/native/input_method.hpp
@@ -9,17 +9,22 @@ namespace cru::platform::native {
 // It is a reference, so there is a ref count, remember to destroy it to release
 // the ref after use.
 struct IInputMethodContextRef : INativeResource {
+  // Return true if you should draw composition text manually. Return false if
+  // system will take care of that for you.
+  virtual bool ShouldManuallyDrawCompositionText() = 0;
   // Reset composition string. Use this method to prepare typing.
   virtual void Reset() = 0;
   // Get the composition string.
-  virtual std::string GetCompositionString() = 0;
+  virtual std::string GetCompositionText() = 0;
   // Set the candidate window lefttop. Use this method to prepare typing.
   virtual void SetCandidateWindowPosition(const Point& point);
-  // Triggered every time composition text changes, evet args is the new
+  // Triggered when user starts composition.
+  virtual IEvent<std::nullptr_t>* CompositionStartEvent() = 0;
+  // Triggered when user stops composition.
+  virtual IEvent<std::nullptr_t>* CompositionEndEvent() = 0;
+  // Triggered every time composition text changes, event args is the new
   // composition text.
   virtual IEvent<std::string>* CompositionTextChangeEvent() = 0;
-  // User comfirmed compostition. Use this method to get the final input text.
-  virtual IEvent<std::string>* CharEvent() = 0;
 };
 
 struct IInputMethodManager : INativeResource {
diff --git a/include/cru/win/native/input_method.hpp b/include/cru/win/native/input_method.hpp
index 3ea16709..2e09aac4 100644
--- a/include/cru/win/native/input_method.hpp
+++ b/include/cru/win/native/input_method.hpp
@@ -2,6 +2,7 @@
 #include "resource.hpp"
 
 #include "cru/platform/native/input_method.hpp"
+#include "window_native_message_event_args.hpp"
 
 #include <imm.h>
 
@@ -20,23 +21,33 @@ class WinInputMethodContextRef : public WinNativeResource,
 
   ::HIMC GetHandle() const { return handle_; }
 
+  bool ShouldManuallyDrawCompositionText() override { return true; }
+
   void Reset() override;
 
-  std::string GetCompositionString() override;
+  std::string GetCompositionText() override;
 
   void SetCandidateWindowPosition(const Point& point) override;
 
+  IEvent<std::nullptr_t>* CompositionStartEvent() override;
+
+  IEvent<std::nullptr_t>* CompositionEndEvent() override;
+
   IEvent<std::string>* CompositionTextChangeEvent() override;
 
-  IEvent<std::string>* CharEvent() override;
+ private:
+  void OnWindowNativeMessage(WindowNativeMessageEventArgs& args);
 
  private:
-  WinNativeWindow* window_;
+  [[maybe_unused]] WinNativeWindow* window_;
+
+  std::vector<EventRevokerGuard> event_revoker_guards_;
 
   ::HWND window_handle_;
   ::HIMC handle_;
 
+  Event<std::nullptr_t> composition_start_event_;
+  Event<std::nullptr_t> composition_end_event_;
   Event<std::string> composition_text_change_event_;
-  Event<std::string> char_event_;
 };
 }  // namespace cru::platform::native::win
diff --git a/include/cru/win/native/window_native_message_event_args.hpp b/include/cru/win/native/window_native_message_event_args.hpp
index 18de1f46..f5476735 100644
--- a/include/cru/win/native/window_native_message_event_args.hpp
+++ b/include/cru/win/native/window_native_message_event_args.hpp
@@ -19,7 +19,7 @@ class WindowNativeMessageEventArgs : public Object {
   CRU_DEFAULT_MOVE(WindowNativeMessageEventArgs)
   ~WindowNativeMessageEventArgs() override = default;
 
-  WindowNativeMessage GetWindowMessage() const { return message_; }
+  const WindowNativeMessage& GetWindowMessage() const { return message_; }
 
   LRESULT GetResult() const { return result_; }
   void SetResult(LRESULT result) { result_ = result; }
@@ -27,7 +27,7 @@ class WindowNativeMessageEventArgs : public Object {
   bool IsHandled() const { return handled_; }
   void SetHandled(bool handled) { handled_ = handled; }
 
-  void HandledAndSetResult(LRESULT result) {
+  void HandleWithResult(LRESULT result) {
     handled_ = true;
     result_ = result;
   }