version 1.44.1v1.44.1

4 files changed, 21 insertions, 66 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99c6149..0d09020 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
-### next
--  fix wrong position of IMEs (input method editors) popup - thanks @xubaiwang - See #948
+### v1.44.1 - 2024-10-16
+<a name="v1.44.1"></a>
+- fix wrong position of IMEs (input method editors) popup - thanks @xubaiwang - See #948
+- improve querying the terminal for capabilities (prevent some escape chars from leaking)
 
 ### v1.44.0 - 2024-09-07
 <a name="v1.44.0"></a>
diff --git a/Cargo.lock b/Cargo.lock
index e8eb11c..30fa521 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -216,7 +216,7 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "broot"
-version = "1.44.1-dev"
+version = "1.44.1"
 dependencies = [
  "ansi_colours",
  "base64 0.21.7",
@@ -269,7 +269,7 @@ dependencies = [
  "unicode-width",
  "uzers",
  "which",
- "xterm-query 0.3.0",
+ "xterm-query",
 ]
 
 [[package]]
@@ -575,7 +575,7 @@ checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
  "bitflags 2.6.0",
  "crossterm_winapi",
- "mio 1.0.2",
+ "mio",
  "parking_lot",
  "rustix",
  "signal-hook",
@@ -1311,15 +1311,6 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memoffset"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
@@ -1348,18 +1339,6 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "mio"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
@@ -1373,19 +1352,6 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
-dependencies = [
- "bitflags 1.3.2",
- "cc",
- "cfg-if",
- "libc",
- "memoffset 0.6.5",
-]
-
-[[package]]
-name = "nix"
 version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
@@ -1393,7 +1359,7 @@ dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "memoffset 0.7.1",
+ "memoffset",
 ]
 
 [[package]]
@@ -1968,7 +1934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
- "mio 1.0.2",
+ "mio",
  "signal-hook",
 ]
 
@@ -2191,14 +2157,14 @@ dependencies = [
 
 [[package]]
 name = "terminal-light"
-version = "1.5.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "107b76de0f9296a417d77a85fee9e0d57084392d281b0858116b14e6620f255c"
+checksum = "4a9474484d1a0c031cd7d065c6f027a376859c9fedb32c94df3d7a797218bbb7"
 dependencies = [
  "coolor",
  "crossterm",
  "thiserror",
- "xterm-query 0.4.1",
+ "xterm-query",
 ]
 
 [[package]]
@@ -2938,20 +2904,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
 [[package]]
 name = "xterm-query"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6af094c5a26cf7663e97d92f69dd6f4c131e90e95ac64308289fce9168c066"
-dependencies = [
- "mio 0.8.11",
- "nix 0.22.3",
- "thiserror",
-]
-
-[[package]]
-name = "xterm-query"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad8964f04823efe0096d7829f6d93f9cb4f88713d07d514486296dd8b9d2194"
+checksum = "775333f1c03ec9f81f7f295de5a8dac7350b91f7e03e2dd730593ba4ec3515d1"
 dependencies = [
  "nix 0.29.0",
  "thiserror",
diff --git a/Cargo.toml b/Cargo.toml
index 3de5b11..634424c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "broot"
-version = "1.44.1-dev"
+version = "1.44.1"
 authors = ["dystroy <denys.seguret@gmail.com>"]
 repository = "https://github.com/Canop/broot"
 homepage = "https://dystroy.org/broot"
@@ -61,13 +61,13 @@ syntect = { package = "syntect-no-panic", version = "4.6.1" } # see issue #485
 tempfile = "3.2"
 termimad = "0.30.1"
 terminal-clipboard = { version = "0.4.1", optional = true }
-terminal-light = "1.5"
+terminal-light = "1.7"
 toml = "0.8"
 trash = { version = "3.1.2", optional = true }
 umask = "2.1.0"
 unicode-width = "0.1.10"
 which = "4.4.0"
-xterm-query = { version = "0.3", optional = true }
+xterm-query = { version = "0.5", optional = true }
 
 [dev-dependencies]
 glassbench = "0.4.3"
@@ -122,10 +122,10 @@ harness = false
 # syntect-no-panic = { path = "../syntect" }
 # termimad = { path = "../termimad" }
 # terminal-clipboard = { path = "../terminal-clipboard" }
-# terminal-light = { path = "../terminal-light" }
+# terminal-light = { path = "../terminal-light" }
 # umask = { path = "../umask" }
 # crokey = { path = "../crokey" }
 # lazy-regex = { path = "../lazy-regex" }
 # lazy-regex-proc_macros = { path = "../lazy-regex/src/proc_macros" }
 # strict = { path = "../strict" }
-# xterm-query = { path = "../xterm-query" }
+# xterm-query = { path = "../xterm-query" }
diff --git a/src/kitty/detect_support.rs b/src/kitty/detect_support.rs
index f31eb42..77365dd 100644
--- a/src/kitty/detect_support.rs
+++ b/src/kitty/detect_support.rs
@@ -65,7 +65,7 @@ pub fn is_kitty_graphics_protocol_supported() -> bool {
     {
         let start = std::time::Instant::now();
         const TIMEOUT_MS: u64 = 200;
-        let response = xterm_query::query(
+        let response = xterm_query::query_osc(
             "\x1b_Gi=31,s=1,v=1,a=q,t=d,f=24;AAAA\x1b\\\x1b[c",
             TIMEOUT_MS,
         );
@@ -74,9 +74,7 @@ pub fn is_kitty_graphics_protocol_supported() -> bool {
                 debug!("xterm querying failed: {}", e);
                 false
             }
-            Ok(response) => {
-                response.starts_with("\x1b_Gi=31;OK\x1b")
-            }
+            Ok(response) => response == "_Gi=31;OK"
         };
         debug!("Xterm querying took {:?}", start.elapsed());
         debug!("kitty protocol support: {:?}", s);