OSDN Git Service

Use LPCSTR instead of CString in arguments of SaveKeyBind,
[xkeymacs/xkeymacs.git] / xkeymacs / profile.cpp
index f15f471..923ff43 100644 (file)
@@ -305,7 +305,8 @@ static const KeyName KeyNames[] = {
        {0xff,                  _T("Fn")},\r
 };\r
 \r
-CData CProfile::m_Data[MAX_APP];\r
+CONFIG CProfile::m_Config;\r
+TCHAR CProfile::m_szAppTitle[MAX_APP][WINDOW_TEXT_LENGTH];\r
 TASK_LIST CProfile::m_TaskList[MAX_TASKS];\r
 DWORD CProfile::m_dwTasks;\r
 \r
@@ -476,22 +477,6 @@ BOOL CALLBACK CProfile::EnumWindowsProc(const HWND hWnd, const LPARAM lParam)
        return TRUE;\r
 }\r
 \r
-struct {\r
-       int type;\r
-       CString cstr;\r
-} WindowTextTypes[] = {\r
-       { IDS_WINDOW_TEXT_MATCH, CString(MAKEINTRESOURCE(IDS_WINDOW_TEXT_MATCH)) },\r
-       { IDS_WINDOW_TEXT_MATCH_FORWARD, CString(MAKEINTRESOURCE(IDS_WINDOW_TEXT_MATCH_FORWARD)) },\r
-       { IDS_WINDOW_TEXT_MATCH_BACKWARD, CString(MAKEINTRESOURCE(IDS_WINDOW_TEXT_MATCH_BACKWARD)) },\r
-};\r
-\r
-inline int WindowTextType(const CString& cstr) {\r
-       for (int i = 0; i < _countof(WindowTextTypes); ++i)\r
-               if (WindowTextTypes[i].cstr == cstr)\r
-                       return WindowTextTypes[i].type;\r
-       return IDS_WINDOW_TEXT_IGNORE;\r
-}\r
-\r
 void CProfile::LoadRegistry()\r
 {\r
        bool bDialog = false;\r
@@ -510,28 +495,24 @@ void CProfile::LoadRegistry()
                                appName.LoadString(IDS_DEFAULT);\r
                } else if (appName == CString(MAKEINTRESOURCE(IDS_DIALOG)))\r
                        bDialog = true;\r
-               m_Data[nAppID].SetApplicationName(appName);\r
-\r
+               _tcsncpy_s(m_Config.szSpecialApp[nAppID], appName, _TRUNCATE);\r
                entry.LoadString(IDS_REG_ENTRY_APPLICATOIN_TITLE);\r
-               m_Data[nAppID].SetApplicationTitle(AfxGetApp()->GetProfileString(appName, entry));\r
+               _tcsncpy_s(m_szAppTitle[nAppID], AfxGetApp()->GetProfileString(appName, entry), _TRUNCATE);\r
                entry.LoadString(IDS_REG_ENTRY_WINDOW_TEXT);\r
-               m_Data[nAppID].SetWindowText(AfxGetApp()->GetProfileString(appName, entry, _T("*")));\r
-               entry.LoadString(IDS_REG_ENTRY_WINDOW_TEXT_TYPE);\r
-               m_Data[nAppID].SetWindowTextType(WindowTextType(AfxGetApp()->GetProfileString(appName, entry)));\r
+               _tcsncpy_s(m_Config.szWindowText[nAppID], AfxGetApp()->GetProfileString(appName, entry, _T("*")), _TRUNCATE);\r
 \r
