Use Resources Alire crate to locate font file.

SMerrony · Jul 27, 2022 · 0ec5d97 · 0ec5d97
1 parent 057da40
commit 0ec5d97
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/alire.toml b/alire.toml
@@ -9,3 +9,5 @@ maintainers-logins = ["SMerrony"]
 executables = ["dashera"]
 [[depends-on]]
 gtkada = "^21.0.0"
+[[depends-on]]
+resources = "~0.1.0"
diff --git a/D410-b-12.bdf → share/dashera/D410-b-12.bdf b/D410-b-12.bdf → share/dashera/D410-b-12.bdf
diff --git a/src/bdf_font.adb b/src/bdf_font.adb
@@ -91,11 +91,11 @@ package body BDF_Font is
          end case;
 
          begin
-            Open (File => Font_File, Mode => In_File, Name => File_Name);
+            Open (File => Font_File, Mode => In_File, Name => Dashera_Resources.Resource_Path & "/" & File_Name);
 
          exception
             when others =>
-               raise OPEN_FAILURE with "ERROR: Cannot open the file '" & File_Name &
+               raise OPEN_FAILURE with "ERROR: Cannot open the file '" & Dashera_Resources.Resource_Path & "/" & File_Name &
                   "'. Does it exist?";
          end;
 

diff --git a/src/bdf_font.ads b/src/bdf_font.ads
@@ -20,8 +20,12 @@
 with Gdk.Pixbuf; use Gdk.Pixbuf;
 with Glib;       use Glib;
 
+with Resources;
+
 package BDF_Font is
 
+   package Dashera_Resources is new Resources ("dashera");
+
    Max_Chars : constant Positive := 128;
    BPP       : constant Positive := 8;
    -- raw font dimensions