fix image rendering

Author: o2sh

image/src/iterm.rs

@@ -1,7 +1,7 @@
+use crate::get_dimensions;
 use anyhow::Result;
 use base64::{engine, Engine};
 use image::{imageops::FilterType, DynamicImage};
-use libc::{ioctl, winsize, STDOUT_FILENO, TIOCGWINSZ};
 use std::env;
 use std::io::Cursor;
 
@@ -31,17 +31,13 @@ impl super::ImageBackend for ITermBackend {
         image: &DynamicImage,
         _colors: usize,
     ) -> Result<String> {
-        let tty_size = unsafe {
-            let tty_size: winsize = std::mem::zeroed();
-            ioctl(STDOUT_FILENO, TIOCGWINSZ, &tty_size);
-            tty_size
-        };
+        let tty_size = unsafe { get_dimensions() };
         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);
 
         // resize image to fit the text height with the Lanczos3 algorithm
         let image = image.resize(
-            u32::max_value(),
+            u32::MAX,
             (lines.len() as f64 / height_ratio) as u32,
             FilterType::Lanczos3,
         );

image/src/kitty.rs

@@ -1,9 +1,10 @@
+use crate::get_dimensions;
 use anyhow::Result;
 use base64::{engine, Engine};
 use image::{imageops::FilterType, DynamicImage};
 use libc::{
-    c_void, ioctl, poll, pollfd, read, tcgetattr, tcsetattr, termios, winsize, ECHO, ICANON,
-    POLLIN, STDIN_FILENO, STDOUT_FILENO, TCSANOW, TIOCGWINSZ,
+    c_void, poll, pollfd, read, tcgetattr, tcsetattr, termios, ECHO, ICANON, POLLIN, STDIN_FILENO,
+    TCSANOW,
 };
 use std::io::{stdout, Write};
 use std::time::Instant;
@@ -91,17 +92,13 @@ impl super::ImageBackend for KittyBackend {
         image: &DynamicImage,
         _colors: usize,
     ) -> Result<String> {
-        let tty_size = unsafe {
-            let tty_size: winsize = std::mem::zeroed();
-            ioctl(STDOUT_FILENO, TIOCGWINSZ, &tty_size);
-            tty_size
-        };
+        let tty_size = unsafe { get_dimensions() };
         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);
 
         // resize image to fit the text height with the Lanczos3 algorithm
         let image = image.resize(
-            u32::max_value(),
+            u32::MAX,
             (lines.len() as f64 / height_ratio) as u32,
             FilterType::Lanczos3,
         );

image/src/lib.rs

@@ -48,3 +48,18 @@ pub fn get_image_backend(image_protocol: ImageProtocol) -> Option<Box<dyn ImageB
     let backend = None;
     backend
 }
+
+#[cfg(not(windows))]
+unsafe fn get_dimensions() -> libc::winsize {
+    use libc::{ioctl, winsize, STDOUT_FILENO, TIOCGWINSZ};
+    use std::mem::zeroed;
+
+    let mut window: winsize = zeroed();
+    let result = ioctl(STDOUT_FILENO, TIOCGWINSZ, &mut window);
+
+    if result == -1 {
+        zeroed()
+    } else {
+        window
+    }
+}

image/src/sixel.rs

@@ -1,12 +1,13 @@
+use crate::get_dimensions;
 use anyhow::{Context, Result};
 use color_quant::NeuQuant;
 use image::{
     imageops::{colorops, FilterType},
     DynamicImage, GenericImageView, ImageBuffer, Pixel, Rgb,
 };
 use libc::{
-    c_void, ioctl, poll, pollfd, read, tcgetattr, tcsetattr, termios, winsize, ECHO, ICANON,
-    POLLIN, STDIN_FILENO, STDOUT_FILENO, TCSANOW, TIOCGWINSZ,
+    c_void, poll, pollfd, read, tcgetattr, tcsetattr, termios, ECHO, ICANON, POLLIN, STDIN_FILENO,
+    TCSANOW,
 };
 use std::io::{stdout, Write};
 use std::time::Instant;
@@ -80,19 +81,15 @@ impl Default for 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 = unsafe {
-            let tty_size: winsize = std::mem::zeroed();
-            ioctl(STDOUT_FILENO, TIOCGWINSZ, &tty_size);
-            tty_size
-        };
+        let tty_size = unsafe { get_dimensions() };
         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;
         let height_ratio = 1.0 / lh as f64;
 
         // resize image to fit the text height with the Lanczos3 algorithm
         let image = image.resize(
-            u32::max_value(),
+            u32::MAX,
             (lines.len() as f64 / height_ratio) as u32,
             FilterType::Lanczos3,
         );