-               CString regApp(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA));\r
-               regApp += _T("\\") + appName;\r
+               const CString regApp = CString(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA)) + _T("\\") + appName;\r
                for (int nComID = 1; nComID < MAX_COMMAND; ++nComID) {\r
                        entry = CCommands::GetCommandName(nComID);\r
                        HKEY hKey;\r
-                       const CString& regKey = regApp + _T("\\") + entry;\r
+                       const CString regKey = regApp + _T("\\") + entry;\r
                        if (RegOpenKeyEx(HKEY_CURRENT_USER, regKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {\r
                                TCHAR szKeyBind[128];\r
                                DWORD dwKeyBind = _countof(szKeyBind);\r
                                for (DWORD dwIndex = 0; RegEnumKeyEx(hKey, dwIndex, szKeyBind, &dwKeyBind, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; ++dwIndex) {\r
                                        int nType, nKey;\r
                                        ReadKeyBind(&nType, &nKey, szKeyBind);\r
-                                       m_Data[nAppID].SetCommandID(nType, nKey, nComID);\r
+                                       m_Config.nCommandID[nAppID][nType][nKey] = nComID;\r
                                        dwKeyBind = _countof(szKeyBind);\r
                                }\r
                                RegCloseKey(hKey);\r
@@ -541,7 +522,7 @@ void CProfile::LoadRegistry()
                                        if (CCommands::GetDefaultControlID(nComID, i) == IDC_CO2)\r
                                                continue;\r
                                        const int nType = CCommands::GetDefaultCommandType(nComID, i);\r
-                                       m_Data[nAppID].SetCommandID(nType, nKey, nComID);\r
+                                       m_Config.nCommandID[nAppID][nType][nKey] = nComID;\r
                                }\r
                        }\r
                }\r
@@ -563,19 +544,19 @@ void CProfile::LoadRegistry()
                }\r
 \r
                entry.LoadString(IDS_REG_ENTRY_KILL_RING_MAX);\r
-               m_Data[nAppID].SetKillRingMax(AfxGetApp()->GetProfileInt(appName, entry, 1));\r
+               m_Config.nKillRingMax[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 1);\r
                entry.LoadString(IDS_REG_ENTRY_USE_DIALOG_SETTING);\r
-               m_Data[nAppID].SetUseDialogSetting(AfxGetApp()->GetProfileInt(appName, entry, 1));\r
+               m_Config.bUseDialogSetting[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 1);\r
                entry.LoadString(IDS_REG_ENTRY_DISABLE_XKEYMACS);\r
-               m_Data[nAppID].SetSettingStyle(AfxGetApp()->GetProfileInt(appName, entry, 0) ? SETTING_DISABLE : SETTING_SPECIFIC);\r
+               m_Config.nSettingStyle[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 0) ? SETTING_DISABLE : SETTING_SPECIFIC;\r
                entry.LoadString(IDC_REG_ENTRY_IGNORE_META_CTRL);\r
-               m_Data[nAppID].SetIgnoreUndefinedMetaCtrl(AfxGetApp()->GetProfileInt(appName, entry, 0));\r
+               m_Config.bIgnoreUndefinedMetaCtrl[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 0);\r
                entry.LoadString(IDC_REG_ENTRY_IGNORE_C_X);\r
-               m_Data[nAppID].SetIgnoreUndefinedC_x(AfxGetApp()->GetProfileInt(appName, entry, 0));\r
+               m_Config.bIgnoreUndefinedC_x[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 0);\r
                entry.LoadString(IDC_REG_ENTRY_ENABLE_CUA);\r
-               m_Data[nAppID].SetEnableCUA(AfxGetApp()->GetProfileInt(appName, entry, 0));\r
+               m_Config.bEnableCUA[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 0);\r
                entry.LoadString(IDS_REG_ENTRY_326_COMPATIBLE);\r
-               m_Data[nAppID].Set326Compatible(AfxGetApp()->GetProfileInt(appName, entry, 0));\r
+               m_Config.b326Compatible[nAppID] = AfxGetApp()->GetProfileInt(appName, entry, 0);\r
        }\r
 }\r
 \r
@@ -583,54 +564,51 @@ void CProfile::SaveRegistry()
 {\r
        const CString section(MAKEINTRESOURCE(IDS_REG_SECTION_APPLICATION));    \r
        for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
-               const CString& appName = m_Data[nAppID].GetApplicationName();\r
+               const LPCTSTR szAppName = m_Config.szSpecialApp[nAppID];\r
                CString entry;\r
                entry.Format(IDS_REG_ENTRY_APPLICATION, nAppID);\r
-               if (appName.IsEmpty()) {\r
+               if (!szAppName[0]) {\r
                        if (!AfxGetApp()->GetProfileString(section, entry).IsEmpty())\r
                                AfxGetApp()->WriteProfileString(section, entry, _T(""));\r
                        continue;\r
                }\r
-               AfxGetApp()->WriteProfileString(section, entry, appName);\r
+               AfxGetApp()->WriteProfileString(section, entry, szAppName);\r
 \r
                entry.LoadString(IDS_REG_ENTRY_APPLICATOIN_TITLE);\r
-               CString appTitle = m_Data[nAppID].GetApplicationTitle();\r
+               CString appTitle = m_szAppTitle[nAppID];\r
                appTitle.TrimLeft(_T(' '));\r
-               AfxGetApp()->WriteProfileString(appName, entry, appTitle);\r
+               AfxGetApp()->WriteProfileString(szAppName, entry, appTitle);\r
                entry.LoadString(IDS_REG_ENTRY_WINDOW_TEXT);\r
-               AfxGetApp()->WriteProfileString(appName, entry, m_Data[nAppID].GetWindowText());\r
-               entry.LoadString(IDS_REG_ENTRY_WINDOW_TEXT_TYPE);\r
-               AfxGetApp()->WriteProfileString(appName, entry, CString(MAKEINTRESOURCE(m_Data[nAppID].GetWindowTextType())));\r
+               AfxGetApp()->WriteProfileString(szAppName, entry, m_Config.szWindowText[nAppID]);\r
 \r
-               CString regApp(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA));\r
-               regApp += _T("\\") + appName;\r
+               const CString regApp = CString(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA)) + _T("\\") + szAppName;\r
                // Create all commands\r
                for (int nComID = 1; nComID < MAX_COMMAND; ++nComID)\r
