twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-09-01 20:33:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

IME: fix crashes with destroyed text-inputs

Browse Source 
ref #5189
This commit is contained in:
Vaxry
2024-03-22 18:45:24 +00:00
parent 461757e2fb
commit d2b42e29c6
5 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/helpers/WLClasses.cpp
View File

@@ -244,3 +244,39 @@ void SKeyboard::updateXKBTranslationState(xkb_keymap* const keymap) {
xkb_keymap_unref(NEWKEYMAP);
xkb_context_unref(PCONTEXT);
}
void STextInput::setFocusedSurface(wlr_surface* pSurface) {
focusedSurface = pSurface;
hyprListener_surfaceUnmapped.removeCallback();
hyprListener_surfaceDestroyed.removeCallback();
if (!pSurface)
return;
hyprListener_surfaceUnmapped.initCallback(
&pSurface->events.unmap,
[this](void* owner, void* data) {
if (!focusedSurface)
return;
focusedSurface = nullptr;
hyprListener_surfaceUnmapped.removeCallback();
hyprListener_surfaceDestroyed.removeCallback();
g_pInputManager->m_sIMERelay.removeSurfaceToPTI(this);
},
this, "STextInput");
hyprListener_surfaceDestroyed.initCallback(
&pSurface->events.destroy,
[this](void* owner, void* data) {
if (!focusedSurface)
return;
focusedSurface = nullptr;
hyprListener_surfaceUnmapped.removeCallback();
hyprListener_surfaceDestroyed.removeCallback();
g_pInputManager->m_sIMERelay.removeSurfaceToPTI(this);
},
this, "STextInput");
}