Commit: b48f885d91b15ee2bccbabaf2793d7b104dd2e04 - xkeymacs64 (git)

XKeymacs for 64bit Windows

Commit MetaInfo

• Revision: b48f885d91b15ee2bccbabaf2793d7b104dd2e04 (tree)
• Time: 2011-05-27 08:38:36
• Author: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

CMainFrame handles notify icons instead of CXkeymacsDll.

CXkeymacsDll changes notify icons through a named pipe.
It changes all modifier icons and the M-x tip at the same time.
CMainFrame creates a thread to receive messages from CXkeymacsDll.

Change Summary

• modified: xkeymacs/mainfrm.cpp
• modified: xkeymacs/mainfrm.h
• modified: xkeymacs/optionsdlg.cpp
• modified: xkeymacsdll/Commands.cpp
• add: xkeymacsdll/ipc.h
• modified: xkeymacsdll/xkeymacsdll-vc10.vcxproj
• modified: xkeymacsdll/xkeymacsdll-vc10.vcxproj.filters
• modified: xkeymacsdll/xkeymacsdll.cpp
• modified: xkeymacsdll/xkeymacsdll.h

Incremental Difference

--- a/xkeymacs/mainfrm.cpp
+++ b/xkeymacs/mainfrm.cpp
@@ -5,7 +5,6 @@
 #include <Lmcons.h>
 #include "xkeymacs.h"
 #include "Profile.h"
-
 #include "MainFrm.h"
 
 #ifdef _DEBUG
@@ -60,6 +59,8 @@ CMainFrame::CMainFrame()
 	}
 	memset(m_nResultKeyboardDlg, -1, sizeof(m_nResultKeyboardDlg));
 	memset(m_bKeyboardDlgExist, 0, sizeof(m_bKeyboardDlgExist));
+	memset(m_stOldNtfyIcon, 0, sizeof(m_stOldNtfyIcon));
+	memset(m_dwOldMessage, 0, sizeof(m_dwOldMessage));
 
 	// register window class
 	WNDCLASS	stWndClass;
@@ -145,43 +146,56 @@ int CMainFrame::OnCreate(const LPCREATESTRUCT lpCreateStruct)
 			   sizeof(notifyIconData[ALT_ICON].szTip));
 
 	// set notify icon data
-	CXkeymacsDll::SetNotifyIconData(MAIN_ICON, notifyIconData[MAIN_ICON],
-		(HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAINFRAME), IMAGE_ICON, 16, 16, LR_SHARED),
-		(HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAIN_DISABLE_TMP), IMAGE_ICON, 16, 16, LR_SHARED),
-		(HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAIN_DISABLE_WOCQ), IMAGE_ICON, 16, 16, LR_SHARED),		// disable without C-q
-		(HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAIN_DISABLE), IMAGE_ICON, 16, 16, LR_SHARED),
-		AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_MAIN)), 1));
+	m_hIcon[MAIN_ICON][STATUS_ENABLE] = (HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAINFRAME), IMAGE_ICON, 16, 16, LR_SHARED),
+	m_hIcon[MAIN_ICON][STATUS_DISABLE_TMP] = (HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAIN_DISABLE_TMP), IMAGE_ICON, 16, 16, LR_SHARED);
+	m_hIcon[MAIN_ICON][STATUS_DISABLE_WOCQ] = (HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAIN_DISABLE_WOCQ), IMAGE_ICON, 16, 16, LR_SHARED);
+	m_hIcon[MAIN_ICON][STATUS_DISABLE] = (HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAIN_DISABLE), IMAGE_ICON, 16, 16, LR_SHARED);
+	m_bIcon[MAIN_ICON] = AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_MAIN)), 1);
+	m_stNtfyIcon[MAIN_ICON] = notifyIconData[MAIN_ICON];
+	AddShell_NotifyIcon(MAIN_ICON);
 
 	// set notify ^X icon data
-	CXkeymacsDll::SetNotifyIconData(CX_ICON, notifyIconData[CX_ICON], AfxGetApp()->LoadIcon(IDI_CX_ON),
-									  AfxGetApp()->LoadIcon(IDI_CX_OFF),
-									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CX)), 0));
+	m_hIcon[CX_ICON][ON_ICON] = AfxGetApp()->LoadIcon(IDI_CX_ON);
+	m_hIcon[CX_ICON][OFF_ICON] = AfxGetApp()->LoadIcon(IDI_CX_OFF);
+	m_bIcon[CX_ICON] = AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CX)), 0);
+	m_stNtfyIcon[CX_ICON] = notifyIconData[CX_ICON];
+	AddShell_NotifyIcon(CX_ICON);
 
 	// set notify M-x icon data
-	CXkeymacsDll::SetNotifyIconData(MX_ICON, notifyIconData[MX_ICON], AfxGetApp()->LoadIcon(IDI_MX_ON),
-									  AfxGetApp()->LoadIcon(IDI_MX_OFF),
-									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_MX)), 0));
+	m_hIcon[MX_ICON][ON_ICON] = AfxGetApp()->LoadIcon(IDI_MX_ON);
+	m_hIcon[MX_ICON][OFF_ICON] = AfxGetApp()->LoadIcon(IDI_MX_OFF);
+	m_bIcon[MX_ICON] = AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_MX)), 0);
+	m_stNtfyIcon[MX_ICON] = notifyIconData[MX_ICON];
+	AddShell_NotifyIcon(MX_ICON);
 
 	// set notify Meta icon data