-                       SaveCommand(appName, nComID);\r
+                       SaveCommand(szAppName, nComID);\r
                for (int nType = 0; nType < MAX_COMMAND_TYPE; ++nType)\r
                        for (int nKey = 0; nKey < MAX_KEY; ++nKey)\r
-                               SaveKeyBind(appName, m_Data[nAppID].GetCommandID(nType, nKey), nType, nKey);\r
+                               SaveKeyBind(szAppName, m_Config.nCommandID[nAppID][nType][nKey], nType, nKey);\r
                for (int nFuncID = 0; nFuncID < CDotXkeymacs::GetFunctionNumber(); ++nFuncID)\r
                        for (int nKeyID = 0; nKeyID < CDotXkeymacs::GetKeyNumber(nFuncID, nAppID); ++nKeyID) {\r
                                int nType, nKey;\r
                                CDotXkeymacs::GetKey(nFuncID, nAppID, nKeyID, &nType, &nKey);\r
-                               SaveKeyBind(appName, CDotXkeymacs::GetFunctionSymbol(nFuncID), nType, nKey);\r
+                               SaveKeyBind(szAppName, CDotXkeymacs::GetFunctionSymbol(nFuncID), nType, nKey);\r
                        }\r
 \r
                entry.LoadString(IDS_REG_ENTRY_KILL_RING_MAX);\r
-               AfxGetApp()->WriteProfileInt(appName, entry, m_Data[nAppID].GetKillRingMax());\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.nKillRingMax[nAppID]);\r
                entry.LoadString(IDS_REG_ENTRY_USE_DIALOG_SETTING);\r
-               AfxGetApp()->WriteProfileInt(appName, entry, m_Data[nAppID].GetUseDialogSetting());\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.bUseDialogSetting[nAppID]);\r
                entry.LoadString(IDS_REG_ENTRY_DISABLE_XKEYMACS);\r
-               AfxGetApp()->WriteProfileInt(appName, entry, m_Data[nAppID].GetSettingStyle() == SETTING_DISABLE);\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.nSettingStyle[nAppID] == SETTING_DISABLE);\r
                entry.LoadString(IDC_REG_ENTRY_IGNORE_META_CTRL);\r
-               AfxGetApp()->WriteProfileInt(appName, entry, m_Data[nAppID].GetIgnoreUndefinedMetaCtrl());\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.bIgnoreUndefinedMetaCtrl[nAppID]);\r
                entry.LoadString(IDC_REG_ENTRY_IGNORE_C_X);\r
-               AfxGetApp()->WriteProfileInt(appName, entry, m_Data[nAppID].GetIgnoreUndefinedC_x());\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.bIgnoreUndefinedC_x[nAppID]);\r
                entry.LoadString(IDC_REG_ENTRY_ENABLE_CUA);\r
-               AfxGetApp()->WriteProfileInt(appName, entry, m_Data[nAppID].GetEnableCUA());\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.bEnableCUA[nAppID]);\r
                entry.LoadString(IDS_REG_ENTRY_326_COMPATIBLE);\r
-               AfxGetApp()->WriteProfileInt(appName, entry, m_Data[nAppID].Get326Compatible());\r
+               AfxGetApp()->WriteProfileInt(szAppName, entry, m_Config.b326Compatible[nAppID]);\r
        }\r
 }\r
 \r
