Merge pull request #68 from ri-char/main

configurable font for text annotations

Cargo.toml

@@ -45,6 +45,7 @@ glow = "0.13.1"
 glib-macros = "0.19.2"
 glib = "0.19.2"
 resource = "0.5.0"  # font emedding
+fontconfig = "0.8.0"  # font loading
 
 [dependencies.relm4-icons]
 version = "0.8.2"

README.md

@@ -78,6 +78,10 @@ output-filename = "/tmp/test-%Y-%m-%d_%H:%M:%S.png"
 save-after-copy = false
 # Hide toolbars by default
 default-hide-toolbars = false
+# Font to use for text annotations
+[font]
+family = "Roboto"
+style = "Bold"
 
 # custom colours for the colour palette
 [color-palette]
@@ -118,6 +122,10 @@ Options:
           After copying the screenshot, save it to a file as well
   -d, --default-hide-toolbars
           Hide toolbars by default
+      --font-family <FONT_FAMILY>
+          Font family to use for text annotations
+      --font-style <FONT_STYLE>
+          Font style to use for text annotations
   -h, --help
           Print help
   -V, --version
@@ -157,6 +165,7 @@ Satty is based on GTK-4 and Adwaita.
 - libgtk-4-1
 - libadwaita-1-0
 - libepoxy
+- fontconfig
 
 ### Arch Linux & Gentoo
 
@@ -165,6 +174,7 @@ Satty is based on GTK-4 and Adwaita.
 - gtk4
 - gdk-pixbuf2
 - libepoxy
+- fontconfig
 
 ## License
 

config.toml

@@ -14,7 +14,11 @@ output-filename = "/tmp/test-%Y-%m-%d_%H:%M:%S.png"
 # After copying the screenshot, save it to a file as well
 save-after-copy = false
 # Hide toolbars by default
-dafault-hide-toolbars = false
+default-hide-toolbars = false
+# Font to use for text annotations
+[font]
+family = "Roboto"
+style = "Regular"
 
 # custom colours for the colour palette
 [color-palette]

flake.nix

@@ -26,6 +26,7 @@
             gtk4
             wrapGAppsHook4 # this is needed for relm4-icons to properly load after gtk::init()
             libadwaita
