IME: fix race condition on closing window (#5455)

3 files changed, 26 insertions, 20 deletions

diff --git a/src/managers/input/InputMethodRelay.cpp b/src/managers/input/InputMethodRelay.cpp
index e348dcaf..8c21247a 100644
--- a/src/managers/input/InputMethodRelay.cpp
+++ b/src/managers/input/InputMethodRelay.cpp
@@ -160,6 +160,25 @@ void CInputMethodRelay::updateAllPopups() {
     }
 }
 
+void CInputMethodRelay::activateIME(CTextInput* pInput) {
+    if (!m_pWLRIME)
+        return;
+
+    wlr_input_method_v2_send_activate(g_pInputManager->m_sIMERelay.m_pWLRIME);
+    commitIMEState(pInput);
+}
+
+void CInputMethodRelay::deactivateIME(CTextInput* pInput) {
+    if (!m_pWLRIME)
+        return;
+
+    if (!m_pWLRIME->active)
+        return;
+
+    wlr_input_method_v2_send_deactivate(g_pInputManager->m_sIMERelay.m_pWLRIME);
+    commitIMEState(pInput);
+}
+
 void CInputMethodRelay::commitIMEState(CTextInput* pInput) {
     if (!m_pWLRIME)
         return;
diff --git a/src/managers/input/InputMethodRelay.hpp b/src/managers/input/InputMethodRelay.hpp
index f19b4bb5..eb7c9f64 100644
--- a/src/managers/input/InputMethodRelay.hpp
+++ b/src/managers/input/InputMethodRelay.hpp
@@ -20,6 +20,8 @@ class CInputMethodRelay {
 
     wlr_input_method_v2* m_pWLRIME = nullptr;
 
+    void                 activateIME(CTextInput* pInput);
+    void                 deactivateIME(CTextInput* pInput);
     void                 commitIMEState(CTextInput* pInput);
     void                 removeTextInput(CTextInput* pInput);
 
diff --git a/src/managers/input/TextInput.cpp b/src/managers/input/TextInput.cpp
index 980d599b..be26d39c 100644
--- a/src/managers/input/TextInput.cpp
+++ b/src/managers/input/TextInput.cpp
@@ -37,11 +37,8 @@ void CTextInput::initCallbacks() {
     hyprListener_textInputDestroy.initCallback(
         isV3() ? &pWlrInput->events.destroy : &pV1Input->sDestroy,
         [this](void* owner, void* data) {
-            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);
-            }
+            if (pWlrInput && pWlrInput->current_enabled && focusedSurface())
+                g_pInputManager->m_sIMERelay.deactivateIME(this);
 
             hyprListener_textInputCommit.removeCallback();
             hyprListener_textInputDestroy.removeCallback();
@@ -72,8 +69,7 @@ void CTextInput::onEnabled(wlr_surface* surfV1) {
         enter(pSurface);
     }
 
-    wlr_input_method_v2_send_activate(g_pInputManager->m_sIMERelay.m_pWLRIME);
-    g_pInputManager->m_sIMERelay.commitIMEState(this);
+    g_pInputManager->m_sIMERelay.activateIME(this);
 }
 
 void CTextInput::onDisabled() {
@@ -91,11 +87,7 @@ void CTextInput::onDisabled() {
     hyprListener_surfaceDestroyed.removeCallback();
     hyprListener_surfaceUnmapped.removeCallback();
 
-    if (!g_pInputManager->m_sIMERelay.m_pWLRIME->active)
-        return;
-
-    wlr_input_method_v2_send_deactivate(g_pInputManager->m_sIMERelay.m_pWLRIME);
-    g_pInputManager->m_sIMERelay.commitIMEState(this);
+    g_pInputManager->m_sIMERelay.deactivateIME(this);
 }
 
 void CTextInput::onCommit() {
@@ -203,14 +195,7 @@ void CTextInput::leave() {
 
     setFocusedSurface(nullptr);
 
-    if (!g_pInputManager->m_sIMERelay.m_pWLRIME)
-        return;
-
-    if (!g_pInputManager->m_sIMERelay.m_pWLRIME->active)
-        return;
-
-    wlr_input_method_v2_send_deactivate(g_pInputManager->m_sIMERelay.m_pWLRIME);
-    g_pInputManager->m_sIMERelay.commitIMEState(this);
+    g_pInputManager->m_sIMERelay.deactivateIME(this);
 }
 
 wlr_surface* CTextInput::focusedSurface() {