From 6d38f34f8b0431da38297df9bc2efa6002ad1635 Mon Sep 17 00:00:00 2001
From: Serg Tereshchenko <serg.partizan@gmail.com>
Date: Mon, 9 Aug 2021 17:45:25 +0300
Subject: [PATCH] refactor: Use paired values as tuples/Dimensions

Paired values, like width/height now using tuples and Dimensions.

`Dimensions` struct implements traits for multiplication and division,
which allows us to scale grid size to physical and back just by
multiplying `Dimensions` instead of each variable.

Also, added trait for multiplication (u64, u64) by Dimensions.
For the same purpose as above.
---
 src/cmd_line.rs                            |  3 +-
 src/main.rs                                |  1 +
 src/renderer/cursor_renderer/mod.rs        |  8 +-
 src/renderer/fonts/caching_shaper.rs       |  2 +-
 src/renderer/mod.rs                        | 95 +++++++++-------------
 src/renderer/rendered_window.rs            | 89 +++++++++-----------
 src/settings/mod.rs                        |  4 +-
 src/settings/window_geometry.rs            | 48 ++++-------
 src/utils/dimensions.rs                    | 83 +++++++++++++++++++
 src/utils/mod.rs                           |  3 +
 src/window/window_wrapper/mod.rs           | 14 ++--
 src/window/window_wrapper/mouse_manager.rs | 34 ++++----
 12 files changed, 211 insertions(+), 173 deletions(-)
 create mode 100644 src/utils/dimensions.rs
 create mode 100644 src/utils/mod.rs

diff --git a/src/cmd_line.rs b/src/cmd_line.rs
index 70b7d2e..38a99f2 100644
--- a/src/cmd_line.rs
+++ b/src/cmd_line.rs
@@ -1,4 +1,5 @@
 use crate::settings::*;
+use crate::utils::Dimensions;
 
 use clap::{App, Arg};
 
