切换进程时，实时更新托盘图标

Techince · Mar 3, 2024 · 413cdf1 · 413cdf1
1 parent f0c0391
commit 413cdf1
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 44 deletions.
diff --git a/WeaselSetup/InstallOptionsDialog.h b/WeaselSetup/InstallOptionsDialog.h
@@ -34,10 +34,6 @@ class InstallOptionsDialog : public CDialogImpl<InstallOptionsDialog>
 	LRESULT OnUseCustomDir(WORD, WORD code, HWND, BOOL&);
 	LRESULT OnBrowser(WORD, WORD code, HWND, BOOL&);
 
-	void UpdateWidgets();
-	void Modify();
-	void ResetServer();
-
 	CButton cn_;
 	CButton tw_;
 	CButton remove_;

diff --git a/WeaselSetup/WeaselSetup.rc b/WeaselSetup/WeaselSetup.rc
diff --git a/WeaselSetup/imesetup.cpp b/WeaselSetup/imesetup.cpp
@@ -165,7 +165,7 @@ int uninstall_ime_file(const std::wstring& ext, bool silent, ime_register_func f
 	GetSystemWow64Directory(path, _countof(path));
 	imePath = path;
 	imePath += L"\\weasel" + ext;
-	retval += func(imePath, false, true, false, silent);	
+	retval += func(imePath, false, true, false, silent);
 
 	if (!delete_file(imePath))
 	{

diff --git a/WeaselSetup/imesetup.h b/WeaselSetup/imesetup.h
@@ -0,0 +1,6 @@
+#pragma once
+
+extern const GUID c_clsidTextService;
+
+void enable_profile(BOOL fEnable, bool hant, const GUID& clsidTextServicee);
+int register_text_service(const std::wstring& tsf_path, bool register_ime, bool is_wow64, bool hant, bool silent, const GUID& clsidTextService);
diff --git a/WeaselSetup/resource.h b/WeaselSetup/resource.h
diff --git a/WeaselTSF/LanguageBarTSF.cpp b/WeaselTSF/LanguageBarTSF.cpp
@@ -3,7 +3,6 @@ module;
 #include "Globals.h"
 #include "ctffunc.h"
 #include <format>
-#include <thread>
 #include <shellapi.h>
 #include "resource.h"
 module WeaselTSF;
@@ -55,8 +54,8 @@ void WeaselTSF::_HandleLangBarMenuSelect(UINT wID)
 	{
 		Flip(WeaselFlag::DAEMON_ENABLE);
 		UpdateGlobalCompartment();
-	}
-	break;
+		break;
+	}	
 
 	case ID_STYLE_CARET_FOLLOWING:
 		_bitset.flip(static_cast<int>(WeaselFlag::CARET_FOLLOWING));
@@ -73,10 +72,7 @@ void WeaselTSF::_HandleLangBarMenuSelect(UINT wID)
 		break;
 
 	case ID_WEASELTRAY_RERUN_SERVICE:
-	{
-		std::wstring rootPath{ WeaselRootPath() };
-		ShellExecuteW(nullptr, L"open", std::format(LR"({}\start_service.bat)", rootPath).data(), NULL, rootPath.data(), SW_HIDE);
-	}
+		execute(std::format(LR"({}\WeaselServer.exe)", WeaselRootPath()));
 		break;
 
 	DEFAULT:

diff --git a/WeaselTSF/ThreadFocusSink.cpp b/WeaselTSF/ThreadFocusSink.cpp
@@ -1,50 +1,31 @@
 module;
 #include "stdafx.h"
 #include "test.h"
-#ifdef TEST
-#define WEASEL_ENABLE_LOGGING
-#include "logging.h"
-#endif // TEST
 module WeaselTSF;
 import CandidateList;
+import ResponseParser;
 
 STDMETHODIMP WeaselTSF::OnSetThreadFocus()
 {
 #ifdef TEST
-	LOG(INFO) << std::format("From WeaselTSF::OnSetThreadFocus. _pComposition ? {:s}", (bool)_IsComposing());
+	std::wstring buffer = std::format(L"From WeaselTSF::OnSetThreadFocus(). ascii_mode = {:s}\n", _status.ascii_mode);
+	WriteConsole(buffer);
 #endif // TEST
-	if (_pComposition)
+	if (m_client.Echo())
 	{
-		com_ptr<ITfDocumentMgr> pCandidateListDocumentMgr;
-		if (SUCCEEDED(_pTextEditSinkContext->GetDocumentMgr(&pCandidateListDocumentMgr)))
-		{
-			if (pCandidateListDocumentMgr == _pDocMgrLastFocused)
-			{
-				_cand->SetThreadFocus();
-			}
-		}
+		m_client.ProcessKeyEvent(0);
+		_UpdateComposition(_pEditSessionContext);
 	}
+#ifdef TEST
+	buffer = std::format(L"From WeaselTSF::OnSetThreadFocus(). ascii_mode = {:s}\n", _status.ascii_mode);
+	WriteConsole(buffer);
+#endif // TEST
+
 	return S_OK;
 }
+
 STDMETHODIMP WeaselTSF::OnKillThreadFocus()
 {
-#ifdef TEST
-	LOG(INFO) << std::format("From WeaselTSF::OnKillThreadFocus. _pComposition ? {:s}", (bool)_IsComposing());
-#endif // TEST
-	if (_pComposition)
-	{
-		com_ptr<ITfDocumentMgr> pCandidateListDocumentMgr;
-
-		if (SUCCEEDED(_pTextEditSinkContext->GetDocumentMgr(&pCandidateListDocumentMgr)))
-		{
-			if (_pDocMgrLastFocused)
-			{
-				_pDocMgrLastFocused.Release();
-			}
-			_pDocMgrLastFocused = pCandidateListDocumentMgr;
-		}
-		_cand->KillThreadFocus();
-	}
 	return S_OK;
 }
 

diff --git a/WeaselTSF/WeaselTSF.cpp b/WeaselTSF/WeaselTSF.cpp
@@ -35,6 +35,7 @@ WeaselTSF::WeaselTSF()
 	_dwTextEditSinkCookie = TF_INVALID_COOKIE;
 	_dwTextLayoutSinkCookie = TF_INVALID_COOKIE;
 	_activeLanguageProfileNotifySinkCookie = TF_INVALID_COOKIE;
+	_dwThreadFocusSinkCookie = TF_INVALID_COOKIE;
 
 	_cand.Attach(new CCandidateList(*this));
 	SetBit(WeaselFlag::SUPPORT_DISPLAY_ATTRIBUTE);
@@ -78,6 +79,8 @@ STDAPI WeaselTSF::QueryInterface(REFIID riid, void** ppvObject)
 		*ppvObject = (ITfDisplayAttributeProvider*)this;
 	else if (IsEqualIID(riid, IID_ITfCleanupContextDurationSink))
 		*ppvObject = (ITfCleanupContextDurationSink*)this;
+	else if (IsEqualIID(riid, IID_ITfThreadFocusSink))
+		*ppvObject = (ITfThreadFocusSink*)this;
 
 	if (*ppvObject)
 	{
@@ -127,6 +130,7 @@ STDAPI WeaselTSF::Deactivate()
 		_UninitLanguageBar();
 
 	_UninitCompartment();
+	_UninitThreadFocusSink();
 
 	_tfClientId = TF_CLIENTID_NULL;
 
@@ -212,6 +216,9 @@ STDAPI WeaselTSF::ActivateEx(ITfThreadMgr* pThreadMgr, TfClientId tfClientId, DW
 	if (!_InitLanguageBar())
 		SetBit(WeaselFlag::INIT_LANGUAGEBAR_FAILED);
 
+	if (!_InitThreadFocusSink())
+		goto ExitError;
+
 #ifdef TEST
 	buffer = std::format(L"From WeaselActivateEx(). IsKeyboardOpen\n");
 	WriteConsole(buffer);

diff --git a/WeaselTSF/WeaselTSF.ixx b/WeaselTSF/WeaselTSF.ixx
@@ -25,7 +25,8 @@ export
 		public ITfActiveLanguageProfileNotifySink,
 		public ITfEditSession,
 		public ITfDisplayAttributeProvider,
-		public ITfCleanupContextDurationSink
+		public ITfCleanupContextDurationSink,
+		public ITfThreadFocusSink
 	{
 	public:
 		WeaselTSF();
@@ -77,6 +78,10 @@ export
 		STDMETHODIMP EnumDisplayAttributeInfo(__RPC__deref_out_opt IEnumTfDisplayAttributeInfo** ppEnum);
 		STDMETHODIMP GetDisplayAttributeInfo(__RPC__in REFGUID guidInfo, __RPC__deref_out_opt ITfDisplayAttributeInfo** ppInfo);
 
+		/* ITfThreadFocusSink */
+		STDMETHODIMP OnSetThreadFocus();
+		STDMETHODIMP OnKillThreadFocus();
+
 		/* ITfCompartmentEventSink */
 		// STDMETHODIMP OnChange(_In_ REFGUID guid);
 
@@ -185,6 +190,9 @@ export
 		void _ShowLanguageBar(BOOL show);
 		void _EnableLanguageBar(BOOL enable);
 
+		BOOL _InitThreadFocusSink();
+		void _UninitThreadFocusSink();
+
 		BOOL _InsertText(ITfContext* pContext, std::wstring_view text);
 
 		void _DeleteCandidateList();
@@ -250,6 +258,8 @@ export
 		// The cookie of ActiveLanguageProfileNotifySink
 		DWORD _activeLanguageProfileNotifySinkCookie;
 
+		DWORD _dwThreadFocusSinkCookie;
+
 		RECT m_rcFallback{};
 		HWND m_hwnd{};
 		std::bitset<32> _bitset{};

diff --git a/WeaselTSF/WeaselTSF.vcxproj b/WeaselTSF/WeaselTSF.vcxproj
@@ -466,6 +466,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="TextEditSink.cpp" />
+    <ClCompile Include="ThreadFocusSink.cpp" />
     <ClCompile Include="ThreadMgrEventSink.cpp" />
     <ClCompile Include="WeaselFlag.ixx" />
     <ClCompile Include="WeaselTSF.cpp" />

diff --git a/WeaselTSF/WeaselTSF.vcxproj.filters b/WeaselTSF/WeaselTSF.vcxproj.filters
@@ -127,6 +127,9 @@
     <ClCompile Include="CleanupContextDurationSink.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ThreadFocusSink.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">