feat: replace get_dimensions with tcgetwinsize

Author: Sk7Str1p3

Cargo.lock

@@ -16,3 +16,4 @@ image.workspace = true
 color_quant = "1.1.0"
 base64 = "0.22.1"
 nix = { version = "0.30.1", features = ["poll", "term", "ioctl"] }
+rustix = { version = "1.1.2", features = ["termios"] }

image/Cargo.toml

@@ -1,7 +1,7 @@
-use crate::get_dimensions;
 use anyhow::Result;
 use base64::{engine, Engine};
 use image::{imageops::FilterType, DynamicImage};
+use rustix::termios::tcgetwinsize;
 use std::env;
 use std::io::Cursor;
 
@@ -21,7 +21,7 @@ impl super::ImageBackend for ITermBackend {
         image: &DynamicImage,
         _colors: usize,
     ) -> Result<String> {
-        let tty_size = get_dimensions()?;
+        let tty_size = tcgetwinsize(std::io::stdin())?;
         let width_ratio = f64::from(tty_size.ws_col) / f64::from(tty_size.ws_xpixel);
         let height_ratio = f64::from(tty_size.ws_row) / f64::from(tty_size.ws_ypixel);
 

image/src/iterm.rs

@@ -1,11 +1,11 @@
-use crate::get_dimensions;
 use anyhow::{Context as _, Result};
 use base64::{engine, Engine};
 use image::{imageops::FilterType, DynamicImage};
 
 use nix::poll::{poll, PollFd, PollFlags, PollTimeout};
 use nix::sys::termios::{tcgetattr, tcsetattr, LocalFlags, SetArg};
 use nix::unistd::read;
+use rustix::termios::tcgetwinsize;
 
 use std::io::{stdout, Write};
 use std::os::fd::AsFd as _;
@@ -73,7 +73,7 @@ impl super::ImageBackend for KittyBackend {
         image: &DynamicImage,
         _colors: usize,
     ) -> Result<String> {
-        let tty_size = get_dimensions()?;
+        let tty_size = tcgetwinsize(std::io::stdin())?;
         let width_ratio = f64::from(tty_size.ws_col) / f64::from(tty_size.ws_xpixel);
         let height_ratio = f64::from(tty_size.ws_row) / f64::from(tty_size.ws_ypixel);
 

image/src/kitty.rs

@@ -1,6 +1,6 @@
-use anyhow::{bail, Result};
+use anyhow::Result;
 use image::DynamicImage;
-use nix::pty::Winsize;
+
 
 #[derive(clap::ValueEnum, Clone, PartialEq, Eq, Debug)]
 pub enum ImageProtocol {
@@ -49,25 +49,3 @@ pub fn get_image_backend(image_protocol: ImageProtocol) -> Option<Box<dyn ImageB
     let backend = None;
     backend
 }
-
-#[cfg(not(windows))]
-fn get_dimensions() -> Result<Winsize> {
-    nix::ioctl_read_bad!(ioctl, nix::libc::TIOCGWINSZ, nix::libc::winsize);
-
-    let mut window = Winsize {
-        ws_col: 0,
-        ws_row: 0,
-        ws_xpixel: 0,
-        ws_ypixel: 0,
-    };
-    let result = unsafe {
-        use std::os::fd::AsRawFd as _;
-        ioctl(std::io::stdout().as_raw_fd(), &mut window)?
-    };
-
-    if result == -1 {
-        bail!("ioctl error!")
-    } else {
-        Ok(window)
-    }
-}

image/src/lib.rs

@@ -1,4 +1,3 @@
-use crate::get_dimensions;
 use anyhow::{Context as _, Result};
 use color_quant::NeuQuant;
 use image::{
@@ -9,6 +8,7 @@ use image::{
 use nix::poll::{poll, PollFd, PollFlags, PollTimeout};
 use nix::sys::termios::{tcgetattr, tcsetattr, LocalFlags, SetArg};
 use nix::unistd::read;
+use rustix::termios::tcgetwinsize;
 
 use std::io::{stdout, Write};
 use std::os::fd::AsFd;
@@ -66,7 +66,7 @@ impl SixelBackend {
 impl super::ImageBackend for SixelBackend {
     #[allow(clippy::map_entry)]
     fn add_image(&self, lines: Vec<String>, image: &DynamicImage, colors: usize) -> Result<String> {
-        let tty_size = get_dimensions()?;
+        let tty_size = tcgetwinsize(std::io::stdin())?;
         let cw = tty_size.ws_xpixel / tty_size.ws_col;
         let lh = tty_size.ws_ypixel / tty_size.ws_row;
         let width_ratio = 1.0 / cw as f64;