@@ -11,7 +12,7 @@ pub struct CmdLineSettings {
     pub files_to_open: Vec<String>,
 
     pub nofork: bool,
-    pub geometry: WindowGeometry,
+    pub geometry: Dimensions,
     pub wsl: bool,
     pub remote_tcp: Option<String>,
     pub multi_grid: bool,
diff --git a/src/main.rs b/src/main.rs
index 0de485d..a2bbd8c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,6 +20,7 @@ mod error_handling;
 mod redraw_scheduler;
 mod renderer;
 mod settings;
+mod utils;
 mod window;
 pub mod windows_utils;
 
diff --git a/src/renderer/cursor_renderer/mod.rs b/src/renderer/cursor_renderer/mod.rs
index 05d1ae5..6514244 100644
--- a/src/renderer/cursor_renderer/mod.rs
+++ b/src/renderer/cursor_renderer/mod.rs
@@ -228,8 +228,7 @@ impl CursorRenderer {
 
     pub fn update_cursor_destination(
         &mut self,
-        font_width: u64,
-        font_height: u64,
+        (font_width, font_height): (u64, u64),
         windows: &HashMap<u64, RenderedWindow>,
     ) {
         let (cursor_grid_x, cursor_grid_y) = self.cursor.grid_position;
@@ -244,7 +243,7 @@ impl CursorRenderer {
             // grid position.
             grid_y = grid_y
                 .max(window.grid_current_position.y)
-                .min(window.grid_current_position.y + window.grid_height as f32 - 1.0);
+                .min(window.grid_current_position.y + window.grid_size.height as f32 - 1.0);
 
             self.destination = (grid_x * font_width as f32, grid_y * font_height as f32).into();
         } else {
@@ -259,13 +258,12 @@ impl CursorRenderer {
     pub fn draw(
         &mut self,
         default_colors: &Colors,
-        font_size: (u64, u64),
+        (font_width, font_height): (u64, u64),
         current_mode: &EditorMode,
         shaper: &mut CachingShaper,
         canvas: &mut Canvas,
         dt: f32,
     ) {
-        let (font_width, font_height) = font_size;
         let render = self.blink_status.update_status(&self.cursor);
         let settings = SETTINGS.get::<CursorSettings>();
 
diff --git a/src/renderer/fonts/caching_shaper.rs b/src/renderer/fonts/caching_shaper.rs
index 331967c..0da30eb 100644
--- a/src/renderer/fonts/caching_shaper.rs
+++ b/src/renderer/fonts/caching_shaper.rs
@@ -231,7 +231,7 @@ impl CachingShaper {
 
     pub fn shape(&mut self, cells: &[String], bold: bool, italic: bool) -> Vec<TextBlob> {
         let current_size = self.current_size();
-        let (glyph_width, _glyph_height) = self.font_base_dimensions();
+        let (glyph_width, ..) = self.font_base_dimensions();
 
         let mut resulting_blobs = Vec::new();
 
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
index e2d56b9..a5afc22 100644
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -1,3 +1,8 @@
+pub mod animation_utils;
+pub mod cursor_renderer;
+mod fonts;
+mod rendered_window;
+
 use std::collections::HashMap;
 use std::sync::mpsc::Receiver;
 use std::sync::Arc;
@@ -6,18 +11,13 @@ use glutin::dpi::PhysicalSize;
 use log::{error, trace};
 use skia_safe::{colors, dash_path_effect, BlendMode, Canvas, Color, Paint, Rect, HSV};
 
-pub mod animation_utils;
-pub mod cursor_renderer;
-mod fonts;
-mod rendered_window;
-
-pub use fonts::caching_shaper::CachingShaper;
-pub use rendered_window::{RenderedWindow, WindowDrawDetails};
-
 use crate::bridge::EditorMode;
 use crate::editor::{Colors, DrawCommand, Style, WindowDrawCommand};
 use crate::settings::*;
+use crate::utils::Dimensions;
 use cursor_renderer::CursorRenderer;
+pub use fonts::caching_shaper::CachingShaper;
+pub use rendered_window::{RenderedWindow, WindowDrawDetails};
 
 #[derive(SettingGroup)]
 #[setting_prefix = "window"]
@@ -48,8 +48,7 @@ pub struct Renderer {
     pub paint: Paint,
     pub shaper: CachingShaper,
     pub default_style: Arc<Style>,
-    pub font_width: u64,
-    pub font_height: u64,
+    pub font_dimensions: Dimensions,
     pub window_regions: Vec<WindowDrawDetails>,
     pub batched_draw_command_receiver: Receiver<Vec<DrawCommand>>,
     pub is_ready: bool,
@@ -67,7 +66,7 @@ impl Renderer {
         let mut paint = Paint::new(colors::WHITE, None);
         paint.set_anti_alias(false);
         let mut shaper = CachingShaper::new(scale_factor as f32);
-        let (font_width, font_height) = shaper.font_base_dimensions();
+        let font_dimensions: Dimensions = shaper.font_base_dimensions().into();
         let default_style = Arc::new(Style::new(Colors::new(
             Some(colors::WHITE),
             Some(colors::BLACK),
@@ -82,29 +81,21 @@ impl Renderer {
             paint,
             shaper,
             default_style,
-            font_width,
-            font_height,
+            font_dimensions,
             window_regions,
             batched_draw_command_receiver,
             is_ready: false,
         }
     }
 
-    // TODO: Refactor code to use these two functions instead of multiplication.
     /// Convert PhysicalSize to grid size
-    pub fn to_grid_size(&self, new_size: PhysicalSize<u32>) -> (u64, u64) {
-        let width = new_size.width as u64 / self.font_width;
-        let height = new_size.height as u64 / self.font_height;
-        (width, height)
+    pub fn convert_physical_to_grid(&self, physical: PhysicalSize<u32>) -> Dimensions {
+        Dimensions::from(physical) / self.font_dimensions
     }
 
     /// Convert grid size to PhysicalSize
-    pub fn to_physical_size(&self, new_size: (u64, u64)) -> PhysicalSize<u32> {
-        let (width, height) = new_size;
-        PhysicalSize {
-            width: (width * self.font_width) as u32,
-            height: (height * self.font_height) as u32,
-        }
+    pub fn convert_grid_to_physical(&self, grid: Dimensions) -> PhysicalSize<u32> {
+        (grid * self.font_dimensions).into()
     }
 
     pub fn handle_scale_factor_update(&mut self, scale_factor: f64) {
@@ -118,23 +109,15 @@ impl Renderer {
     }
 
     fn update_font_dimensions(&mut self) {
-        let (font_width, font_height) = self.shaper.font_base_dimensions();
-        self.font_width = font_width;
-        self.font_height = font_height;
+        self.font_dimensions = self.shaper.font_base_dimensions().into();
         self.is_ready = true;
-        trace!(
-            "Updating font dimensions: {}x{}",
-            self.font_width,
-            self.font_height,
-        );
+        trace!("Updated font dimensions: {:?}", self.font_dimensions,);
     }
 
-    fn compute_text_region(&self, grid_pos: (u64, u64), cell_width: u64) -> Rect {
-        let (grid_x, grid_y) = grid_pos;
-        let x = grid_x * self.font_width;
-        let y = grid_y * self.font_height;
-        let width = cell_width * self.font_width;
-        let height = self.font_height;
+    fn compute_text_region(&self, grid_position: (u64, u64), cell_width: u64) -> Rect {
+        let (x, y) = grid_position * self.font_dimensions;
+        let width = cell_width * self.font_dimensions.width;
+        let height = self.font_dimensions.height;
         Rect::new(x as f32, y as f32, (x + width) as f32, (y + height) as f32)
     }
 
@@ -145,13 +128,13 @@ impl Renderer {
     fn draw_background(
         &mut self,
         canvas: &mut Canvas,
-        grid_pos: (u64, u64),
+        grid_position: (u64, u64),
         cell_width: u64,
         style: &Option<Arc<Style>>,
     ) {
         self.paint.set_blend_mode(BlendMode::Src);
 
-        let region = self.compute_text_region(grid_pos, cell_width);
+        let region = self.compute_text_region(grid_position, cell_width);
         let style = style.as_ref().unwrap_or(&self.default_style);
 
         if cfg!(feature = "debug-renderer") {
@@ -169,20 +152,18 @@ impl Renderer {
         &mut self,
         canvas: &mut Canvas,
         cells: &[String],
-        grid_pos: (u64, u64),
+        grid_position: (u64, u64),
         cell_width: u64,
         style: &Option<Arc<Style>>,
     ) {
-        let (grid_x, grid_y) = grid_pos;
-        let x = grid_x * self.font_width;
-        let y = grid_y * self.font_height;
-        let width = cell_width * self.font_width;
+        let (x, y) = grid_position * self.font_dimensions;
+        let width = cell_width * self.font_dimensions.width;
 
         let style = style.as_ref().unwrap_or(&self.default_style);
 
         canvas.save();
 
-        let region = self.compute_text_region(grid_pos, cell_width);
+        let region = self.compute_text_region(grid_position, cell_width);
 
         canvas.clip_rect(region, None, Some(false));
 
@@ -204,10 +185,13 @@ impl Renderer {
             }
 
             canvas.draw_line(
-                (x as f32, (y - line_position + self.font_height) as f32),
+                (
+                    x as f32,
+                    (y - line_position + self.font_dimensions.height) as f32,
+                ),
                 (
                     (x + width) as f32,
-                    (y - line_position + self.font_height) as f32,
+                    (y - line_position + self.font_dimensions.height) as f32,
                 ),
                 &self.paint,
             );
@@ -270,8 +254,7 @@ impl Renderer {
                         self,
                         grid_id,
                         (grid_left as f32, grid_top as f32).into(),
-                        width,
-                        height,
+                        (width, height).into(),
                     );
                     self.rendered_windows.insert(grid_id, new_window);
                 } else {
@@ -317,13 +300,11 @@ impl Renderer {
         root_canvas.reset_matrix();
 
         if let Some(root_window) = self.rendered_windows.get(&1) {
-            let clip_rect = root_window.pixel_region(self.font_width, self.font_height);
+            let clip_rect = root_window.pixel_region(self.font_dimensions);
             root_canvas.clip_rect(&clip_rect, None, Some(false));
         }
 
         let default_background = self.get_default_background();
-        let font_width = self.font_width;
-        let font_height = self.font_height;
 
         let windows: Vec<&mut RenderedWindow> = {
             let (mut root_windows, mut floating_windows): (
@@ -352,6 +333,7 @@ impl Renderer {
         };
 
         let settings = SETTINGS.get::<RendererSettings>();
+        let font_dimensions = self.font_dimensions;
         self.window_regions = windows
             .into_iter()
             .map(|window| {
@@ -359,8 +341,7 @@ impl Renderer {
                     root_canvas,
                     &settings,
                     default_background,
-                    font_width,
-                    font_height,
+                    font_dimensions,
                     dt,
                 )
             })
@@ -368,11 +349,11 @@ impl Renderer {
 
         let windows = &self.rendered_windows;
         self.cursor_renderer
-            .update_cursor_destination(font_width, font_height, windows);
+            .update_cursor_destination(font_dimensions.into(), windows);
 
         self.cursor_renderer.draw(
             &self.default_style.colors,
-            (self.font_width, self.font_height),
+            font_dimensions.into(),
             &self.current_mode,
             &mut self.shaper,
             root_canvas,
diff --git a/src/renderer/rendered_window.rs b/src/renderer/rendered_window.rs
index a556c58..289b79b 100644
--- a/src/renderer/rendered_window.rs
+++ b/src/renderer/rendered_window.rs
@@ -11,18 +11,14 @@ use super::animation_utils::*;
 use super::{Renderer, RendererSettings};
 use crate::editor::WindowDrawCommand;
 use crate::redraw_scheduler::REDRAW_SCHEDULER;
+use crate::utils::Dimensions;
 
-fn build_window_surface(
-    parent_canvas: &mut Canvas,
-    pixel_width: u64,
-    pixel_height: u64,
-) -> Surface {
-    let dimensions = (pixel_width as i32, pixel_height as i32);
+fn build_window_surface(parent_canvas: &mut Canvas, pixel_size: (i32, i32)) -> Surface {
     let mut context = parent_canvas.recording_context().unwrap();
     let budgeted = Budgeted::Yes;
     let parent_image_info = parent_canvas.image_info();
     let image_info = ImageInfo::new(
-        dimensions,
+        pixel_size,
         parent_image_info.color_type(),
         parent_image_info.alpha_type(),
         parent_image_info.color_space(),
@@ -45,12 +41,10 @@ fn build_window_surface(
 fn build_window_surface_with_grid_size(
     parent_canvas: &mut Canvas,
     renderer: &Renderer,
-    grid_width: u64,
-    grid_height: u64,
+    grid_size: Dimensions,
 ) -> Surface {
-    let pixel_width = ((grid_width * renderer.font_width) as f32) as u64;
-    let pixel_height = ((grid_height * renderer.font_height) as f32) as u64;
-    let mut surface = build_window_surface(parent_canvas, pixel_width, pixel_height);
+    let mut surface =
+        build_window_surface(parent_canvas, (grid_size * renderer.font_dimensions).into());
 
     let canvas = surface.canvas();
     canvas.clear(renderer.get_default_background());
@@ -71,12 +65,10 @@ impl LocatedSurface {
     fn new(
         parent_canvas: &mut Canvas,
         renderer: &Renderer,
-        grid_width: u64,
-        grid_height: u64,
+        grid_size: Dimensions,
         top_line: u64,
     ) -> LocatedSurface {
-        let surface =
-            build_window_surface_with_grid_size(parent_canvas, renderer, grid_width, grid_height);
+        let surface = build_window_surface_with_grid_size(parent_canvas, renderer, grid_size);
 
         LocatedSurface { surface, top_line }
     }
@@ -98,8 +90,7 @@ pub struct RenderedWindow {
     pub hidden: bool,
     pub floating_order: Option<u64>,
 
-    pub grid_width: u64,
-    pub grid_height: u64,
+    pub grid_size: Dimensions,
 
     grid_start_position: Point,
     pub grid_current_position: Point,
@@ -125,11 +116,9 @@ impl RenderedWindow {
         renderer: &Renderer,
         id: u64,
         grid_position: Point,
-        grid_width: u64,
-        grid_height: u64,
+        grid_size: Dimensions,
     ) -> RenderedWindow {
-        let current_surface =
-            LocatedSurface::new(parent_canvas, renderer, grid_width, grid_height, 0);
+        let current_surface = LocatedSurface::new(parent_canvas, renderer, grid_size, 0);
 
         RenderedWindow {
             snapshots: VecDeque::new(),
@@ -138,8 +127,7 @@ impl RenderedWindow {
             hidden: false,
             floating_order: None,
 
-            grid_width,
-            grid_height,
+            grid_size,
 
             grid_start_position: grid_position,
             grid_current_position: grid_position,
@@ -153,16 +141,15 @@ impl RenderedWindow {
         }
     }
 
-    pub fn pixel_region(&self, font_width: u64, font_height: u64) -> Rect {
+    pub fn pixel_region(&self, font_dimensions: Dimensions) -> Rect {
         let current_pixel_position = Point::new(
-            self.grid_current_position.x * font_width as f32,
-            self.grid_current_position.y * font_height as f32,
+            self.grid_current_position.x * font_dimensions.width as f32,
+            self.grid_current_position.y * font_dimensions.height as f32,
         );
 
-        let image_width = (self.grid_width * font_width) as i32;
-        let image_height = (self.grid_height * font_height) as i32;
+        let image_size: (i32, i32) = (self.grid_size * font_dimensions).into();
 
-        Rect::from_point_and_size(current_pixel_position, (image_width, image_height))
+        Rect::from_point_and_size(current_pixel_position, image_size)
     }
 
     pub fn update(&mut self, settings: &RendererSettings, dt: f32) -> bool {
@@ -212,15 +199,14 @@ impl RenderedWindow {
         root_canvas: &mut Canvas,
         settings: &RendererSettings,
         default_background: Color,
-        font_width: u64,
-        font_height: u64,
+        font_dimensions: Dimensions,
         dt: f32,
     ) -> WindowDrawDetails {
         if self.update(settings, dt) {
             REDRAW_SCHEDULER.queue_next_frame();
         }
 
-        let pixel_region = self.pixel_region(font_width, font_height);
+        let pixel_region = self.pixel_region(font_dimensions);
 
         root_canvas.save();
         root_canvas.clip_rect(&pixel_region, None, Some(false));
@@ -252,6 +238,8 @@ impl RenderedWindow {
 
         paint.set_color(Color::from_argb(a, 255, 255, 255));
 
+        let font_height = font_dimensions.height;
+
         // Draw scrolling snapshots
         for snapshot in self.snapshots.iter_mut().rev() {
             let scroll_offset = (snapshot.top_line * font_height) as f32
@@ -298,10 +286,11 @@ impl RenderedWindow {
         match draw_command {
             WindowDrawCommand::Position {
                 grid_position: (grid_left, grid_top),
-                grid_size: (grid_width, grid_height),
+                grid_size,
                 floating_order,
             } => {
                 let new_destination: Point = (grid_left as f32, grid_top as f32).into();
+                let new_grid_size: Dimensions = grid_size.into();
 
                 if self.grid_destination != new_destination {
                     if self.grid_start_position.x.abs() > f32::EPSILON
@@ -318,13 +307,12 @@ impl RenderedWindow {
                     self.grid_destination = new_destination;
                 }
 
-                if grid_width != self.grid_width || grid_height != self.grid_height {
+                if self.grid_size != new_grid_size {
                     let mut old_surface = self.current_surface.surface;
                     self.current_surface.surface = build_window_surface_with_grid_size(
                         old_surface.canvas(),
                         renderer,
-                        grid_width,
-                        grid_height,
+                        new_grid_size,
                     );
                     old_surface.draw(
                         self.current_surface.surface.canvas(),
@@ -333,8 +321,7 @@ impl RenderedWindow {
                         None,
                     );
 
-                    self.grid_width = grid_width;
-                    self.grid_height = grid_height;
+                    self.grid_size = new_grid_size;
                 }
 
                 self.floating_order = floating_order;
@@ -354,8 +341,8 @@ impl RenderedWindow {
                 style,
             } => {
                 let grid_position = (window_left, window_top);
-
                 let canvas = self.current_surface.surface.canvas();
+
                 canvas.save();
                 renderer.draw_background(canvas, grid_position, width, &style);
                 renderer.draw_foreground(canvas, &cells, grid_position, width, &style);
@@ -369,17 +356,22 @@ impl RenderedWindow {
                 rows,
                 cols,
             } => {
-                let font_width = renderer.font_width as f32;
-                let font_height = renderer.font_height as f32;
+                let Dimensions {
+                    width: font_width,
+                    height: font_height,
+                } = renderer.font_dimensions;
                 let scrolled_region = Rect::new(
-                    left as f32 * font_width,
-                    top as f32 * font_height,
-                    right as f32 * font_width,
-                    bottom as f32 * font_height,
+                    (left * font_width) as f32,
+                    (top * font_height) as f32,
+                    (right * font_width) as f32,
+                    (bottom * font_height) as f32,
                 );
 
                 let mut translated_region = scrolled_region;
-                translated_region.offset((-cols as f32 * font_width, -rows as f32 * font_height));
+                translated_region.offset((
+                    -cols as f32 * font_width as f32,
+                    -rows as f32 * font_height as f32,
+                ));
 
                 let snapshot = self.current_surface.surface.image_snapshot();
                 let canvas = self.current_surface.surface.canvas();
@@ -400,8 +392,7 @@ impl RenderedWindow {
                 self.current_surface.surface = build_window_surface_with_grid_size(
                     self.current_surface.surface.canvas(),
                     renderer,
-                    self.grid_width,
-                    self.grid_height,
+                    self.grid_size,
                 );
 
                 self.snapshots.clear();
diff --git a/src/settings/mod.rs b/src/settings/mod.rs
index 87fe79c..ada92e8 100644
--- a/src/settings/mod.rs
+++ b/src/settings/mod.rs
@@ -9,9 +9,7 @@ use log::trace;
 use nvim_rs::Neovim;
 use parking_lot::RwLock;
 pub use rmpv::Value;
-pub use window_geometry::{
-    maybe_save_window_size, parse_window_geometry, WindowGeometry, DEFAULT_WINDOW_GEOMETRY,
-};
+pub use window_geometry::{maybe_save_window_size, parse_window_geometry, DEFAULT_WINDOW_GEOMETRY};
 
 use crate::bridge::TxWrapper;
 use crate::error_handling::ResultPanicExplanation;
diff --git a/src/settings/window_geometry.rs b/src/settings/window_geometry.rs
index 2166afc..cb5ed3e 100644
--- a/src/settings/window_geometry.rs
+++ b/src/settings/window_geometry.rs
@@ -1,6 +1,6 @@
 use crate::settings::SETTINGS;
+use crate::utils::Dimensions;
 use crate::window::WindowSettings;
-use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
 #[cfg(unix)]
@@ -8,56 +8,40 @@ const SETTINGS_PATH: &str = ".local/share/nvim/neovide-settings.json";
 #[cfg(windows)]
 const SETTINGS_PATH: &str = "AppData/Local/nvim-data/neovide-settings.json";
 
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
-pub struct WindowGeometry {
-    pub width: u64,
-    pub height: u64,
-}
-
-impl From<(u64, u64)> for WindowGeometry {
-    fn from((width, height): (u64, u64)) -> Self {
-        WindowGeometry { width, height }
-    }
-}
-
 fn neovim_std_datapath() -> PathBuf {
     let mut settings_path = dirs::home_dir().unwrap();
     settings_path.push(SETTINGS_PATH);
     settings_path
 }
 
-pub fn try_to_load_last_window_size() -> Result<WindowGeometry, String> {
+pub fn try_to_load_last_window_size() -> Result<Dimensions, String> {
     let settings_path = neovim_std_datapath();
-    let serialized_size = std::fs::read_to_string(&settings_path).map_err(|e| e.to_string())?;
+    let json = std::fs::read_to_string(&settings_path).map_err(|e| e.to_string())?;
 
-    let deserialize_size: WindowGeometry =
-        serde_json::from_str(&serialized_size).map_err(|e| e.to_string())?;
-    log::debug!("Loaded Window Size: {:?}", deserialize_size);
-    Ok(deserialize_size)
+    let geometry: Dimensions = serde_json::from_str(&json).map_err(|e| e.to_string())?;
+    log::debug!("Loaded Window Size: {:?}", geometry);
+    Ok(geometry)
 }
-pub const DEFAULT_WINDOW_GEOMETRY: WindowGeometry = WindowGeometry {
+pub const DEFAULT_WINDOW_GEOMETRY: Dimensions = Dimensions {
     width: 100,
     height: 50,
 };
 
-pub fn maybe_save_window_size(grid_size: Option<WindowGeometry>) {
+pub fn maybe_save_window_size(grid_size: Option<Dimensions>) {
     let settings = SETTINGS.get::<WindowSettings>();
-    let saved_window_size = if settings.remember_window_size && grid_size.is_some() {
-        grid_size.unwrap()
+    let saved_window_size = if settings.remember_window_size {
+        grid_size.unwrap_or(DEFAULT_WINDOW_GEOMETRY)
     } else {
-        WindowGeometry {
-            width: DEFAULT_WINDOW_GEOMETRY.width as u64,
-            height: DEFAULT_WINDOW_GEOMETRY.height as u64,
-        }
+        DEFAULT_WINDOW_GEOMETRY
     };
 
     let settings_path = neovim_std_datapath();
-    let serialized_size = serde_json::to_string(&saved_window_size).unwrap();
-    log::debug!("Saved Window Size: {}", serialized_size);
-    std::fs::write(settings_path, serialized_size).unwrap();
+    let json = serde_json::to_string(&saved_window_size).unwrap();
+    log::debug!("Saved Window Size: {}", json);
+    std::fs::write(settings_path, json).unwrap();
 }
 
-pub fn parse_window_geometry(geometry: Option<String>) -> Result<WindowGeometry, String> {
+pub fn parse_window_geometry(geometry: Option<String>) -> Result<Dimensions, String> {
     let saved_window_size =
         try_to_load_last_window_size().or::<String>(Ok(DEFAULT_WINDOW_GEOMETRY));
     geometry.map_or(saved_window_size, |input| {
@@ -83,7 +67,7 @@ pub fn parse_window_geometry(geometry: Option<String>) -> Result<WindowGeometry,
             .collect::<Result<Vec<_>, &str>>()
             .and_then(|dimensions| {
                 if let [width, height] = dimensions[..] {
-                    Ok(WindowGeometry { width, height })
+                    Ok(Dimensions { width, height })
                 } else {
                     Err(invalid_parse_err.as_str())
                 }
diff --git a/src/utils/dimensions.rs b/src/utils/dimensions.rs
new file mode 100644
index 0000000..e87216e
--- /dev/null
+++ b/src/utils/dimensions.rs
@@ -0,0 +1,83 @@
+use glutin::dpi::PhysicalSize;
+use serde::{Deserialize, Serialize};
+use std::ops::{Div, Mul};
+
+// Maybe this should be independent from serialization?
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
+pub struct Dimensions {
+    pub width: u64,
+    pub height: u64,
+}
+
+macro_rules! impl_from_tuple_to_dimensions {
+    ($type:ty) => {
+        impl From<($type, $type)> for Dimensions {
+            fn from((width, height): ($type, $type)) -> Self {
+                Dimensions {
+                    width: width as u64,
+                    height: height as u64,
+                }
+            }
+        }
+    };
+}
+
+macro_rules! impl_from_dimensions_to_tuple {
+    ($type:ty) => {
+        impl From<Dimensions> for ($type, $type) {
+            fn from(dimensions: Dimensions) -> Self {
+                (dimensions.width as $type, dimensions.height as $type)
+            }
+        }
+    };
+}
+
+impl_from_tuple_to_dimensions!(u64);
+impl_from_tuple_to_dimensions!(f32);
+
+impl_from_dimensions_to_tuple!(u64);
+impl_from_dimensions_to_tuple!(u32);
+impl_from_dimensions_to_tuple!(i32);
+
+impl From<PhysicalSize<u32>> for Dimensions {
+    fn from(PhysicalSize { width, height }: PhysicalSize<u32>) -> Self {
+        Dimensions {
+            width: width as u64,
+            height: height as u64,
+        }
+    }
+}
+
+impl From<Dimensions> for PhysicalSize<u32> {
+    fn from(Dimensions { width, height }: Dimensions) -> Self {
+        PhysicalSize {
+            width: width as u32,
+            height: height as u32,
+        }
+    }
+}
+
+impl Mul for Dimensions {
+    type Output = Self;
+
+    fn mul(self, other: Self) -> Self {
+        Dimensions::from((self.width * other.width, self.height * other.height))
+    }
+}
+
+impl Div for Dimensions {
+    type Output = Self;
+
+    fn div(self, other: Self) -> Self {
+        Dimensions::from((self.width / other.width, self.height / other.height))
+    }
+}
+
+impl Mul<Dimensions> for (u64, u64) {
+    type Output = Self;
+
+    fn mul(self, other: Dimensions) -> Self {
+        let (x, y) = self;
+        (x * other.width, y * other.height)
+    }
+}
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
new file mode 100644
index 0000000..d4ed43c
--- /dev/null
+++ b/src/utils/mod.rs
@@ -0,0 +1,3 @@
+mod dimensions;
+
+pub use dimensions::*;
diff --git a/src/window/window_wrapper/mod.rs b/src/window/window_wrapper/mod.rs
index d96c4ec..dbaf15a 100644
--- a/src/window/window_wrapper/mod.rs
+++ b/src/window/window_wrapper/mod.rs
@@ -33,7 +33,8 @@ use crate::{
     editor::WindowCommand,
     redraw_scheduler::REDRAW_SCHEDULER,
     renderer::Renderer,
-    settings::{maybe_save_window_size, WindowGeometry, SETTINGS},
+    settings::{maybe_save_window_size, SETTINGS},
+    utils::Dimensions,
 };
 use image::{load_from_memory, GenericImageView, Pixel};
 use keyboard_manager::KeyboardManager;
@@ -53,7 +54,7 @@ pub struct GlutinWindowWrapper {
     title: String,
     fullscreen: bool,
     saved_inner_size: PhysicalSize<u32>,
-    saved_grid_size: Option<WindowGeometry>,
+    saved_grid_size: Option<Dimensions>,
     ui_command_sender: LoggingTx<UiCommand>,
     window_command_receiver: Receiver<WindowCommand>,
 }
@@ -177,7 +178,7 @@ impl GlutinWindowWrapper {
 
         if self.saved_grid_size.is_none() && !window.is_maximized() {
             let size = SETTINGS.get::<CmdLineSettings>().geometry;
-            window.set_inner_size(self.renderer.to_physical_size((size.width, size.height)));
+            window.set_inner_size(self.renderer.convert_grid_to_physical(size));
             self.saved_grid_size = Some(size);
         }
 
@@ -191,7 +192,7 @@ impl GlutinWindowWrapper {
     }
 
     fn handle_new_grid_size(&mut self, new_size: PhysicalSize<u32>) {
-        let grid_size: WindowGeometry = self.renderer.to_grid_size(new_size).into();
+        let grid_size = self.renderer.convert_physical_to_grid(new_size);
         if self.saved_grid_size == Some(grid_size) {
             trace!("Grid matched saved size, skip update.");
             return;
@@ -263,10 +264,9 @@ pub fn create_window(
     let skia_renderer = SkiaRenderer::new(&windowed_context);
 
     log::info!(
-        "window created (scale_factor: {}, font_size: {}x{})",
+        "window created (scale_factor: {}, font_dimensions: {:?})",
         scale_factor,
-        renderer.font_width,
-        renderer.font_height,
+        renderer.font_dimensions,
     );
 
     let mut window_wrapper = GlutinWindowWrapper {
diff --git a/src/window/window_wrapper/mouse_manager.rs b/src/window/window_wrapper/mouse_manager.rs
index 338aa09..5a4e102 100644
--- a/src/window/window_wrapper/mouse_manager.rs
+++ b/src/window/window_wrapper/mouse_manager.rs
@@ -15,8 +15,7 @@ use crate::renderer::{Renderer, WindowDrawDetails};
 fn clamp_position(
     position: PhysicalPosition<f32>,
     region: Rect,
-    font_width: u64,
-    font_height: u64,
+    (font_width, font_height): (u64, u64),
 ) -> PhysicalPosition<f32> {
     PhysicalPosition::new(
         position
@@ -32,8 +31,7 @@ fn clamp_position(
 
 fn to_grid_coords(
     position: PhysicalPosition<f32>,
-    font_width: u64,
-    font_height: u64,
+    (font_width, font_height): (u64, u64),
 ) -> PhysicalPosition<u32> {
     PhysicalPosition::new(
         (position.x as u64 / font_width) as u32,
@@ -115,14 +113,10 @@ impl MouseManager {
         let global_bounds = relevant_window_details
             .map(|details| details.region)
             .unwrap_or_else(|| Rect::from_wh(size.width as f32, size.height as f32));
-        let clamped_position = clamp_position(
-            position,
-            global_bounds,
-            renderer.font_width,
-            renderer.font_height,
-        );
+        let clamped_position =
+            clamp_position(position, global_bounds, renderer.font_dimensions.into());
 
-        self.position = to_grid_coords(clamped_position, renderer.font_width, renderer.font_height);
+        self.position = to_grid_coords(clamped_position, renderer.font_dimensions.into());
 
         if let Some(relevant_window_details) = relevant_window_details {
             let relative_position = PhysicalPosition::new(
@@ -130,7 +124,7 @@ impl MouseManager {
                 clamped_position.y - relevant_window_details.region.top,
             );
             self.relative_position =
-                to_grid_coords(relative_position, renderer.font_width, renderer.font_height);
+                to_grid_coords(relative_position, renderer.font_dimensions.into());
 
             let previous_position = self.drag_position;
             // Until https://github.com/neovim/neovim/pull/12667 is merged, we have to special
@@ -254,11 +248,12 @@ impl MouseManager {
         }
     }
 
-    fn handle_pixel_scroll(&mut self, renderer: &Renderer, pixel_x: f32, pixel_y: f32) {
-        self.handle_line_scroll(
-            pixel_x / renderer.font_width as f32,
-            pixel_y / renderer.font_height as f32,
-        );
+    fn handle_pixel_scroll(
+        &mut self,
+        (font_width, font_height): (u64, u64),
+        (pixel_x, pixel_y): (f32, f32),
+    ) {
+        self.handle_line_scroll(pixel_x / font_width as f32, pixel_y / font_height as f32);
     }
 
     pub fn handle_event(
@@ -292,7 +287,10 @@ impl MouseManager {
                         ..
                     },
                 ..
-            } => self.handle_pixel_scroll(renderer, delta.x as f32, delta.y as f32),
+            } => self.handle_pixel_scroll(
+                renderer.font_dimensions.into(),
+                (delta.x as f32, delta.y as f32),
+            ),
             Event::WindowEvent {
                 event:
                     WindowEvent::MouseInput {