Merge branch 'hyprwm:main' into main

hyprwm · Sep 2, 2024 · 0c20101 · 0c20101
2 parents b300f2f + 6934e7a
commit 0c20101
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/default.nix b/nix/default.nix
@@ -89,6 +89,10 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
     DIRTY = lib.optionalString (commit == "") "dirty";
     HASH = commit;
 
+    depsBuildBuild = [
+      pkg-config
+    ];
+
     nativeBuildInputs = [
       hyprwayland-scanner
       jq
@@ -97,8 +101,7 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
       ninja
       pkg-config
       python3 # for udis86
-      # re-add after https://github.com/NixOS/nixpkgs/pull/214906 hits nixos-unstable
-      # wayland-scanner
+      wayland-scanner
     ];
 
     outputs = [

diff --git a/src/managers/input/TextInput.cpp b/src/managers/input/TextInput.cpp
@@ -23,10 +23,9 @@ 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);
+            if (!g_pInputManager->m_sIMERelay.getFocusedTextInput())
+                g_pInputManager->m_sIMERelay.deactivateIME(this);
         });
     } else {
         const auto INPUT = pV1Input.lock();
@@ -41,6 +40,8 @@ void CTextInput::initCallbacks() {
             listeners.surfaceUnmap.reset();
             listeners.surfaceDestroy.reset();
             g_pInputManager->m_sIMERelay.removeTextInput(this);
+            if (!g_pInputManager->m_sIMERelay.getFocusedTextInput())
+                g_pInputManager->m_sIMERelay.deactivateIME(this);
         });
     }
 }
@@ -192,7 +193,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 +203,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)