@@ -650,54 +628,27 @@ void CProfile::SaveData()
 \r
 void CProfile::SetDllData()\r
 {\r
-       CXkeymacsDll::ClearFunctionDefinition();\r
-       for (int nFuncID = 0; nFuncID < CDotXkeymacs::GetFunctionNumber(); ++nFuncID) {\r
-               CXkeymacsDll::SetFunctionDefinition(nFuncID, CDotXkeymacs::GetFunctionDefinition(nFuncID));\r
-       }\r
+       memset(m_Config.nFunctionID, -1, sizeof(m_Config.nFunctionID));\r
+       for (int nFuncID = 0; nFuncID < CDotXkeymacs::GetFunctionNumber(); ++nFuncID)\r
+               _tcscpy_s(m_Config.szFunctionDefinition[nFuncID], CDotXkeymacs::GetFunctionDefinition(nFuncID));\r
 \r
        for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
-\r
-               CString szApplicationName = m_Data[nAppID].GetApplicationName();\r
-\r
-               if (szApplicationName.IsEmpty()) {\r
-                       CXkeymacsDll::Clear(nAppID);\r
-                       continue;\r
-               }\r
-\r
-               CXkeymacsDll::SetApplicationName(nAppID, szApplicationName);\r
-               CXkeymacsDll::SetWindowText(nAppID, m_Data[nAppID].GetWindowText());\r
-               CXkeymacsDll::SetCommandID(nAppID, CONTROL, 'X', 0);\r
-\r
-               for (int nType = 0; nType < MAX_COMMAND_TYPE; ++nType) {\r
-                       for (int nKey = 0; nKey < MAX_KEY; ++nKey) {\r
-                               const int nComID = m_Data[nAppID].GetCommandID(nType, nKey);\r
-                               CXkeymacsDll::SetCommandID(nAppID, nType, nKey, nComID);\r
-                               if ((nType & CONTROLX) && nComID) {\r
-                                       CXkeymacsDll::SetCommandID(nAppID, CONTROL, 'X', 1);                    // Commands[1] is C-x\r
-                               }\r
-                       }\r
-               }\r
-\r
-               for (int nFuncID = 0; nFuncID < CDotXkeymacs::GetFunctionNumber(); ++nFuncID) {\r
+               m_Config.nCommandID[nAppID][CONTROL]['X'] = 0; // C-x is unassigned.\r
+               for (int nType = 0; nType < MAX_COMMAND_TYPE; ++nType)\r
+                       for (int nKey = 0; nKey < MAX_KEY; ++nKey)\r
+                               if ((nType & CONTROLX) && m_Config.nCommandID[nAppID][nType][nKey])\r
+                                       m_Config.nCommandID[nAppID][CONTROL]['X'] = 1; // C-x is available.\r
+               for (int nFuncID = 0; nFuncID < CDotXkeymacs::GetFunctionNumber(); ++nFuncID)\r
                        for (int nKeyID = 0; nKeyID < CDotXkeymacs::GetKeyNumber(nFuncID, nAppID); ++nKeyID) {\r
-                               int nType = 0;\r
-                               int nKey = 0;\r
+                               int nType, nKey;\r
                                CDotXkeymacs::GetKey(nFuncID, nAppID, nKeyID, &nType, &nKey);\r
-                               CXkeymacsDll::SetFunctionKey(nFuncID, nAppID, nType, nKey);\r
-                               if (nType & CONTROLX) {\r
-                                       CXkeymacsDll::SetCommandID(nAppID, CONTROL, 'X', 1);                    // Commands[1] is C-x\r
-                               }\r
+                               m_Config.nFunctionID[nAppID][nType][nKey] = nFuncID;\r
+                               if (nType & CONTROLX)\r
+                                       m_Config.nCommandID[nAppID][CONTROL]['X'] = 1; // C-x is available.\r
                        }\r
-               }\r
-\r
-               CXkeymacsDll::SetKillRingMax(nAppID, m_Data[nAppID].GetKillRingMax());\r
-               CXkeymacsDll::SetUseDialogSetting(nAppID, m_Data[nAppID].GetUseDialogSetting());\r
-               CXkeymacsDll::SetSettingStyle(nAppID, m_Data[nAppID].GetSettingStyle());\r
-               CXkeymacsDll::SetIgnoreUndefinedMetaCtrl(nAppID, m_Data[nAppID].GetIgnoreUndefinedMetaCtrl());\r
-               CXkeymacsDll::SetIgnoreUndefinedC_x(nAppID, m_Data[nAppID].GetIgnoreUndefinedC_x());\r
-               CXkeymacsDll::SetEnableCUA(nAppID, m_Data[nAppID].GetEnableCUA());\r
-               CXkeymacsDll::Set326Compatible(nAppID, m_Data[nAppID].Get326Compatible());\r
        }\r
