fix: async editing flicker, esp example in Word 365(#1155)

* attempt to fix async editing. * Update KeyEventSink.cpp: fix typo * DestroyWindow after click_to_select callback called, avoid memory leaking
rime · Apr 21, 2024 · 0544104 · 0544104
1 parent f877364
commit 0544104
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/WeaselTSF/Composition.cpp b/WeaselTSF/Composition.cpp
@@ -79,7 +79,7 @@ void WeaselTSF::_StartComposition(com_ptr<ITfContext> pContext,
   if (pStartCompositionEditSession != nullptr) {
     HRESULT hr;
     pContext->RequestEditSession(_tfClientId, pStartCompositionEditSession,
-                                 TF_ES_SYNC | TF_ES_READWRITE, &hr);
+                                 TF_ES_ASYNCDONTCARE | TF_ES_READWRITE, &hr);
   }
 }
 
@@ -126,7 +126,7 @@ void WeaselTSF::_EndComposition(com_ptr<ITfContext> pContext, BOOL clear) {
   if ((pEditSession = new CEndCompositionEditSession(
            this, pContext, _pComposition, clear)) != NULL) {
     pContext->RequestEditSession(_tfClientId, pEditSession,
-                                 TF_ES_SYNC | TF_ES_READWRITE, &hr);
+                                 TF_ES_ASYNCDONTCARE | TF_ES_READWRITE, &hr);
     pEditSession->Release();
   }
 }
@@ -222,7 +222,7 @@ BOOL WeaselTSF::_UpdateCompositionWindow(com_ptr<ITfContext> pContext) {
   }
   HRESULT hr;
   pContext->RequestEditSession(_tfClientId, pEditSession,
-                               TF_ES_SYNC | TF_ES_READ, &hr);
+                               TF_ES_ASYNCDONTCARE | TF_ES_READ, &hr);
   return SUCCEEDED(hr);
 }
 
@@ -384,6 +384,7 @@ void WeaselTSF::_UpdateComposition(com_ptr<ITfContext> pContext) {
 
   _pEditSessionContext->RequestEditSession(
       _tfClientId, this, TF_ES_ASYNCDONTCARE | TF_ES_READWRITE, &hr);
+  _async_edit = !!(hr == TF_S_ASYNC);
   _UpdateCompositionWindow(pContext);
 }
 

diff --git a/WeaselTSF/KeyEventSink.cpp b/WeaselTSF/KeyEventSink.cpp
@@ -104,7 +104,8 @@ STDAPI WeaselTSF::OnKeyUp(ITfContext* pContext,
     *pfEaten = TRUE;
   } else {
     _ProcessKeyEvent(wParam, lParam, pfEaten);
-    _UpdateComposition(pContext);
+    if (!_async_edit)
+      _UpdateComposition(pContext);
   }
   return S_OK;
 }

diff --git a/WeaselTSF/WeaselTSF.h b/WeaselTSF/WeaselTSF.h
@@ -223,4 +223,5 @@ class WeaselTSF : public ITfTextInputProcessorEx,
 
   // guidatom for the display attibute.
   TfGuidAtom _gaDisplayAttributeInput;
+  BOOL _async_edit = false;
 };
diff --git a/WeaselUI/WeaselPanel.cpp b/WeaselUI/WeaselPanel.cpp
@@ -262,8 +262,10 @@ LRESULT WeaselPanel::OnLeftClickedUp(UINT uMsg,
     rect.InflateRect(m_style.hilite_padding_x, m_style.hilite_padding_y);
     if (rect.PtInRect(point)) {
       size_t i = m_ctx.cinfo.highlighted;
-      if (_UICallback)
+      if (_UICallback) {
         _UICallback(&i, NULL, NULL, NULL);
+        DestroyWindow();
+      }
     } else {
       RedrawWindow();
     }