egui: add integration

toml-config/src/config.rs

@@ -211,6 +211,12 @@ pub struct Theme {
     pub bar_separator_width: Option<i32>,
 }
 
+#[derive(Debug, Clone, Default)]
+pub struct Egui {
+    pub proportional_fonts: Option<Vec<String>>,
+    pub monospace_fonts: Option<Vec<String>>,
+}
+
 #[derive(Debug, Clone)]
 pub struct Status {
     pub format: MessageFormat,
@@ -510,6 +516,7 @@ pub struct Config {
     pub auto_reload: Option<bool>,
     pub log_level: Option<LogLevel>,
     pub theme: Theme,
+    pub egui: Egui,
     pub gfx_api: Option<GfxApi>,
     pub direct_scanout_enabled: Option<bool>,
     pub drm_devices: Vec<ConfigDrmDevice>,

toml-config/src/config/parsers.rs

@@ -19,6 +19,7 @@ mod connector_match;
 mod content_type;
 mod drm_device;
 mod drm_device_match;
+mod egui;
 mod env;
 pub mod exec;
 mod fallback_output_mode;

toml-config/src/config/parsers/config.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         config::{
-            Action, Config, Libei, Theme, UiDrag,
+            Action, Config, Egui, Libei, Theme, UiDrag,
             context::Context,
             extractor::{Extractor, ExtractorError, arr, bol, int, opt, recover, str, val},
             parser::{DataType, ParseResult, Parser, UnexpectedDataType},
@@ -13,6 +13,7 @@ use {
                 connector::ConnectorsParser,
                 drm_device::DrmDevicesParser,
                 drm_device_match::DrmDeviceMatchParser,
+                egui::EguiParser,
                 env::EnvParser,
                 fallback_output_mode::FallbackOutputModeParser,
                 float::FloatParser,
@@ -150,6 +151,7 @@ impl Parser for ConfigParser<'_> {
                 simple_im_val,
                 show_titles,
                 fallback_output_mode_val,
+                egui_val,
             ),
         ) = ext.extract((
             (
@@ -208,6 +210,7 @@ impl Parser for ConfigParser<'_> {
                 opt(val("simple-im")),
                 recover(opt(bol("show-titles"))),
                 opt(val("fallback-output-mode")),
+                opt(val("egui")),
             ),
         ))?;
         let mut keymap = None;
@@ -313,6 +316,15 @@ impl Parser for ConfigParser<'_> {
                 }
             }
         }
+        let mut egui = Egui::default();
+        if let Some(value) = egui_val {
+            match value.parse(&mut EguiParser(self.0)) {
+                Ok(v) => egui = v,
+                Err(e) => {
+                    log::warn!("Could not parse the egui settings: {}", self.0.error(e));
+                }
+            }
+        }
         let mut gfx_api = None;
         if let Some(value) = gfx_api_val {
             match value.parse(&mut GfxApiParser) {
@@ -556,6 +568,7 @@ impl Parser for ConfigParser<'_> {
             auto_reload: auto_reload.despan(),
             log_level,
             theme,
+            egui,
             gfx_api,
             drm_devices,
             direct_scanout_enabled: direct_scanout.despan(),

toml-config/src/config/parsers/egui.rs

@@ -0,0 +1,63 @@
+use {
+    crate::{
+        config::{
+            Egui,
+            context::Context,
+            extractor::{Extractor, ExtractorError, arr, opt},
+            parser::{DataType, ParseResult, Parser, UnexpectedDataType},
+        },
+        toml::{
+            toml_span::{Span, Spanned},
+            toml_value::Value,
+        },
+    },
+    indexmap::IndexMap,
+    thiserror::Error,
+};
+
+pub struct EguiParser<'a>(pub &'a Context<'a>);
+
+#[derive(Debug, Error)]
+pub enum EguiParserError {
+    #[error(transparent)]
+    Expected(#[from] UnexpectedDataType),
+    #[error(transparent)]
+    Extractor(#[from] ExtractorError),
+}
+
+impl Parser for EguiParser<'_> {
+    type Value = Egui;
+    type Error = EguiParserError;
+    const EXPECTED: &'static [DataType] = &[DataType::Table];
+
+    fn parse_table(
+        &mut self,
+        span: Span,
+        table: &IndexMap<Spanned<String>, Spanned<Value>>,
+    ) -> ParseResult<Self> {
+        let mut ext = Extractor::new(self.0, span, table);
+        let (proportional_fonts_arr, monospace_fonts_arr) =
+            ext.extract((opt(arr("proportional-fonts")), opt(arr("monospace-fonts"))))?;
+        let mut proportional_fonts = None;
+        let mut monospace_fonts = None;
+        for (out, f) in [
+            (&mut proportional_fonts, proportional_fonts_arr),
+            (&mut monospace_fonts, monospace_fonts_arr),
+        ] {
+            if let Some(f) = f {
+                let fonts = out.insert(vec![]);
+                for f in f.value {
+                    let Value::String(s) = &f.value else {
+                        log::error!("Expected a string: {}", self.0.error3(f.span));
+                        continue;
+                    };
+                    fonts.push(s.clone());
+                }
+            }
+        }
+        Ok(Egui {
+            proportional_fonts,
+            monospace_fonts,
+        })
+    }
+}

toml-config/src/lib.rs

@@ -44,8 +44,8 @@ use {
         switch_to_vt,
         tasks::{self, JoinHandle},
         theme::{
-            reset_colors, reset_font, reset_sizes, set_bar_font, set_bar_position, set_font,
-            set_title_font,
+            reset_colors, reset_font, reset_sizes, set_bar_font, set_bar_position,
+            set_egui_monospace_fonts, set_egui_proportional_fonts, set_font, set_title_font,
         },
         toggle_float_above_fullscreen, toggle_show_bar, toggle_show_titles,
         video::{
@@ -1633,6 +1633,12 @@ fn load_config(initial_load: bool, auto_reload: bool, persistent: &Rc<Persistent
     if let Some(v) = config.fallback_output_mode {
         persistent.seat.set_fallback_output_mode(v);
     }
+    if let Some(f) = &config.egui.proportional_fonts {
+        set_egui_proportional_fonts(f.iter().map(|s| &**s));
+    }
+    if let Some(f) = &config.egui.monospace_fonts {
+        set_egui_monospace_fonts(f.iter().map(|s| &**s));
+    }
 }
 
 fn create_command(exec: &Exec) -> Command {