hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

textinput: send deactivate to ime on destory ti (#7614)

This commit is contained in:
Sungyoon Cho 2024-09-02 01:44:33 +09:00 committed by GitHub
parent 7a24e564f4
commit 8bbeee2041
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/managers/input/TextInput.cpp
View File

@ -23,8 +23,6 @@ void CTextInput::initCallbacks() {
listeners.disable = INPUT->events.disable.registerListener([this](std::any p) { onDisabled(); });
listeners.commit = INPUT->events.onCommit.registerListener([this](std::any p) { onCommit(); });
listeners.destroy = INPUT->events.destroy.registerListener([this](std::any p) {
const auto INPUT = pV3Input.lock();
if (INPUT && INPUT->current.enabled && focusedSurface())
g_pInputManager->m_sIMERelay.deactivateIME(this);
g_pInputManager->m_sIMERelay.removeTextInput(this);
});
@ -40,6 +38,7 @@ void CTextInput::initCallbacks() {
listeners.destroy = INPUT->events.destroy.registerListener([this](std::any p) {
listeners.surfaceUnmap.reset();
listeners.surfaceDestroy.reset();
g_pInputManager->m_sIMERelay.deactivateIME(this);
g_pInputManager->m_sIMERelay.removeTextInput(this);
});
}
@ -192,7 +191,7 @@ wl_client* CTextInput::client() {
}
void CTextInput::commitStateToIME(SP<CInputMethodV2> ime) {
if (isV3()) {
if (isV3() && !pV3Input.expired()) {
const auto INPUT = pV3Input.lock();
if (INPUT->current.surrounding.updated)
@ -202,7 +201,7 @@ void CTextInput::commitStateToIME(SP<CInputMethodV2> ime) {
if (INPUT->current.contentType.updated)
ime->textContentType(INPUT->current.contentType.hint, INPUT->current.contentType.purpose);
} else {
} else if (!pV1Input.expired()) {
const auto INPUT = pV1Input.lock();
if (INPUT->pendingSurrounding.isPending)