+       m_Config.b106Keyboard = Is106Keyboard();\r
+       CXkeymacsDll::SetConfig(m_Config);\r
        CXkeymacsApp *pApp = static_cast<CXkeymacsApp *>(AfxGetApp());\r
        if (!pApp->IsWow64())\r
                return;\r
@@ -783,50 +734,39 @@ BOOL CProfile::IsCommandType(const int nType, LPCTSTR szKeyBind)
        return FALSE;\r
 }\r
 \r
-void CProfile::SaveKeyBind(const CString szApplicationName, const int nComID, const int nType, const int nKey)\r
+void CProfile::SaveKeyBind(const LPCSTR szAppName, const int nComID, const int nType, const int nKey)\r
 {\r
-       if (!nComID) {\r
+       if (!nComID)\r
                return;\r
-       }\r
-\r
-       CString szCommandName = CCommands::GetCommandName(nComID);\r
-       if (szCommandName.IsEmpty()) {\r
+       const LPCSTR szComName = CCommands::GetCommandName(nComID);\r
+       if (!szComName[0])\r
                return;\r
-       }\r
-\r
-       SaveKeyBind(szApplicationName, szCommandName, nType, nKey);\r
+       SaveKeyBind(szAppName, szComName, nType, nKey);\r
 }\r
 \r
-void CProfile::SaveKeyBind(const CString szApplicationName, const CString szCommandName, const int nType, const int nKey)\r
+void CProfile::SaveKeyBind(const LPCSTR szAppName, const LPCSTR szComName, const int nType, const int nKey)\r
 {\r
-       CString szKeyBind = WriteKeyBind(nType, nKey);\r
-       CString szSubKey(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA));\r
-       szSubKey += _T("\\") + szApplicationName + _T("\\") + szCommandName;\r
-       if (!szKeyBind.IsEmpty()) {\r
+       const CString szKeyBind = WriteKeyBind(nType, nKey);\r
+       CString szSubKey = CString(MAKEINTRESOURCE(IDS_REGSUBKEY_DATA)) + _T("\\") + szAppName + _T("\\") + szComName;\r
+       if (!szKeyBind.IsEmpty())\r
                szSubKey += _T("\\") + szKeyBind;\r
-       }\r
-\r
        HKEY hKey = NULL;\r
-       if (RegCreateKeyEx(HKEY_CURRENT_USER, szSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL) == ERROR_SUCCESS) {\r
+       if (RegCreateKeyEx(HKEY_CURRENT_USER, szSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL) == ERROR_SUCCESS)\r
                RegCloseKey(hKey);\r
-       }\r
 }\r
 \r
-void CProfile::SaveCommand(const CString szApplicationName, const int nComID)\r
+void CProfile::SaveCommand(const LPCSTR szAppName, const int nComID)\r
 {\r
-       SaveKeyBind(szApplicationName, nComID, 0, 0);\r
+       SaveKeyBind(szAppName, nComID, 0, 0);\r
 }\r
 \r
-void CProfile::AddKeyBind2C_(const CString szApplicationName, const BYTE bVk)\r
+void CProfile::AddKeyBind2C_(const LPCSTR szAppName, const BYTE bVk)\r
 {\r
        int nComID;\r
-       for (nComID = 0; nComID < MAX_COMMAND; ++nComID) {\r
-               if (Commands[nComID].fCommand == CCommands::C_) {\r
+       for (nComID = 0; nComID < MAX_COMMAND; ++nComID)\r
+               if (Commands[nComID].fCommand == CCommands::C_)\r
                        break;\r
-               }\r
-       }\r
-\r
-       SaveKeyBind(szApplicationName, nComID, NONE, bVk);\r
+       SaveKeyBind(szAppName, nComID, NONE, bVk);\r
 }\r
 \r
 void CProfile::LevelUp()\r
@@ -957,30 +897,21 @@ void CProfile::InitDllData()
 \r
 void CProfile::ClearData(const CString szCurrentApplication)\r
 {\r
-       int nAppID;\r
-       for (nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
-               if (m_Data[nAppID].GetApplicationName() == szCurrentApplication) {\r
-                       break;\r
+       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
+               if (szCurrentApplication == m_Config.szSpecialApp[nAppID]) {\r
+                       ZeroMemory(m_Config.nCommandID[nAppID], sizeof(m_Config.nCommandID[nAppID]));\r
+                       ZeroMemory(m_Config.szSpecialApp[nAppID], CLASS_NAME_LENGTH);\r
+                       return;\r
                }\r
-       }\r
-       if (nAppID < MAX_APP) {\r
-               m_Data[nAppID].ClearAll();\r
-       }\r
 }\r
 \r
 // return count of saved settings\r
 int CProfile::GetSavedSettingCount()\r
 {\r
        int nSavedSetting = 0;\r
-\r
-       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
-               CString szApplicationName;\r
-               szApplicationName = m_Data[nAppID].GetApplicationName();\r
-               if (!szApplicationName.IsEmpty()) {\r
+       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
+               if (m_Config.szSpecialApp[nAppID][0])\r
                        ++nSavedSetting;\r
-               }\r
-       }\r
-\r
        return nSavedSetting;\r
 }\r
 \r