-	CXkeymacsDll::SetNotifyIconData(META_ICON, notifyIconData[META_ICON], AfxGetApp()->LoadIcon(IDI_META_ON),
-									  AfxGetApp()->LoadIcon(IDI_META_OFF),
-									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_META)), 0));
+	m_hIcon[META_ICON][ON_ICON] = AfxGetApp()->LoadIcon(IDI_META_ON);
+	m_hIcon[META_ICON][OFF_ICON] = AfxGetApp()->LoadIcon(IDI_META_OFF);
+	m_bIcon[META_ICON] = AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_META)), 0);
+	m_stNtfyIcon[META_ICON] = notifyIconData[META_ICON];
+	AddShell_NotifyIcon(META_ICON);
 
 	// set notify Shift icon data
-	CXkeymacsDll::SetNotifyIconData(SHIFT_ICON, notifyIconData[SHIFT_ICON], AfxGetApp()->LoadIcon(IDI_SHIFT_ON),
-									  AfxGetApp()->LoadIcon(IDI_SHIFT_OFF),
-									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_SHIFT)), 0));
+	m_hIcon[SHIFT_ICON][ON_ICON] = AfxGetApp()->LoadIcon(IDI_SHIFT_ON);
+	m_hIcon[SHIFT_ICON][OFF_ICON] = AfxGetApp()->LoadIcon(IDI_SHIFT_OFF);
+	m_bIcon[SHIFT_ICON] = AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_SHIFT)), 0);
+	m_stNtfyIcon[SHIFT_ICON] = notifyIconData[SHIFT_ICON];
+	AddShell_NotifyIcon(SHIFT_ICON);
 
 	// set notify Ctrl icon data
-	CXkeymacsDll::SetNotifyIconData(CTRL_ICON, notifyIconData[CTRL_ICON], AfxGetApp()->LoadIcon(IDI_CTRL_ON),
-									  AfxGetApp()->LoadIcon(IDI_CTRL_OFF),
-									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CTRL)), 0));
+	m_hIcon[CTRL_ICON][ON_ICON] = AfxGetApp()->LoadIcon(IDI_CTRL_ON);
+	m_hIcon[CTRL_ICON][OFF_ICON] = AfxGetApp()->LoadIcon(IDI_CTRL_OFF);
+	m_bIcon[CTRL_ICON] = AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CTRL)), 0);
+	m_stNtfyIcon[CTRL_ICON] = notifyIconData[CTRL_ICON];
+	AddShell_NotifyIcon(CTRL_ICON);
 
 	// set notify Alt icon data
-	CXkeymacsDll::SetNotifyIconData(ALT_ICON, notifyIconData[ALT_ICON], AfxGetApp()->LoadIcon(IDI_ALT_ON),
-									  AfxGetApp()->LoadIcon(IDI_ALT_OFF),
-									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ALT)), 0));
-
+	m_hIcon[ALT_ICON][ON_ICON] = AfxGetApp()->LoadIcon(IDI_ALT_ON);
+	m_hIcon[ALT_ICON][OFF_ICON] = AfxGetApp()->LoadIcon(IDI_ALT_OFF);
+	m_bIcon[ALT_ICON] = AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ALT)), 0);
+	m_stNtfyIcon[ALT_ICON] = notifyIconData[ALT_ICON];
+	AddShell_NotifyIcon(ALT_ICON);
+	
 	CXkeymacsDll::SetKeyboardSpeed(CProfile::GetKeyboardSpeed());
 	CXkeymacsDll::SetAccelerate(AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ACCELERATE)), 1));
 
@@ -192,10 +206,114 @@ int CMainFrame::OnCreate(const LPCREATESTRUCT lpCreateStruct)
 								  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CHANGE_CURSOR)), 0));
 
 	CXkeymacsDll::SetHooks();
+	StartPollThread();
+
+	return 0;
+}
+
+void CMainFrame::StartPollThread()
+{
+	m_bPollIconMessage = TRUE;
+	m_hThread = CreateThread(NULL, 0, PollIconMessage, this, 0, NULL);
+}
+
+void CMainFrame::TerminatePollThread()
+{
+	m_bPollIconMessage = FALSE;
+	ICONMSG nul = {MAIN_ICON,};
+	if (CXkeymacsDll::SendIconMessage(&nul, 1))
+		WaitForSingleObject(m_hThread, 5000);
+	CloseHandle(m_hThread);
+}
 
