1 files changed, 95 insertions, 2 deletions

diff --git a/alacritty/src/config/ui_config.rs b/alacritty/src/config/ui_config.rs
index 49e54e05..a8b1749f 100644
--- a/alacritty/src/config/ui_config.rs
+++ b/alacritty/src/config/ui_config.rs
@@ -1,13 +1,24 @@
 use log::error;
 use serde::{Deserialize, Deserializer};
 
-use alacritty_terminal::config::{failure_default, LOG_TARGET_CONFIG};
+use alacritty_terminal::config::{failure_default, Percentage, LOG_TARGET_CONFIG};
 
 use crate::config::bindings::{self, Binding, KeyBinding, MouseBinding};
+use crate::config::debug::Debug;
+use crate::config::font::Font;
 use crate::config::mouse::Mouse;
+use crate::config::window::WindowConfig;
 
 #[derive(Debug, PartialEq, Deserialize)]
 pub struct UIConfig {
+    /// Font configuration.
+    #[serde(default, deserialize_with = "failure_default")]
+    pub font: Font,
+
+    /// Window configuration.
+    #[serde(default, deserialize_with = "failure_default")]
+    pub window: WindowConfig,
+
     #[serde(default, deserialize_with = "failure_default")]
     pub mouse: Mouse,
 
@@ -18,18 +29,79 @@ pub struct UIConfig {
     /// Bindings for the mouse.
     #[serde(default = "default_mouse_bindings", deserialize_with = "deserialize_mouse_bindings")]
     pub mouse_bindings: Vec<MouseBinding>,
+
+    /// Debug options.
+    #[serde(default, deserialize_with = "failure_default")]
+    pub debug: Debug,
+
+    /// Send escape sequences using the alt key.
+    #[serde(default, deserialize_with = "failure_default")]
+    alt_send_esc: DefaultTrueBool,
+
+    /// Live config reload.
+    #[serde(default, deserialize_with = "failure_default")]
+    live_config_reload: DefaultTrueBool,
+
+    /// Background opacity from 0.0 to 1.0.
+    #[serde(default, deserialize_with = "failure_default")]
+    background_opacity: Percentage,
+
+    // TODO: DEPRECATED
+    #[serde(default, deserialize_with = "failure_default")]
+    pub dynamic_title: Option<bool>,
 }
 
 impl Default for UIConfig {
     fn default() -> Self {
         UIConfig {
-            mouse: Mouse::default(),
+            font: Default::default(),
+            window: Default::default(),
+            mouse: Default::default(),
             key_bindings: default_key_bindings(),
             mouse_bindings: default_mouse_bindings(),
+            debug: Default::default(),
+            alt_send_esc: Default::default(),
+            background_opacity: Default::default(),
+            live_config_reload: Default::default(),
+            dynamic_title: Default::default(),
         }
     }
 }
 
+impl UIConfig {
+    #[inline]
+    pub fn background_opacity(&self) -> f32 {
+        self.background_opacity.as_f32()
+    }
+
+    #[inline]
+    pub fn dynamic_title(&self) -> bool {
+        self.dynamic_title.unwrap_or_else(|| self.window.dynamic_title())
+    }
+
+    #[inline]
+    pub fn set_dynamic_title(&mut self, dynamic_title: bool) {
+        self.window.set_dynamic_title(dynamic_title);
+    }
+
+    /// Live config reload.
+    #[inline]
+    pub fn live_config_reload(&self) -> bool {
+        self.live_config_reload.0
+    }
+
+    #[inline]
+    pub fn set_live_config_reload(&mut self, live_config_reload: bool) {
+        self.live_config_reload.0 = live_config_reload;
+    }
+
+    /// Send escape sequences using the alt key.
+    #[inline]
+    pub fn alt_send_esc(&self) -> bool {
+        self.alt_send_esc.0
+    }
+}
+
 fn default_key_bindings() -> Vec<KeyBinding> {
     bindings::default_key_bindings()
 }
@@ -83,3 +155,24 @@ where
 
     Ok(bindings)
 }
+
+#[derive(Deserialize, Copy, Clone, Debug, PartialEq, Eq)]
+pub struct DefaultTrueBool(pub bool);
+
+impl Default for DefaultTrueBool {
+    fn default() -> Self {
+        DefaultTrueBool(true)
+    }
+}
+
+/// A delta for a point in a 2 dimensional plane.
+#[serde(default, bound(deserialize = "T: Deserialize<'de> + Default"))]
+#[derive(Clone, Copy, Debug, Default, Deserialize, PartialEq, Eq)]
+pub struct Delta<T: Default + PartialEq + Eq> {
+    /// Horizontal change.
+    #[serde(deserialize_with = "failure_default")]
+    pub x: T,
+    /// Vertical change.
+    #[serde(deserialize_with = "failure_default")]
+    pub y: T,
+}