remove needless preedit rect

include/common/InputContextImpl.hpp

@@ -5,18 +5,5 @@
 
 namespace IngameIME
 {
-struct InternalRect : public PreEditRect
-{
-    InternalRect() = default;
-    InternalRect(const PreEditRect& rect);
-
-    /**
-     * @brief Implicit convert to RECT
-     *
-     * @return RECT
-     */
-    operator RECT() noexcept;
-};
-
 std::string ToUTF8(std::wstring utf16);
 } // namespace IngameIME

include/imm/ImmInputContextImpl.hpp

@@ -13,16 +13,13 @@ class InputContextImpl : public InputContext
 {
   protected:
     static std::list<InputContextImpl*> ActiveContexts;
-    static LRESULT WndProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam);
+    static LRESULT                      WndProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam);
 
   protected:
     HWND    hWnd;
     WNDPROC prevProc;
-
     HIMC ctx;
-
     bool activated{false};
-    PreEditRect rect;
 
   public:
     InputContextImpl(const HWND hWnd);
@@ -37,20 +34,14 @@ class InputContextImpl : public InputContext
      * @brief Retrive Commit text for current Composition
      */
     void procCommit();
-    /**
-     * @brief Set CandidateList window's position for current Composition
-     */
-    void setPreEditRect(InternalRect& rect);
     /**
      * @brief Retrive CandidateList infomation for application to draw
      */
     void procCand();
 
   public:
-    virtual InputMode   getInputMode() override;
-    virtual void        setPreEditRect(const PreEditRect& rect) override;
-    virtual PreEditRect getPreEditRect() override;
-    virtual void        setActivated(const bool activated) override;
-    virtual bool        getActivated() const override;
+    virtual InputMode getInputMode() override;
+    virtual void      setActivated(const bool activated) override;
+    virtual bool      getActivated() const override;
 };
 } // namespace IngameIME::imm

include/tf/TfInputContextImpl.hpp

@@ -33,19 +33,15 @@ class InputContextImpl : public InputContext
     ComPtr<CompositionHandler> h_comp;
     ComPtr<InputModeHandler>   h_mode;
 
-    PreEditRect rect;
-
     bool activated{false};
 
   public:
     InputContextImpl(const HWND hWnd);
     ~InputContextImpl();
 
   public:
-    virtual InputMode   getInputMode() override;
-    virtual void        setPreEditRect(const PreEditRect& rect) override;
-    virtual PreEditRect getPreEditRect() override;
-    virtual void        setActivated(const bool activated) override;
-    virtual bool        getActivated() const override;
+    virtual InputMode getInputMode() override;
+    virtual void      setActivated(const bool activated) override;
+    virtual bool      getActivated() const override;
 };
 } // namespace IngameIME::tf

src/ImmInputContextImpl.cpp

@@ -160,31 +160,6 @@ InputMode InputContextImpl::getInputMode()
     return InputMode::AlphaNumeric;
 }
 
-void InputContextImpl::setPreEditRect(const PreEditRect& _rect)
-{
-    this->rect         = _rect;
-    InternalRect  rect = _rect;
-    CANDIDATEFORM cand;
-    cand.dwIndex        = 0;
-    cand.dwStyle        = CFS_EXCLUDE;
-    cand.ptCurrentPos.x = rect.x;
-    cand.ptCurrentPos.y = rect.y;
-    cand.rcArea         = rect;
-    ImmSetCandidateWindow(ctx, &cand);
-
-    COMPOSITIONFORM comp;
-    comp.dwStyle        = CFS_RECT;
-    comp.ptCurrentPos.x = rect.x;
-    comp.ptCurrentPos.y = rect.y;
-    comp.rcArea         = rect;
-    ImmSetCompositionWindow(ctx, &comp);
-}
-
-PreEditRect InputContextImpl::getPreEditRect()
-{
-    return this->rect;
-}
-
 void InputContextImpl::setActivated(const bool activated)
 {
     if (activated == this->activated) return;

src/InputContextImpl.cpp

@@ -2,25 +2,6 @@
 
 namespace IngameIME
 {
-InternalRect::operator RECT() noexcept
-{
-    RECT rect;
-    rect.left   = this->x;
-    rect.top    = this->y;
-    rect.right  = this->x + this->width;
-    rect.bottom = this->y + this->height;
-
-    return rect;
-}
-
-InternalRect::InternalRect(const PreEditRect& rect)
-{
-    this->x      = rect.x;
-    this->y      = rect.y;
-    this->width  = rect.width;
-    this->height = rect.height;
-}
-
 std::string ToUTF8(std::wstring utf16)
 {
     if (utf16.empty())
@@ -32,5 +13,4 @@ std::string ToUTF8(std::wstring utf16)
     WideCharToMultiByte(CP_UTF8, 0, &utf16[0], (int)utf16.size(), &strTo[0], size_needed, NULL, NULL);
     return strTo;
 }
-
 } // namespace IngameIME

src/TfContextOwner.cpp

@@ -36,11 +36,7 @@ HRESULT STDMETHODCALLTYPE ContextOwner::GetACPFromPoint(const POINT* ptScreen, D
 
 HRESULT STDMETHODCALLTYPE ContextOwner::GetTextExt(LONG acpStart, LONG acpEnd, RECT* prc, BOOL* pfClipped)
 {
-    InternalRect rect = inputCtx->getPreEditRect();
-    *prc              = rect;
-    // Map window coordinate to screen coordinate
-    MapWindowPoints(inputCtx->hWnd, NULL, (LPPOINT)prc, 2);
-    return S_OK;
+    return TS_E_NOLAYOUT;
 }
 
 HRESULT STDMETHODCALLTYPE ContextOwner::GetScreenExt(RECT* prc)

src/TfInputContextImpl.cpp

@@ -59,16 +59,6 @@ InputMode InputContextImpl::getInputMode()
     return h_mode->inputMode;
 }
 
-void InputContextImpl::setPreEditRect(const PreEditRect& rect)
-{
-    this->rect = rect;
-}
-
-PreEditRect InputContextImpl::getPreEditRect()
-{
-    return rect;
-}
-
 void InputContextImpl::setActivated(const bool activated)
 {
     COM_HR_BEGIN(S_OK);