@@ -994,17 +925,14 @@ void CProfile::InitApplicationList(CComboBox *const cApplicationList)
 \r
        CString szListItem;\r
        for (int i = 0; i < MAX_APP; ++i) {\r
-               CString szApplicationName       = m_Data[i].GetApplicationName();\r
-               CString szApplicationTitle      = m_Data[i].GetApplicationTitle();\r
-               if (szApplicationName == _T("IME")) // IDS_IME_FILE_NAME\r
+               const LPCTSTR szAppName = m_Config.szSpecialApp[i];\r
+               const LPCTSTR szAppTitle = m_szAppTitle[i];\r
+               if (!szAppName[0] || !_tcscmp(szAppName, _T("IME")))\r
                        continue;\r
-               szListItem.Format(IDS_APPLICATION_LIST_ITEM, szApplicationTitle, szApplicationName);\r
-               if (IsNotSameString(cApplicationList, szListItem)\r
-                && !IsDefault(szApplicationName)\r
-                && !IsDialog(szApplicationName)\r
-                && !szApplicationName.IsEmpty()) {\r
+               szListItem.Format(IDS_APPLICATION_LIST_ITEM, szAppTitle, szAppName);\r
+               if (IsNotSameString(cApplicationList, szListItem) &&\r
+                               !IsDefault(szAppName) && !IsDialog(szAppName))\r
                        cApplicationList->AddString(szListItem);\r
-               }\r
        }\r
 \r
        AddIMEInfo(cApplicationList);\r