+DWORD WINAPI CMainFrame::PollIconMessage(LPVOID lpParam)
+{
+	CMainFrame *pThis = reinterpret_cast<CMainFrame *>(lpParam);
+	HANDLE hPipe = CreateNamedPipe(ICON_PIPE, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, 1,
+									sizeof(DWORD), sizeof(ICONMSG) * MAX_ICON_TYPE, 0, NULL);
+	if (hPipe == INVALID_HANDLE_VALUE)
+		return 1;
+	for (; ;) {
+		if (ConnectNamedPipe(hPipe, NULL) ? FALSE : (GetLastError() != ERROR_PIPE_CONNECTED))
+			break;
+		ICONMSG msg[MAX_ICON_TYPE];
+		DWORD read;
+		if (!ReadFile(hPipe, msg, sizeof(msg), &read, NULL))
+			break;
+		DWORD written, ack = 0;
+		// return ack ASAP to release hooks from blocking state.
+		if (!WriteFile(hPipe, &ack, sizeof(DWORD), &written, NULL) || written != sizeof(DWORD) ||
+				!FlushFileBuffers(hPipe) || !DisconnectNamedPipe(hPipe))
+			break;
+		if (!pThis->m_bPollIconMessage)
+			break;
+		for (DWORD i = 0; i < read / sizeof(ICONMSG); i++) {
+			pThis->m_stNtfyIcon[msg[i].nType].hIcon = pThis->m_hIcon[msg[i].nType][msg[i].nState];
+			if (msg[i].nType == MX_ICON && msg[i].szTip[0] != 0)
+				memcpy(pThis->m_stNtfyIcon[MX_ICON].szTip, msg[i].szTip, 128);
+			pThis->DoShell_NotifyIcon(msg[i].nType, NIM_MODIFY);
+		}
+	}
+	CloseHandle(hPipe);
 	return 0;
 }
 
+BOOL CMainFrame::DoShell_NotifyIcon(ICON_TYPE icon, DWORD dwMessage)
+{
+	if (m_bIcon[icon]
+	 &&	(m_dwOldMessage[icon] != dwMessage
+	  || memcmp(&m_stOldNtfyIcon[icon], &m_stNtfyIcon[icon], sizeof(m_stNtfyIcon[icon])))) {
+		m_dwOldMessage[icon] = dwMessage;
+		m_stOldNtfyIcon[icon] = m_stNtfyIcon[icon];
+
+		BOOL rc = FALSE;
+		for (int retry_count = 0; retry_count < 20; ++retry_count) { // retry for timeout
+			rc = Shell_NotifyIcon(dwMessage, &m_stNtfyIcon[icon]);
+			if (dwMessage != NIM_ADD || rc || (GetLastError() != ERROR_TIMEOUT && 5 < retry_count)) {
+				break;
+			}
+			Sleep(1000); // 1sec
+			if ((rc = Shell_NotifyIcon(NIM_MODIFY, &m_stNtfyIcon[icon])) != FALSE) {
+				break; // ERROR_TIMEOUT was returned but the icon was also added.
+			}
+		}
+		return rc;
+	} else {
+		return TRUE;
+	}
+}
+
+void CMainFrame::EnableShell_NotifyIcon(ICON_TYPE icon, BOOL bEnable)
+{
+	DeleteShell_NotifyIcon(icon);
+	m_bIcon[icon] = bEnable;
+	AddShell_NotifyIcon(icon);
+}
+
+void CMainFrame::AddShell_NotifyIcon(ICON_TYPE icon)
+{
+	DoShell_NotifyIcon(icon, NIM_ADD);
+}
+
+void CMainFrame::DeleteShell_NotifyIcon(ICON_TYPE icon)
+{
+	DoShell_NotifyIcon(icon, NIM_DELETE);
+}
+
+void CMainFrame::DeleteAllShell_NotifyIcon()
+{
+	for (int icon = 0; icon < MAX_ICON_TYPE; ++icon) {
+		DeleteShell_NotifyIcon((ICON_TYPE)icon);
+	}
+}
+
+void CMainFrame::AddAllShell_NotifyIcon()
+{
+	for (int icon = 0; icon < MAX_ICON_TYPE; ++icon) {
+		AddShell_NotifyIcon((ICON_TYPE)icon);
+	}
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // CMainFrame diagnostics
 
@@ -355,7 +473,7 @@ LRESULT CMainFrame::WindowProc(const UINT message, const WPARAM wParam, const LP
 		}
 	default:
 		if (message == s_uTaskbarRestart) {
-			CXkeymacsDll::AddAllShell_NotifyIcon();
+			AddAllShell_NotifyIcon();
 		}
 		break;
 	}
@@ -408,7 +526,8 @@ void CMainFrame::OnQuit()
 	}
 
 	CXkeymacsDll::ReleaseHooks();
-	CXkeymacsDll::DeleteAllShell_NotifyIcon();
+	TerminatePollThread();
+	DeleteAllShell_NotifyIcon();
 
 	PostQuitMessage(0);
 }
@@ -457,6 +576,8 @@ void CMainFrame::OnReset()
 {
 	CXkeymacsDll::ReleaseHooks();
 	CXkeymacsDll::SetHooks();
+	TerminatePollThread();
+	StartPollThread();
 }
 
 void CMainFrame::OnHelpFinder() 

--- a/xkeymacs/mainfrm.h
+++ b/xkeymacs/mainfrm.h
@@ -87,6 +87,24 @@ private:
 	int	m_nResultAboutDlg;
 	int m_nResultPropertiesDlg;
 	CProperties *m_pPropertiesDlg;