+            fontconfig
 
             (rust-bin.stable.latest.default.override
               {

src/command_line.rs

@@ -43,6 +43,14 @@ pub struct CommandLine {
     /// Hide toolbars by default
     #[arg(short, long)]
     pub default_hide_toolbars: bool,
+
+    /// Font family to use for text annotations
+    #[arg(long)]
+    pub font_family: Option<String>,
+
+    /// Font style to use for text annotations
+    #[arg(long)]
+    pub font_style: Option<String>,
 }
 
 #[derive(Debug, Clone, Copy, Default, ValueEnum)]

src/configuration.rs

@@ -38,6 +38,30 @@ pub struct Configuration {
     save_after_copy: bool,
     color_palette: ColorPalette,
     default_hide_toolbars: bool,
+    font: FontConfiguration,
+}
+
+#[derive(Default)]
+pub struct FontConfiguration {
+    family: Option<String>,
+    style: Option<String>,
+}
+
+impl FontConfiguration {
+    pub fn family(&self) -> Option<&str> {
+        self.family.as_deref()
+    }
+    pub fn style(&self) -> Option<&str> {
+        self.style.as_deref()
+    }
+    fn merge(&mut self, file_font: FontFile) {
+        if let Some(v) = file_font.family {
+            self.family = Some(v);
+        }
+        if let Some(v) = file_font.style {
+            self.style = Some(v);
+        }
+    }
 }
 
 pub struct ColorPalette {
@@ -159,6 +183,9 @@ impl Configuration {
             if let Some(v) = file.color_palette {
                 self.color_palette.merge(v);
             }
+            if let Some(v) = file.font {
+                self.font.merge(v);
+            }
         }
 
         // overwrite with all specified values from command line
@@ -186,6 +213,12 @@ impl Configuration {
         if command_line.save_after_copy {
             self.save_after_copy = command_line.save_after_copy;
         }
+        if let Some(v) = command_line.font_family {
+            self.font.family = Some(v);
+        }
+        if let Some(v) = command_line.font_style {
+            self.font.style = Some(v);
+        }
     }
 
     pub fn early_exit(&self) -> bool {
@@ -227,6 +260,10 @@ impl Configuration {
     pub fn default_hide_toolbars(&self) -> bool {
         self.default_hide_toolbars
     }
+
+    pub fn font(&self) -> &FontConfiguration {
+        &self.font
+    }
 }
 
 impl Default for Configuration {
@@ -242,6 +279,7 @@ impl Default for Configuration {
             save_after_copy: false,
             color_palette: ColorPalette::default(),
             default_hide_toolbars: false,
+            font: FontConfiguration::default(),
         }
     }
 }
@@ -264,6 +302,14 @@ impl Default for ColorPalette {
 struct ConfigurationFile {
     general: Option<ConfiguationFileGeneral>,
     color_palette: Option<ColorPaletteFile>,
+    font: Option<FontFile>,
+}
+
+#[derive(Deserialize)]
+#[serde(rename_all = "kebab-case", deny_unknown_fields)]
+struct FontFile {
+    family: Option<String>,
+    style: Option<String>,
 }
 
 #[derive(Deserialize)]

src/femtovg_area/imp.rs

@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{anyhow, Error, Result};
 use glow::HasContext;
 use std::{
     cell::{RefCell, RefMut},
@@ -12,6 +12,7 @@ use femtovg::{
     rgb::{RGB, RGBA, RGBA8},
     Canvas, FontId, ImageFlags, ImageId, ImageSource, Paint, Path, PixelFormat, Transform2D,
 };
+use fontconfig::Fontconfig;
 use gdk_pixbuf::Pixbuf;
 use gtk::{glib, prelude::*, subclass::prelude::*};
 use relm4::{gtk, Sender};
@@ -21,6 +22,7 @@ use crate::{
     math::Vec2D,
     sketch_board::{Action, SketchBoardInput},
     tools::{CropTool, Drawable, Tool},
+    APP_CONFIG,
 };
 
 #[derive(Default)]
@@ -162,14 +164,40 @@ impl FemtoVGArea {
             self.canvas.borrow_mut().replace(c);
         }
 
-        self.font.borrow_mut().replace(
-            self.canvas
-                .borrow_mut()
-                .as_mut()
-                .unwrap() // this unwrap is safe because it gets placed above
-                .add_font_mem(&resource!("src/assets/Roboto-Regular.ttf"))
-                .expect("Cannot add font"),
-        );
+        let app_config = APP_CONFIG.read();
+        let font = app_config
+            .font()
+            .family()
+            .map(|font| {
+                let font = Fontconfig::new()
+                    .ok_or_else(|| anyhow!("Error while initializing fontconfig"))?
+                    .find(font, app_config.font().style())
+                    .ok_or_else(|| anyhow!("Can not find font"))?;
+                let font_id = self
+                    .canvas
+                    .borrow_mut()
+                    .as_mut()
+                    .unwrap() // this unwrap is safe because it gets placed above
+                    .add_font(font.path)?;
+                Ok(font_id)
+            })
+            .transpose()
+            .unwrap_or_else(|e: Error| {
+                println!("Error while loading font. Using default font: {e}");
+                None
+            });
+        if let Some(font) = font {
+            self.font.borrow_mut().replace(font);
+        } else {
+            self.font.borrow_mut().replace(
+                self.canvas
+                    .borrow_mut()
+                    .as_mut()
+                    .unwrap() // this unwrap is safe because it gets placed above
+                    .add_font_mem(&resource!("src/assets/Roboto-Regular.ttf"))
+                    .expect("Cannot add font"),
+            );
+        }
     }
 
     fn setup_canvas(&self) -> Result<femtovg::Canvas<femtovg::renderer::OpenGl>> {