feat: fallback to CSI 16 t for certain terminals that do not support TIOCGWINSZ (#2004)

Author: sxyazi

.github/workflows/draft.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches: [main]
     tags: ["v[0-9]+.[0-9]+.[0-9]+"]
-  schedule:
-    - cron: "0 */6 * * *"
   workflow_dispatch:
 
 env:

Cargo.lock

@@ -11,10 +11,10 @@ strip         = true
 
 [workspace.dependencies]
 ansi-to-tui   = "7.0.0"
-anyhow        = "1.0.93"
+anyhow        = "1.0.94"
 base64        = "0.22.1"
 bitflags      = "2.6.0"
-clap          = { version = "4.5.21", features = [ "derive" ] }
+clap          = { version = "4.5.23", features = [ "derive" ] }
 crossterm     = { version = "0.28.1", features = [ "event-stream" ] }
 dirs          = "5.0.1"
 futures       = "0.3.31"
@@ -29,9 +29,9 @@ scopeguard    = "1.2.0"
 serde         = { version = "1.0.215", features = [ "derive" ] }
 serde_json    = "1.0.133"
 shell-words   = "1.1.0"
-tokio         = { version = "1.41.1", features = [ "full" ] }
-tokio-stream  = "0.1.16"
-tokio-util    = "0.7.12"
+tokio         = { version = "1.42.0", features = [ "full" ] }
+tokio-stream  = "0.1.17"
+tokio-util    = "0.7.13"
 tracing       = { version = "0.1.41", features = [ "max_level_debug", "release_max_level_debug" ] }
 unicode-width = "0.2.0"
 uzers         = "0.12.1"

Cargo.toml

@@ -2,6 +2,8 @@ use std::mem;
 
 use crossterm::terminal::WindowSize;
 
+use crate::EMULATOR;
+
 pub struct Dimension;
 
 impl Dimension {
@@ -27,9 +29,10 @@ impl Dimension {
 	#[inline]
 	pub fn ratio() -> Option<(f64, f64)> {
 		let s = Self::available();
-		if s.width == 0 || s.height == 0 {
-			return None;
-		}
-		Some((f64::from(s.width) / f64::from(s.columns), f64::from(s.height) / f64::from(s.rows)))
+		Some(if s.width == 0 || s.height == 0 {
+			(EMULATOR.cell_size?.0 as f64, EMULATOR.cell_size?.1 as f64)
+		} else {
+			(f64::from(s.width) / f64::from(s.columns), f64::from(s.height) / f64::from(s.rows))
+		})
 	}
 }

yazi-adapter/src/dimension.rs

@@ -11,18 +11,21 @@ use crate::{Adapter, Brand, Mux, TMUX, Unknown};
 
 #[derive(Clone, Copy, Debug)]
 pub struct Emulator {
-	pub kind:  Either<Brand, Unknown>,
-	pub light: bool,
+	pub kind:      Either<Brand, Unknown>,
+	pub light:     bool,
+	pub cell_size: Option<(u16, u16)>,
 }
 
 impl Default for Emulator {
-	fn default() -> Self { Self { kind: Either::Right(Unknown::default()), light: false } }
+	fn default() -> Self {
+		Self { kind: Either::Right(Unknown::default()), light: false, cell_size: None }
+	}
 }
 
 impl Emulator {
 	pub fn detect() -> Self {
 		if let Some(brand) = Brand::from_env() {
-			Self { kind: Either::Left(brand), light: Self::detect_base().unwrap_or_default().light }
+			Self { kind: Either::Left(brand), ..Self::detect_base().unwrap_or_default() }
 		} else {
 			Self::detect_full().unwrap_or_default()
 		}
@@ -37,6 +40,7 @@ impl Emulator {
 			SavePosition,
 			Print(Mux::csi("\x1b_Gi=31,s=1,v=1,a=q,t=d,f=24;AAAA\x1b\\")), // Detect KGP
 			Print(Mux::csi("\x1b[>q")),                                    // Request terminal version
+			Print("\x1b[16t"),                                             // Request cell size
 			Print("\x1b]11;?\x07"),                                        // Request background color
 			Print(Mux::csi("\x1b[0c")),                                    // Request device attributes
 			RestorePosition
@@ -52,7 +56,11 @@ impl Emulator {
 			})
 		};
 
-		Ok(Self { kind, light: Self::light_bg(&resp).unwrap_or_default() })
+		Ok(Self {
+			kind,
+			light: Self::light_bg(&resp).unwrap_or_default(),
+			cell_size: Self::cell_size(&resp),
+		})
 	}
 
 	pub fn adapters(self) -> &'static [Adapter] {
@@ -117,7 +125,7 @@ impl Emulator {
 		match timeout(Duration::from_secs(10), read).await {
 			Err(e) => error!("read_until_da1 timed out: {buf:?}, error: {e:?}"),
 			Ok(Err(e)) => error!("read_until_da1 failed: {buf:?}, error: {e:?}"),
-			Ok(Ok(())) => {}
+			Ok(Ok(())) => debug!("read_until_da1: {buf:?}"),
 		}
 		String::from_utf8_lossy(&buf).into_owned()
 	}
@@ -128,12 +136,30 @@ impl Emulator {
 
 		execute!(
 			LineWriter::new(stderr()),
+			Print("\x1b[16t"),          // Request cell size
 			Print("\x1b]11;?\x07"),     // Request background color
 			Print(Mux::csi("\x1b[0c")), // Request device attributes
 		)?;
 
 		let resp = futures::executor::block_on(Self::read_until_da1());
-		Ok(Self { light: Self::light_bg(&resp).unwrap_or_default(), ..Default::default() })
+		Ok(Self {
+			light: Self::light_bg(&resp).unwrap_or_default(),
+			cell_size: Self::cell_size(&resp),
+			..Default::default()
+		})
+	}
+
+	fn cell_size(resp: &str) -> Option<(u16, u16)> {
+		let b = resp.split_at(resp.find("\x1b[6;")? + 4).1.as_bytes();
+
+		let h: Vec<_> = b.iter().copied().take_while(|&c| c.is_ascii_digit()).collect();
+		b.get(h.len()).filter(|&&c| c == b';')?;
+
+		let w: Vec<_> = b[h.len() + 1..].iter().copied().take_while(|&c| c.is_ascii_digit()).collect();
+		b.get(h.len() + 1 + w.len()).filter(|&&c| c == b't')?;
+
+		let (w, h) = unsafe { (String::from_utf8_unchecked(w), String::from_utf8_unchecked(h)) };
+		Some((w.parse().ok()?, h.parse().ok()?))
 	}
 
 	fn light_bg(resp: &str) -> Result<bool> {