+	// notify icons
+	BOOL m_bIcon[MAX_ICON_TYPE];
+	HICON m_hIcon[MAX_ICON_TYPE][MAX_STATUS];
+	DWORD m_dwOldMessage[MAX_ICON_TYPE];
+	NOTIFYICONDATA m_stNtfyIcon[MAX_ICON_TYPE];
+	NOTIFYICONDATA m_stOldNtfyIcon[MAX_ICON_TYPE];
+	void AddShell_NotifyIcon(ICON_TYPE icon);
+	void DeleteShell_NotifyIcon(ICON_TYPE icon);
+	BOOL DoShell_NotifyIcon(ICON_TYPE icon, DWORD dwMessage);
+	void DeleteAllShell_NotifyIcon();
+	void AddAllShell_NotifyIcon();
+	BOOL m_bPollIconMessage;
+	HANDLE m_hThread;
+	void StartPollThread();
+	void TerminatePollThread();
+	static DWORD WINAPI PollIconMessage(LPVOID lpParam);
+public:
+	void EnableShell_NotifyIcon(ICON_TYPE icon, BOOL bEnable);
 };
 
 /////////////////////////////////////////////////////////////////////////////

--- a/xkeymacs/optionsdlg.cpp
+++ b/xkeymacs/optionsdlg.cpp
@@ -160,12 +160,13 @@ void COptionsDlg::OnOK()
 		AfxGetApp()->WriteProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ALT)), m_cAlt.GetCheck());
 
 		// set dll data
-		CXkeymacsDll::EnableShell_NotifyIcon(CX_ICON, m_cCx.GetCheck());
-		CXkeymacsDll::EnableShell_NotifyIcon(MX_ICON, m_cMx.GetCheck());
-		CXkeymacsDll::EnableShell_NotifyIcon(META_ICON, m_cM_.GetCheck());
-		CXkeymacsDll::EnableShell_NotifyIcon(SHIFT_ICON, m_cShift.GetCheck());
-		CXkeymacsDll::EnableShell_NotifyIcon(CTRL_ICON, m_cCtrl.GetCheck());
-		CXkeymacsDll::EnableShell_NotifyIcon(ALT_ICON, m_cAlt.GetCheck());
+		CMainFrame *pMainFrame = static_cast<CMainFrame*>(AfxGetMainWnd());
+		pMainFrame->EnableShell_NotifyIcon(CX_ICON, m_cCx.GetCheck());
+		pMainFrame->EnableShell_NotifyIcon(MX_ICON, m_cMx.GetCheck());
+		pMainFrame->EnableShell_NotifyIcon(META_ICON, m_cM_.GetCheck());
+		pMainFrame->EnableShell_NotifyIcon(SHIFT_ICON, m_cShift.GetCheck());
+		pMainFrame->EnableShell_NotifyIcon(CTRL_ICON, m_cCtrl.GetCheck());
+		pMainFrame->EnableShell_NotifyIcon(ALT_ICON, m_cAlt.GetCheck());
 	}
 
 	CDialog::OnOK();

--- a/xkeymacsdll/Commands.cpp
+++ b/xkeymacsdll/Commands.cpp
@@ -1600,7 +1600,6 @@ BOOL CCommands::bC_()
 void CCommands::bC_(BOOL b)
 {
 	m_bC_ = b;
-	CXkeymacsDll::ModifyShell_NotifyIcon(CTRL_ICON, m_bC_);
 }
 
 BOOL CCommands::bC_x()
@@ -1611,7 +1610,6 @@ BOOL CCommands::bC_x()
 void CCommands::bC_x(BOOL b)
 {
 	m_bC_x = b;
-	CXkeymacsDll::ModifyShell_NotifyIcon(CX_ICON, m_bC_x);
 }
 
 BOOL CCommands::bM_x()
@@ -1624,9 +1622,9 @@ void CCommands::bM_x(const BOOL b)
 	m_bM_x = b;
 
 	if (b) {
-		CXkeymacsDll::ModifyM_xTip("");
+		CXkeymacsDll::SetM_xTip("");
 	} else {
-		CXkeymacsDll::ModifyM_xTip(NULL);
+		CXkeymacsDll::SetM_xTip(NULL);
 	}
 }
 
@@ -1804,7 +1802,6 @@ int CCommands::Ignore()
 void CCommands::bM_(BOOL b)
 {
 	m_bM_ = b;
-	CXkeymacsDll::ModifyShell_NotifyIcon(META_ICON, m_bM_);
 }
 
 BOOL CCommands::bM_()

--- /dev/null
+++ b/xkeymacsdll/ipc.h
@@ -0,0 +1,15 @@
+#ifndef IPC_H_INCLUDED
+#define IPC_H_INCLUDED
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+struct ICONMSG {
+	ICON_TYPE nType;
+	int nState;
+	TCHAR szTip[128];
+};
+
+#define ICON_PIPE _T("\\\\.\\pipe\\XKEYMACS_ICON")
+#endif

--- a/xkeymacsdll/xkeymacsdll-vc10.vcxproj
+++ b/xkeymacsdll/xkeymacsdll-vc10.vcxproj
@@ -200,6 +200,7 @@
     <ClInclude Include="ClipboardSnap.h" />
     <ClInclude Include="Commands.h" />
     <ClInclude Include="FunctionDefinition.h" />
+    <ClInclude Include="ipc.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="StdAfx.h" />
     <ClInclude Include="Utils.h" />