@@ -1061,45 +989,34 @@ void CProfile::GetTaskList()
 // if there is NOT the application in the data, this function takes care of it.\r
 int CProfile::GetApplicationIndex(const CString szApplicationName, const BOOL bSaveAndValidate, int *const nSettingStyle)\r
 {\r
-       if (!bSaveAndValidate) {        // SetDialogData\r
+       if (!bSaveAndValidate) // SetDialogData\r
                *nSettingStyle = SETTING_UNDEFINED;\r
-       }\r
-\r
        int nAppID = GetApplicationIndex(szApplicationName);\r
-\r
        if (nAppID == MAX_APP) {\r
-               if (bSaveAndValidate) { // GetDialogData\r
-                       for (nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
-                               CString sz = m_Data[nAppID].GetApplicationName();\r
-                               if (sz.IsEmpty()) {\r
-                                       m_Data[nAppID].SetApplicationName(szApplicationName);\r
+               if (bSaveAndValidate) { // GetDialogData\r
+                       for (nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
+                               if (!m_Config.szSpecialApp[nAppID][0]) {\r
+                                       _tcsncpy_s(m_Config.szSpecialApp[nAppID], szApplicationName, _TRUNCATE);\r
                                        break;\r
                                }\r
-                       }\r
-                       if (nAppID == MAX_APP) {\r
+                       if (nAppID == MAX_APP)\r
                                return nAppID;\r
-                       }\r
-               } else {                                // SetDialogData\r
-                       for (nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
-                               if (IsDefault(m_Data[nAppID].GetApplicationName())) {\r
+               } else { // SetDialogData\r
+                       for (nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
+                               if (IsDefault(m_Config.szSpecialApp[nAppID])) {\r
                                        *nSettingStyle = SETTING_DEFAULT;\r
                                        break;\r
                                }\r
-                       }\r
-                       if (nAppID == MAX_APP) {\r
+                       if (nAppID == MAX_APP)\r
                                return nAppID;\r
-                       }\r
                }\r
        }\r
-\r
-       if (bSaveAndValidate) { // GetDialogData\r
-               m_Data[nAppID].SetSettingStyle(*nSettingStyle);\r
-       } else {                                // SetDialogData\r
-               if (*nSettingStyle == SETTING_UNDEFINED) {      // It means that *nSettingStyle != SETTING_DEFAULT.\r
-                       *nSettingStyle = m_Data[nAppID].GetSettingStyle();\r
-               }\r
+       if (bSaveAndValidate) // GetDialogData\r
+               m_Config.nSettingStyle[nAppID] = *nSettingStyle;\r
+       else { // SetDialogData\r
+               if (*nSettingStyle == SETTING_UNDEFINED) // It means that *nSettingStyle != SETTING_DEFAULT.\r
+                       *nSettingStyle = m_Config.nSettingStyle[nAppID];\r
        }\r
-\r
        return nAppID;\r
 }\r
 \r
@@ -1175,75 +1092,70 @@ void CProfile::UpdateApplicationTitle(CComboBox *const cApplicationList, const C
 {\r
        static CString szApplicationTitle;\r
        if (bSaveAndValidate) { // GetDialogData\r
-               if (!CProfile::IsDefault(szCurrentApplication)) {\r
-                       m_Data[nAppID].SetApplicationTitle(szApplicationTitle);\r
-               }\r
+               if (!CProfile::IsDefault(szCurrentApplication))\r
+                       _tcsncpy_s(m_szAppTitle[nAppID], szApplicationTitle, _TRUNCATE);\r
                szApplicationTitle.Empty();\r
-       } else {                                // SetDialogData\r
+       } else { // SetDialogData\r
                CString szListItem;\r
                CProfile::GetApplicationTitle(cApplicationList, szListItem);\r
-               int nEndTitle = szListItem.ReverseFind(_T('('));\r
-               if (nEndTitle > 0) {\r
+               const int nEndTitle = szListItem.ReverseFind(_T('('));\r
+               if (nEndTitle > 0)\r
                        szApplicationTitle = szListItem.Left(nEndTitle);\r
-               }\r
        }\r
 }\r
 \r
 void CProfile::SetCommandID(const int nAppID, const int nType, const int nKey, int nComID)\r
 {\r
-       if (nKey == 0xf0 && Commands[nComID].fCommand == CCommands::C_) {\r
+       if (nKey == 0xf0 && Commands[nComID].fCommand == CCommands::C_)\r
                // Change CommandID C_Eisu\r
-               for (nComID = 1; nComID < MAX_COMMAND; ++nComID) {\r
-                       if (Commands[nComID].fCommand == CCommands::C_Eisu) {\r
+               for (nComID = 1; nComID < MAX_COMMAND; ++nComID)\r
+                       if (Commands[nComID].fCommand == CCommands::C_Eisu)\r
                                break;\r
-                       }\r
-               }\r
-       }\r
-       m_Data[nAppID].SetCommandID(nType, nKey, nComID);\r
+       m_Config.nCommandID[nAppID][nType][nKey] = nComID;\r
 }\r
 \r
 int CProfile::GetCommandID(const int nAppID, const int nType, const int nKey)\r
 {\r
-       int nComID = m_Data[nAppID].GetCommandID(nType, nKey);\r
-       if (nKey == 0xf0 && Commands[nComID].fCommand == CCommands::C_Eisu) {\r
+       int nComID = m_Config.nCommandID[nAppID][nType][nKey];\r
+       if (nKey == 0xf0 && Commands[nComID].fCommand == CCommands::C_Eisu)\r
                // Change CommandID C_\r
-               for (nComID = 1; nComID < MAX_COMMAND; ++nComID) {\r
-                       if (Commands[nComID].fCommand == CCommands::C_) {\r
+               for (nComID = 1; nComID < MAX_COMMAND; nComID++)\r
+                       if (Commands[nComID].fCommand == CCommands::C_)\r
                                break;\r
-                       }\r
-               }\r
-       }\r
        return nComID;\r
 }\r
 \r
 void CProfile::SetKillRingMax(const int nAppID, const int nKillRingMax)\r
 {\r
-       m_Data[nAppID].SetKillRingMax(nKillRingMax);\r
+       m_Config.nKillRingMax[nAppID] = nKillRingMax;\r
 }\r
 \r
 int CProfile::GetKillRingMax(const int nAppID)\r
 {\r
-       return m_Data[nAppID].GetKillRingMax();\r
+       return m_Config.nKillRingMax[nAppID];\r
 }\r
 \r
 void CProfile::SetUseDialogSetting(const int nAppID, const BOOL bUseDialogSetting)\r
 {\r
-       m_Data[nAppID].SetUseDialogSetting(bUseDialogSetting);\r
+       m_Config.bUseDialogSetting[nAppID] = bUseDialogSetting;\r
 }\r
 \r
 BOOL CProfile::GetUseDialogSetting(const int nAppID)\r
 {\r
-       return m_Data[nAppID].GetUseDialogSetting();\r
+       return m_Config.bUseDialogSetting[nAppID];\r
 }\r
 \r
 void CProfile::SetWindowText(const int nAppID, const CString szWindowText)\r
 {\r
-       m_Data[nAppID].SetWindowText(szWindowText);\r
+       if (CUtils::GetWindowTextType(szWindowText) == IDS_WINDOW_TEXT_IGNORE)\r
+               _tcscpy_s(m_Config.szWindowText[nAppID], _T("*"));\r
+       else\r
+               _tcsncpy_s(m_Config.szWindowText[nAppID], szWindowText, _TRUNCATE);\r
 }\r
 \r
 CString CProfile::GetWindowText(const int nAppID)\r
 {\r
-       return m_Data[nAppID].GetWindowText();\r
+       return m_Config.szWindowText[nAppID];\r
 }\r
 \r
 void CProfile::DeleteAllRegistryData()\r
@@ -1285,23 +1197,22 @@ int CProfile::GetCurrentApplicationID(CComboBox *const cApplicationList, const C
        return -1;\r
 }\r
 \r
-void CProfile::CopyData(const CString szDestinationApplication, const CString szSourceApplication)\r
+void CProfile::CopyData(const CString szDstApp, const CString szSrcApp)\r
 {\r
        int nSettingStyle = SETTING_SPECIFIC;\r
-       int nDestinationApplication = GetApplicationIndex(szDestinationApplication, TRUE, &nSettingStyle);\r
-       int nSourceApplication = GetApplicationIndex(szSourceApplication);\r
-\r
-       CString szApplicationName = m_Data[nDestinationApplication].GetApplicationName();\r
-       CString szApplicationTitle = m_Data[nDestinationApplication].GetApplicationTitle();\r
-       CString szWindowText = m_Data[nDestinationApplication].GetWindowText();\r
-       int nWindowTextType = m_Data[nDestinationApplication].GetWindowTextType();\r
-\r
-       m_Data[nDestinationApplication] = m_Data[nSourceApplication];\r
-\r
-       m_Data[nDestinationApplication].SetApplicationName(szApplicationName);\r
-       m_Data[nDestinationApplication].SetApplicationTitle(szApplicationTitle);\r
-       m_Data[nDestinationApplication].SetWindowText(szWindowText);\r
-       m_Data[nDestinationApplication].SetWindowTextType(nWindowTextType);\r
+       const int nDstApp = GetApplicationIndex(szDstApp, TRUE, &nSettingStyle);\r
+       const int nSrcApp = GetApplicationIndex(szSrcApp);\r
+\r
+#define CopyMember(member) CopyMemory(&m_Config. ## member ## [nDstApp], &m_Config. ## member ## [nSrcApp], sizeof(m_Config. ## member ## [nSrcApp]))\r
+       CopyMember(b326Compatible);\r
+       CopyMember(nFunctionID);\r
+       CopyMember(bEnableCUA);\r
+       CopyMember(bUseDialogSetting);\r
+       CopyMember(bIgnoreUndefinedC_x);\r
+       CopyMember(bIgnoreUndefinedMetaCtrl);\r
+       CopyMember(nKillRingMax);\r
+       CopyMember(nCommandID);\r
+#undef CopyMember\r
 }\r
 \r
 // return application index\r
@@ -1309,11 +1220,9 @@ void CProfile::CopyData(const CString szDestinationApplication, const CString sz
 int CProfile::GetApplicationIndex(const CString szApplicationName)\r
 {\r
        int nAppID = 0;\r
-       for (nAppID = 0; nAppID < MAX_APP; ++nAppID) {\r
-               if (m_Data[nAppID].GetApplicationName() == szApplicationName) {\r
+       for (nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
+               if (szApplicationName == m_Config.szSpecialApp[nAppID])\r
                        break;\r
-               }\r
-       }\r
        return nAppID;\r
 }\r
 \r
@@ -1418,12 +1327,12 @@ void CProfile::ImportProperties()
 \r
 BOOL CProfile::GetEnableCUA(const int nAppID)\r
 {\r
-       return m_Data[nAppID].GetEnableCUA();\r
+       return m_Config.bEnableCUA[nAppID];\r
 }\r
 \r
 void CProfile::SetEnableCUA(const int nAppID, const BOOL bEnableCUA)\r
 {\r
-       m_Data[nAppID].SetEnableCUA(bEnableCUA);\r
+       m_Config.bEnableCUA[nAppID] = bEnableCUA;\r
 }\r
 \r
 int CProfile::GetKeyboardSpeed()\r