tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-23 13:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix Korean IME append extension issue"

Browse Source 
This reverts commit 6330a68, due to regression reported in #14400.

Fix #14400, fix #14973, close #14593
This commit is contained in:
Don Ho 2024-01-15 14:15:27 +01:00
parent a5e29863e5
commit 906f6e4386
1 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.cpp
View File

@ -251,12 +251,6 @@ public:
IFACEMETHODIMP OnFileOk(IFileDialog* dlg) override IFACEMETHODIMP OnFileOk(IFileDialog* dlg) override
{ {
_lastUsedFolder = getDialogFolder(dlg); _lastUsedFolder = getDialogFolder(dlg);
// Ignore OnFileOk() as OnPreFileOk() is not called when in Hangul mode.
// check KbdProcHook() for details.
if (_isHangul)
return S_FALSE;
return S_OK; return S_OK;
} }
IFACEMETHODIMP OnFolderChange(IFileDialog*) override IFACEMETHODIMP OnFolderChange(IFileDialog*) override
@ -374,8 +368,6 @@ public:
_lastSelectedType(fileIndex + 1), _wildcardType(wildcardIndex >= 0 ? wildcardIndex + 1 : 0) _lastSelectedType(fileIndex + 1), _wildcardType(wildcardIndex >= 0 ? wildcardIndex + 1 : 0)
{ {
installHooks(); installHooks();
_keyboardLayoutLanguage = getKeyboardLayout();
_isHangul = isHangul(_keyboardLayoutLanguage);
} }
~FileDialogEventHandler() ~FileDialogEventHandler()
@ -418,7 +410,6 @@ private:
{ {
_prevKbdHook = ::SetWindowsHookEx(WH_KEYBOARD, &FileDialogEventHandler::KbdProcHook, nullptr, ::GetCurrentThreadId()); _prevKbdHook = ::SetWindowsHookEx(WH_KEYBOARD, &FileDialogEventHandler::KbdProcHook, nullptr, ::GetCurrentThreadId());
_prevCallHook = ::SetWindowsHookEx(WH_CALLWNDPROC, &FileDialogEventHandler::CallProcHook, nullptr, ::GetCurrentThreadId()); _prevCallHook = ::SetWindowsHookEx(WH_CALLWNDPROC, &FileDialogEventHandler::CallProcHook, nullptr, ::GetCurrentThreadId());
_langaugeDetectHook = ::SetWindowsHookEx(WH_SHELL, &FileDialogEventHandler::LanguageDetectHook, nullptr,::GetCurrentThreadId());
} }
void removeHooks() void removeHooks()
@ -427,11 +418,8 @@ private:
::UnhookWindowsHookEx(_prevKbdHook); ::UnhookWindowsHookEx(_prevKbdHook);
if (_prevCallHook) if (_prevCallHook)
::UnhookWindowsHookEx(_prevCallHook); ::UnhookWindowsHookEx(_prevCallHook);
if (_langaugeDetectHook)
::UnhookWindowsHookEx(_langaugeDetectHook);
_prevKbdHook = nullptr; _prevKbdHook = nullptr;
_prevCallHook = nullptr; _prevCallHook = nullptr;
_langaugeDetectHook = nullptr;
} }
void eraseHandles() void eraseHandles()
@ -508,21 +496,6 @@ private:
} }
} }
LANGID getKeyboardLayout()
{
return PRIMARYLANGID(LOWORD(HandleToLong(GetKeyboardLayout(0))));
}
static bool isHangul(LANGID lang)
{
auto hwnd = GetFocus();
auto himc = ImmGetContext(hwnd);
auto isLocalInputMode = ImmGetOpenStatus(himc); // return true when CJK IME is in local language input mode
ImmReleaseContext(hwnd, himc);
return (lang == LANG_KOREAN) && isLocalInputMode;
};
// Transforms a forward-slash path to a canonical Windows path. // Transforms a forward-slash path to a canonical Windows path.
static bool transformPath(generic_string& fileName) static bool transformPath(generic_string& fileName)
{ {
@ -644,39 +617,7 @@ private:
HWND hwnd = GetFocus(); HWND hwnd = GetFocus();
auto it = s_handleMap.find(hwnd); auto it = s_handleMap.find(hwnd);
if (it != s_handleMap.end() && it->second && hwnd == it->second->_hwndNameEdit) if (it != s_handleMap.end() && it->second && hwnd == it->second->_hwndNameEdit)
{ it->second->onPreFileOk();
// Capture the state at this point because of the OnFileOk()
it->second->_isHangul = isHangul(it->second->_keyboardLayoutLanguage);
if (it->second->_isHangul)
{
// If IME is in Hangul mode, ignore VK_RETURN to complete the composition and change
// to alphabetical input mode to proceed to onPreFileOk() on the next VK_RETURN.
auto himc = ImmGetContext(hwnd);
ImmSetConversionStatus(himc, IME_CMODE_ALPHANUMERIC, IME_SMODE_NONE);
ImmReleaseContext(hwnd, himc);
}
else
{
it->second->onPreFileOk();
}
}
}
}
return ::CallNextHookEx(nullptr, nCode, wParam, lParam);
}
// Dectect language layout of keyboard when it changed
static LRESULT CALLBACK LanguageDetectHook(int nCode, WPARAM wParam, LPARAM lParam)
{
if (nCode == HSHELL_LANGUAGE)
{
HWND hwnd = GetFocus();
auto it = s_handleMap.find(hwnd);
if (it != s_handleMap.end() && it->second && hwnd == it->second->_hwndNameEdit)
{
HKL hkl = (HKL)lParam;
it->second->_keyboardLayoutLanguage = PRIMARYLANGID(LOWORD(hkl));
} }
} }
return ::CallNextHookEx(nullptr, nCode, wParam, lParam); return ::CallNextHookEx(nullptr, nCode, wParam, lParam);
@ -691,14 +632,11 @@ private:
generic_string _lastUsedFolder; generic_string _lastUsedFolder;
HHOOK _prevKbdHook = nullptr; HHOOK _prevKbdHook = nullptr;
HHOOK _prevCallHook = nullptr; HHOOK _prevCallHook = nullptr;
HHOOK _langaugeDetectHook = nullptr;
HWND _hwndNameEdit = nullptr; HWND _hwndNameEdit = nullptr;
HWND _hwndButton = nullptr; HWND _hwndButton = nullptr;
UINT _currentType = 0; // File type currenly selected in dialog. UINT _currentType = 0; // File type currenly selected in dialog.
UINT _lastSelectedType = 0; // Last selected non-wildcard file type. UINT _lastSelectedType = 0; // Last selected non-wildcard file type.
UINT _wildcardType = 0; // Wildcard *.* file type index (usually 1). UINT _wildcardType = 0; // Wildcard *.* file type index (usually 1).
LANGID _keyboardLayoutLanguage = LANG_NEUTRAL;
bool _isHangul = false; // Korean IME specific flag
}; };
std::unordered_map<HWND, FileDialogEventHandler*> FileDialogEventHandler::s_handleMap; std::unordered_map<HWND, FileDialogEventHandler*> FileDialogEventHandler::s_handleMap;