--- a/xkeymacsdll/xkeymacsdll-vc10.vcxproj.filters
+++ b/xkeymacsdll/xkeymacsdll-vc10.vcxproj.filters
@@ -70,6 +70,9 @@
     <ClInclude Include="xkeymacsdll.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ipc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="xkeymacsdll.rc">

--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -152,7 +152,7 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 	switch (dwReason) {
 	case DLL_PROCESS_ATTACH:
 		TRACE0("XKEYMACSDLL.DLL Initializing!\n");
-		
+
 		// Extension DLL one-time initialization
 		if (!AfxInitExtensionModule(XkeymacsdllDLL, hInstance)) {
 			return 0;
@@ -211,11 +211,6 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 	BOOL	CXkeymacsDll::m_bRightShift		= FALSE;
 	BOOL	CXkeymacsDll::m_bHook			= TRUE;
 	BOOL	CXkeymacsDll::m_bDefiningMacro	= FALSE;
-	DWORD	CXkeymacsDll::m_dwOldMessage[MAX_ICON_TYPE] = {'\0'};
-	NOTIFYICONDATA CXkeymacsDll::m_stNtfyIcon[MAX_ICON_TYPE] = {'\0'};
-	NOTIFYICONDATA CXkeymacsDll::m_stOldNtfyIcon[MAX_ICON_TYPE] = {'\0'};
-	HICON	CXkeymacsDll::m_hIcon[MAX_ICON_TYPE][MAX_STATUS] = {'\0'};
-	BOOL	CXkeymacsDll::m_bIcon[MAX_ICON_TYPE] = {'\0'};
 	int		CXkeymacsDll::m_nKillRingMax[MAX_APP] = {'\0'};
 	BOOL	CXkeymacsDll::m_bUseDialogSetting[MAX_APP] = {'\0'};
 	CList<CClipboardSnap *, CClipboardSnap *> CXkeymacsDll::m_oKillRing;
@@ -238,6 +233,7 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 	BOOL	CXkeymacsDll::m_bCursor = FALSE;
 	BOOL	CXkeymacsDll::m_b326Compatible[MAX_APP] = {'\0'};
 	BOOL	CXkeymacsDll::m_b106Keyboard = FALSE;
+	TCHAR	CXkeymacsDll::m_M_xTip[128] = "";
 #pragma data_seg()
 
 //////////////////////////////////////////////////////////////////////
@@ -254,81 +250,6 @@ CXkeymacsDll::~CXkeymacsDll()
 
 }
 
-int CXkeymacsDll::ModifyShell_NotifyIcon(ICON_TYPE icon, BOOL bNewStatus, BOOL bForce)
-{
-	if (m_stNtfyIcon[icon].hIcon == (bNewStatus ? m_hIcon[icon][ON_ICON] : m_hIcon[icon][OFF_ICON])) {
-		if (!bForce) {
-			return TRUE;
-		}
-	} else {
-		m_stNtfyIcon[icon].hIcon = (bNewStatus ? m_hIcon[icon][ON_ICON] : m_hIcon[icon][OFF_ICON]);
-	}
-	return DoShell_NotifyIcon(icon, NIM_MODIFY);
-}
-
-void CXkeymacsDll::SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hEnable, HICON hDisableTMP, HICON hDisableWOCQ, HICON hDisable, BOOL bEnable)
-{
-	m_hIcon[icon][STATUS_ENABLE] = hEnable;
-	m_hIcon[icon][STATUS_DISABLE_TMP] = hDisableTMP;
-	m_hIcon[icon][STATUS_DISABLE_WOCQ] = hDisableWOCQ;
-	m_hIcon[icon][STATUS_DISABLE] = hDisable;
-	m_bIcon[icon] = bEnable;
-	m_stNtfyIcon[icon] = stNtfyIcon;
-	AddShell_NotifyIcon(icon);
-}
-
-void CXkeymacsDll::SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hOn, HICON hOff, BOOL bEnable)
-{
-	m_hIcon[icon][ON_ICON] = hOn;
-	m_hIcon[icon][OFF_ICON] = hOff;
-	m_bIcon[icon] = bEnable;
-	m_stNtfyIcon[icon] = stNtfyIcon;
-	AddShell_NotifyIcon(icon);
-}
-
-void CXkeymacsDll::EnableShell_NotifyIcon(ICON_TYPE icon, BOOL bEnable)
-{
-	DeleteShell_NotifyIcon(icon);
-	m_bIcon[icon] = bEnable;
-	AddShell_NotifyIcon(icon);
-}
-
-
-BOOL CXkeymacsDll::DoShell_NotifyIcon(ICON_TYPE icon, DWORD dwMessage)
-{
-	if (m_bIcon[icon]
-	 &&	(m_dwOldMessage[icon] != dwMessage
-	  || memcmp(&m_stOldNtfyIcon[icon], &m_stNtfyIcon[icon], sizeof(m_stNtfyIcon[icon])))) {
-		m_dwOldMessage[icon] = dwMessage;
-		m_stOldNtfyIcon[icon] = m_stNtfyIcon[icon];
-
-		BOOL rc = FALSE;
-		for (int retry_count = 0; retry_count < 20; ++retry_count) { // retry for timeout
-			rc = Shell_NotifyIcon(dwMessage, &m_stNtfyIcon[icon]);
-			if (dwMessage != NIM_ADD || rc || (GetLastError() != ERROR_TIMEOUT && 5 < retry_count)) {
-				break;
-			}
-			Sleep(1000); // 1sec
-			if ((rc = Shell_NotifyIcon(NIM_MODIFY, &m_stNtfyIcon[icon])) != FALSE) {
-				break; // ERROR_TIMEOUT was returned but the icon was also added.
-			}
-		}
-		return rc;
-	} else {
-		return TRUE;
-	}
-}
-
-void CXkeymacsDll::AddShell_NotifyIcon(ICON_TYPE icon)
-{
-	DoShell_NotifyIcon(icon, NIM_ADD);
-}
-
-void CXkeymacsDll::DeleteShell_NotifyIcon(ICON_TYPE icon)
-{
-	DoShell_NotifyIcon(icon, NIM_DELETE);
-}
-
 // set hooks
 void CXkeymacsDll::SetHooks()
 {
@@ -373,26 +294,25 @@ void CXkeymacsDll::ReleaseKeyboardHook()
 void CXkeymacsDll::SetKeyboardHookFlag(BOOL bFlag)
 {
 	m_bHook = bFlag;
-
+	ICONMSG msg = {MAIN_ICON,};
 	if (m_bHook) {
 		if (CCommands::IsTemporarilyDisableXKeymacs()) {
-			m_stNtfyIcon[MAIN_ICON].hIcon = m_hIcon[MAIN_ICON][STATUS_DISABLE_TMP];
+			msg.nState = STATUS_DISABLE_TMP;
 			m_hCurrentCursor = m_hCursor[STATUS_DISABLE_TMP];
 		} else {
-			m_stNtfyIcon[MAIN_ICON].hIcon = m_hIcon[MAIN_ICON][STATUS_ENABLE];
+			msg.nState = STATUS_ENABLE;
 			m_hCurrentCursor = m_hCursor[STATUS_ENABLE];
 		}
 	} else {
-		m_stNtfyIcon[MAIN_ICON].hIcon = m_hIcon[MAIN_ICON][STATUS_DISABLE_WOCQ];
-		m_hCurrentCursor = m_hCursor[STATUS_DISABLE_WOCQ];
+		msg.nState = STATUS_DISABLE_WOCQ;
 	}
 	if (m_nSettingStyle[m_nApplicationID] == SETTING_DISABLE
 	 || (!_tcsicmp(m_szSpecialApp[m_nApplicationID], _T("Default"))
 	  && CUtils::IsDefaultIgnoreApplication())) {
-		m_stNtfyIcon[MAIN_ICON].hIcon = m_hIcon[MAIN_ICON][STATUS_DISABLE];
+		msg.nState = STATUS_DISABLE;
 		m_hCurrentCursor = m_hCursor[STATUS_DISABLE];
 	}
-	DoShell_NotifyIcon(MAIN_ICON, NIM_MODIFY);
+	SendIconMessage(&msg, 1);
 	DoSetCursor();
 }
 
@@ -792,9 +712,12 @@ void CXkeymacsDll::InitKeyboardProc(BOOL bImeComposition)
 		}
 	}
 
