tidy up default_dpi vs DEFAULT_DPI

This commit breaks the dependency from config -> window,
which in turn breaks the dependency from mux-server -> x11 libs
on linux.

Cargo.lock

@@ -730,7 +730,6 @@ dependencies = [
  "wezterm-input-types",
  "wezterm-term",
  "winapi 0.3.9",
- "window",
 ]
 
 [[package]]

config/Cargo.toml

@@ -34,7 +34,6 @@ termwiz = { path = "../termwiz" }
 toml = "0.5"
 wezterm-input-types = { path = "../wezterm-input-types" }
 wezterm-term = { path = "../term", features=["use_serde"] }
-window = { path = "../window" }
 
 [target."cfg(windows)".dependencies]
 winapi = { version = "0.3", features = ["winuser"]}

config/src/lib.rs

@@ -463,8 +463,7 @@ pub struct Config {
     pub color_scheme_dirs: Vec<PathBuf>,
 
     /// The DPI to assume
-    #[serde(default = "default_dpi")]
-    pub dpi: f64,
+    pub dpi: Option<f64>,
 
     /// The baseline font to use
     #[serde(default)]
@@ -1253,10 +1252,6 @@ fn default_font_size() -> f64 {
     10.0
 }
 
-pub fn default_dpi() -> f64 {
-    ::window::DEFAULT_DPI
-}
-
 fn compute_runtime_dir() -> Result<PathBuf, Error> {
     if let Some(runtime) = dirs::runtime_dir() {
         return Ok(runtime.join("wezterm"));

wezterm-font/src/lib.rs

@@ -288,7 +288,8 @@ impl FontConfigInner {
 
         let config = configuration();
         let font_size = config.font_size * *self.font_scale.borrow();
-        let dpi = *self.dpi_scale.borrow() as u32 * config.dpi as u32;
+        let dpi =
+            *self.dpi_scale.borrow() as u32 * config.dpi.unwrap_or(::window::DEFAULT_DPI) as u32;
         let metrics = shaper.metrics(font_size, dpi)?;
 
         let loaded = Rc::new(LoadedFont {

wezterm-gui/src/gui/termwindow.rs

@@ -27,7 +27,7 @@ use anyhow::{anyhow, bail, ensure};
 use config::keyassignment::{
     InputMap, KeyAssignment, MouseEventTrigger, SpawnCommand, SpawnTabDomain,
 };
-use config::{configuration, default_dpi, ConfigHandle};
+use config::{configuration, ConfigHandle};
 use lru::LruCache;
 use mux::activity::Activity;
 use mux::domain::{DomainId, DomainState};
@@ -933,7 +933,7 @@ impl TermWindow {
             pixel_height: ((rows_with_tab_bar * render_metrics.cell_size.height as u16)
                 + config.window_padding.top
                 + config.window_padding.bottom) as usize,
-            dpi: config.dpi as usize,
+            dpi: config.dpi.unwrap_or(::window::DEFAULT_DPI) as usize,
         };
 
         log::info!(
@@ -2113,7 +2113,7 @@ impl TermWindow {
 
     fn apply_scale_change(&mut self, dimensions: &Dimensions, font_scale: f64) {
         self.fonts
-            .change_scaling(font_scale, dimensions.dpi as f64 / default_dpi());
+            .change_scaling(font_scale, dimensions.dpi as f64 / ::window::DEFAULT_DPI);
         self.render_metrics = RenderMetrics::new(&self.fonts);
         if self.render_state.has_opengl() {
             self.render_state.opengl().glyph_cache.borrow_mut().clear();