twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-15 12:03:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

IME: fix crash on restarting IME (#5428)

Browse Source
This commit is contained in:
Sungyoon Cho
2024-04-05 01:34:04 +09:00
committed by GitHub
parent 4f3e90ad2d
commit c4b660a339
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,12 +37,7 @@ void CTextInput::initCallbacks() {
hyprListener_textInputDestroy.initCallback(
isV3() ? &pWlrInput->events.destroy : &pV1Input->sDestroy,
[this](void* owner, void* data) {
if (!g_pInputManager->m_sIMERelay.m_pWLRIME) {
// Debug::log(WARN, "Disabling TextInput on no IME!");
return;
}
if (pWlrInput && pWlrInput->current_enabled) {
if (pWlrInput && pWlrInput->current_enabled && g_pInputManager->m_sIMERelay.m_pWLRIME) {
wlr_input_method_v2_send_deactivate(g_pInputManager->m_sIMERelay.m_pWLRIME);
g_pInputManager->m_sIMERelay.commitIMEState(this);
@@ -71,10 +66,10 @@ void CTextInput::onEnabled(wlr_surface* surfV1) {
// v1 only, map surface to PTI
if (!isV3()) {
wlr_surface* pSurface = surfV1;
if (g_pCompositor->m_pLastFocus == pSurface)
enter(pSurface);
else
setFocusedSurface(pSurface);
if (g_pCompositor->m_pLastFocus != pSurface || !pV1Input->active)
return;
enter(pSurface);
}
wlr_input_method_v2_send_activate(g_pInputManager->m_sIMERelay.m_pWLRIME);
@@ -208,6 +203,9 @@ void CTextInput::leave() {
setFocusedSurface(nullptr);
if (!g_pInputManager->m_sIMERelay.m_pWLRIME)
return;
if (!g_pInputManager->m_sIMERelay.m_pWLRIME->active)
return;