-	ModifyShell_NotifyIcon(CX_ICON, FALSE);
-	ModifyShell_NotifyIcon(MX_ICON, FALSE);
-	ModifyShell_NotifyIcon(META_ICON, FALSE);
+	ICONMSG msg[3] = {
+		{CX_ICON, OFF_ICON, ""},
+		{MX_ICON, OFF_ICON, ""},
+		{META_ICON, OFF_ICON, ""}
+	};
+	SendIconMessage(msg, 3);
 	CCommands::SetMark(FALSE);
 	CCommands::SetTemporarilyDisableXKeymacs(FALSE);
 	CCommands::Reset();
@@ -1025,13 +948,13 @@ LRESULT CALLBACK CXkeymacsDll::KeyboardProc(int nCode, WPARAM wParam, LPARAM lPa
 			if (index) {
 				--index;
 				memmove(&szPath[index], &szPath[index + 1], _tcslen(szPath) - index);
-				ModifyM_xTip(szPath);
+				SetM_xTip(szPath);
 			}
 			goto HOOKX;
 		} else if (Commands[m_nCommandID[m_nApplicationID][nCommandType][nKey]].fCommand == CCommands::DeleteChar) {
 			if (index < _tcslen(szPath)) {
 				memmove(&szPath[index], &szPath[index + 1], _tcslen(szPath) - index);
-				ModifyM_xTip(szPath);
+				SetM_xTip(szPath);
 			}
 			goto HOOKX;
 		} else if (Commands[m_nCommandID[m_nApplicationID][nCommandType][nKey]].fCommand == CCommands::EndOfLine) {
@@ -1065,7 +988,7 @@ LRESULT CALLBACK CXkeymacsDll::KeyboardProc(int nCode, WPARAM wParam, LPARAM lPa
 					}
 					szPath[index++] = nAscii;
 //					CUtils::Log("M-x: %c(%#04x)", nAscii, nAscii);
-					ModifyM_xTip(szPath);
+					SetM_xTip(szPath);
 					goto HOOKX;
 				}
 			}
