コミットメタ情報

リビジョン12eb2709c5975ea08bc09ac7153a0d46b0b1aeaf (tree)
日時2011-09-05 16:48:48
作者Kazuhiro Fujieda <fujieda@user...>
コミッターKazuhiro Fujieda

ログメッセージ

Remove Clear and rewrite IsPassThrough in CXkeymacsDll.

変更サマリ

差分

--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -933,19 +933,6 @@ void CXkeymacsDll::SetModifierIcons()
933933 SendIconMessage(msg, 6);
934934 }
935935
936-void CXkeymacsDll::Clear(int nAppID)
937-{
938- if (0 <= nAppID && nAppID < MAX_APP) {
939- ZeroMemory(m_Config.szSpecialApp[nAppID], sizeof(m_Config.szSpecialApp[nAppID]));
940- ZeroMemory(m_Config.nCommandID[nAppID], sizeof(m_Config.nCommandID[nAppID]));
941- m_Config.nKillRingMax[nAppID] = 0;
942- m_Config.bUseDialogSetting[nAppID] = FALSE;
943- m_Config.nSettingStyle[nAppID] = 0;
944- } else {
945- ASSERT(0);
946- }
947-}
948-
949936 BOOL CXkeymacsDll::IsDepressedModifier(int (__cdecl *Modifier)(void), BOOL bPhysicalKey)
950937 {
951938 BYTE bVk = 0;
@@ -1141,13 +1128,11 @@ BOOL CXkeymacsDll::Is106Keyboard()
11411128 int CXkeymacsDll::IsPassThrough(BYTE nKey)
11421129 {
11431130 BYTE bVk = 0;
1131+ const BYTE *pnID = m_Config.nCommandID[m_nAppID][NONE];
11441132 do {
1145- if (IsDown(bVk)
1146- && (Commands[m_Config.nCommandID[m_nAppID][NONE][bVk]].fCommand == CCommands::PassThrough)) {
1147- if (bVk == nKey) {
1133+ if (IsDown(bVk) && Commands[pnID[bVk]].fCommand == CCommands::PassThrough) {
1134+ if (bVk == nKey)
11481135 return GOTO_HOOK;
1149- }
1150-
11511136 return GOTO_DO_NOTHING;
11521137 }
11531138 } while (++bVk);
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -70,7 +70,6 @@ public:
7070 static void SetKeyboardSpeed(int nKeyboardSpeed);
7171 static int GetAccelerate(void);
7272 static void SetAccelerate(int nAccelerate);
73- static void Clear(int nAppID);
7473 static BOOL IsKeyboardHook();
7574 static void ReleaseHooks();
7675 static void ReleaseKeyboardHook();
旧リポジトリブラウザで表示