@@ -1225,10 +1148,7 @@ RECURSIVE_COMMAND:
 	}
 
 DO_NOTHING:
-	ModifyShell_NotifyIcon(SHIFT_ICON, IsDown(VK_SHIFT));
-	ModifyShell_NotifyIcon(CTRL_ICON, IsControl());
-	ModifyShell_NotifyIcon(ALT_ICON, IsDown(VK_MENU));
-
+	SetModifierIcons();
 	{
 		static BOOL bDefiningMacro = FALSE;
 		if (m_bDefiningMacro) {
@@ -1271,22 +1191,31 @@ DO_NOTHING:
 
 RECURSIVE:
 	Kdu(RECURSIVE_KEY, 1, FALSE);
-	ModifyShell_NotifyIcon(SHIFT_ICON, IsDown(VK_SHIFT));
-	ModifyShell_NotifyIcon(CTRL_ICON, IsControl());
-	ModifyShell_NotifyIcon(ALT_ICON, IsDown(VK_MENU));
-	return TRUE;
-
+	goto HOOKX;
 HOOK:
 	CCommands::SetLastCommand(fCommand);
 HOOK0_9:
 HOOKX:
-	ModifyShell_NotifyIcon(SHIFT_ICON, IsDown(VK_SHIFT));
-	ModifyShell_NotifyIcon(CTRL_ICON, IsControl());
-	ModifyShell_NotifyIcon(ALT_ICON, IsDown(VK_MENU));
+	SetModifierIcons();
 HOOK_RECURSIVE_KEY:
 	return TRUE;
 }
 
+void CXkeymacsDll::SetModifierIcons()
+{
+#define IconState(x) ((x) ? ON_ICON : OFF_ICON)
+	ICONMSG msg[6] = {
+		{MX_ICON, IconState(CCommands::bM_x()), ""},
+		{CX_ICON, IconState(CCommands::bC_x()), ""},
+		{META_ICON, IconState(CCommands::bM_()), ""},
+		{SHIFT_ICON, IconState(IsDown(VK_SHIFT)), ""},
+		{CTRL_ICON, IconState(IsControl()), ""},
+		{ALT_ICON, IconState(IsDown(VK_MENU)), ""}
+	};
+	_tcscpy_s(msg[0].szTip, m_M_xTip);
+	SendIconMessage(msg, 6);
+}
+
 void CXkeymacsDll::SetApplicationName(int nApplicationID, CString szApplicationName)
 {
 	ZeroMemory(m_szSpecialApp[nApplicationID], sizeof(m_szSpecialApp[nApplicationID]));
@@ -2088,20 +2017,6 @@ BYTE CXkeymacsDll::a2v(TCHAR nAscii)
 	}
 }
 
-void CXkeymacsDll::DeleteAllShell_NotifyIcon()
-{
-	for (int icon = 0; icon < MAX_ICON_TYPE; ++icon) {
-		DeleteShell_NotifyIcon((ICON_TYPE)icon);
-	}
-}
-
-void CXkeymacsDll::AddAllShell_NotifyIcon()
-{
-	for (int icon = 0; icon < MAX_ICON_TYPE; ++icon) {
-		AddShell_NotifyIcon((ICON_TYPE)icon);
-	}
-}
-
 BOOL CXkeymacsDll::IsMatchWindowText(CString szWindowText)
 {
 	BOOL bIsMatchWindowText = TRUE;
@@ -2210,17 +2125,15 @@ void CXkeymacsDll::InvokeM_x(const TCHAR *const szPath)
 	}
 }
 
-void CXkeymacsDll::ModifyM_xTip(const TCHAR *const szPath)
+void CXkeymacsDll::SetM_xTip(const TCHAR *const szPath)
 {
-	if (szPath) {
-		if (_tcslen(szPath) < sizeof(m_stNtfyIcon[MX_ICON].szTip) / sizeof(m_stNtfyIcon[MX_ICON].szTip[0]) - 5) {
-			memset(m_stNtfyIcon[MX_ICON].szTip, 0, sizeof(m_stNtfyIcon[MX_ICON].szTip));
-			_stprintf(m_stNtfyIcon[MX_ICON].szTip, "M-x %s", szPath);
-		}
-	} else {
-		memset(m_stNtfyIcon[MX_ICON].szTip, 0, sizeof(m_stNtfyIcon[MX_ICON].szTip));
-		_stprintf(m_stNtfyIcon[MX_ICON].szTip, "M-x LED");
-	}
+	_tcscpy_s(m_M_xTip, "M-x LED");
+	if (szPath && _tcslen(szPath) < 128 - 5)
+		_stprintf_s(m_M_xTip, "M-x %s", szPath);
+}
 
-	ModifyShell_NotifyIcon(MX_ICON, CCommands::bM_x(), TRUE);
+BOOL CXkeymacsDll::SendIconMessage(ICONMSG *pMsg, DWORD num)
+{
+	DWORD ack, read;
+	return CallNamedPipe(ICON_PIPE, pMsg, sizeof(ICONMSG) * num, &ack, sizeof(DWORD), &read, NMPWAIT_NOWAIT);
 }

--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -35,6 +35,8 @@ enum { EXTENDED_KEY = 0x01000000 };
 enum { REPEATED_KEY = 0x40000000 };
 enum { BEING_RELEASED = 0x80000000 };
 
+#include "ipc.h"
+
 struct KeyBind
 {
 	int nCommandType;
@@ -51,7 +53,7 @@ struct KeyName
 class AFX_EXT_CLASS CXkeymacsDll  
 {
 public:
-	static void ModifyM_xTip(const TCHAR *const szPath);
+	static void SetM_xTip(const TCHAR *const szPath);
 	static BOOL Get326Compatible();
 	static void Set326Compatible(int nApplicationID, BOOL b326Compatible);
 	static void SetCursorData(HCURSOR hEnable, HCURSOR hDisableTMP, HCURSOR hDisableWOCQ, HICON hDisable, BOOL bEnable);
@@ -60,12 +62,7 @@ public:
 	static int GetAccelerate(void);
 	static void SetAccelerate(int nAccelerate);
 	static void SetWindowText(int nApplicationID, CString szWindowText);
-	static void AddAllShell_NotifyIcon();
-	static void DeleteAllShell_NotifyIcon();
 	static void SetKillRingMax(int nApplicationID, int nKillRingMax);
-	static void EnableShell_NotifyIcon(ICON_TYPE icon, BOOL bEnable);
-	static void SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hEnable, HICON hDisableTMP, HICON hDisableWOCQ, HICON hDisable, BOOL bEnable);
-	static void SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hOn, HICON hOff, BOOL bEnable);
 	static void Clear(int nApplicationID);
 	static BOOL IsKeyboardHook();
 	static void SetCommandID(int nApplicationID, int nCommandType, int nKey, int nCommandID);
@@ -90,7 +87,6 @@ public:
 	static void IncreaseKillRingIndex(int nKillRing = 1);
 	static BOOL IsDown(BYTE bVk, BOOL bPhysicalKey = TRUE);
 	static void Kdu(BYTE bVk, DWORD n = 1, BOOL bOriginal = TRUE);
-	static int ModifyShell_NotifyIcon(ICON_TYPE icon, BOOL bNewStatus, BOOL bForce = TRUE);
 	static void ReleaseKey(BYTE bVk);
 	static void SetFunctionDefinition(int nFunctionID, CString szDefinition);
 	static void SetFunctionKey(int nFunctionID, int nApplicationID, int nCommandType, int nKey);
@@ -98,9 +94,11 @@ public:
 	static void SetKeyboardHookFlag(BOOL bFlag);
 	static BOOL Is106Keyboard();
 	static void Set106Keyboard(BOOL b106Keyboard);
+	static BOOL SendIconMessage(ICONMSG *pMsg, DWORD num);
 	CXkeymacsDll();
 	virtual ~CXkeymacsDll();
 private:
+	static TCHAR m_M_xTip[128];
 	static void InvokeM_x(const TCHAR* const szPath);
 	static BOOL m_b326Compatible[MAX_APP];
 	static void LogCallWndProcMessage(WPARAM wParam, LPARAM lParam);
@@ -118,11 +116,10 @@ private:
 	static HHOOK m_hHookCallWnd;
 	static HHOOK m_hHookGetMessage;
 	static HHOOK m_hHookShell;
-	static void AddShell_NotifyIcon(ICON_TYPE icon);
-	static void DeleteShell_NotifyIcon(ICON_TYPE icon);
 	static BOOL DefiningMacro();
 	static BOOL IsControl();
 	static BOOL IsMeta();
+	static void SetModifierIcons();
 	static void DoKeybd_event(BYTE bVk, DWORD dwFlags);
 	static LRESULT CALLBACK KeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
 	static LRESULT CALLBACK CallWndProc(int nCode, WPARAM wParam, LPARAM lParam);
@@ -145,7 +142,6 @@ private:
 	static BOOL m_bDefiningMacro;
 	static void Original(int nCommandType, BYTE bVk, int nOriginal);
 	static int Original(int nCommandType, BYTE bVk);
-	static HICON m_hIcon[MAX_ICON_TYPE][MAX_STATUS];
 	static BOOL m_bUseDialogSetting[MAX_APP];
 	static void InitKeyboardProc(BOOL bImeComposition);
 	static BOOL m_bIgnoreUndefinedC_x[MAX_APP];
@@ -157,11 +153,6 @@ private:
 	static CList<CClipboardSnap *, CClipboardSnap *> m_oKillRing;
 	static int m_nKillRingMax[MAX_APP];
 	static int GetMickey(int nDifferential, int nThreshold1, int nThreshold2, int nAcceleration, int nSpeed);
-	static BOOL DoShell_NotifyIcon(ICON_TYPE icon, DWORD dwMessage);
-	static BOOL m_bIcon[MAX_ICON_TYPE];
-	static DWORD m_dwOldMessage[MAX_ICON_TYPE];
-	static NOTIFYICONDATA m_stNtfyIcon[MAX_ICON_TYPE];
-	static NOTIFYICONDATA m_stOldNtfyIcon[MAX_ICON_TYPE];
 	static BOOL m_bHook;
 	static BOOL m_bRightShift;
 	static BOOL m_bRightAlt;