tFontRenderer: Schriftartdatei suchen anstatt den Pfad explizit anzunehmen

2 files changed, 86 insertions, 72 deletions

diff --git a/epost.lps b/epost.lps
index f02dd6f..73cae50 100644
--- a/epost.lps
+++ b/epost.lps
@@ -3,12 +3,13 @@
   <ProjectSession>
     <Version Value="11"/>
     <BuildModes Active="Default"/>
-    <Units Count="28">
+    <Units Count="29">
       <Unit0>
         <Filename Value="epost.lpr"/>
         <IsPartOfProject Value="True"/>
-        <TopLine Value="38"/>
-        <CursorPos X="29" Y="69"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="29"/>
+        <CursorPos Y="49"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
       </Unit0>
@@ -22,8 +23,8 @@
       <Unit2>
         <Filename Value="epostunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="2"/>
-        <TopLine Value="6206"/>
+        <EditorIndex Value="3"/>
+        <TopLine Value="6169"/>
         <CursorPos X="44" Y="6169"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
@@ -31,7 +32,7 @@
       <Unit3>
         <Filename Value="werteunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="6"/>
         <TopLine Value="2275"/>
         <CursorPos X="33" Y="2279"/>
         <UsageCount Value="200"/>
@@ -40,17 +41,16 @@
       <Unit4>
         <Filename Value="typenunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="10"/>
-        <TopLine Value="2536"/>
-        <CursorPos X="99" Y="2557"/>
+        <EditorIndex Value="11"/>
+        <TopLine Value="1682"/>
+        <CursorPos X="68" Y="1699"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
         <Filename Value="../units/fftunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="4"/>
         <CursorPos X="32" Y="13"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
@@ -66,7 +66,7 @@
       <Unit7>
         <Filename Value="gauszFit.inc"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="10"/>
         <CursorPos X="9" Y="17"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
@@ -74,7 +74,7 @@
       <Unit8>
         <Filename Value="werteunit.inc"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="7"/>
         <CursorPos Y="8"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
@@ -82,18 +82,18 @@
       <Unit9>
         <Filename Value="../units/optimierung.pas"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="8"/>
         <TopLine Value="86"/>
         <CursorPos X="26" Y="115"/>
-        <UsageCount Value="105"/>
+        <UsageCount Value="106"/>
         <Loaded Value="True"/>
       </Unit9>
       <Unit10>
         <Filename Value="../units/optimierung.inc"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="9"/>
         <CursorPos X="3" Y="2"/>
-        <UsageCount Value="101"/>
+        <UsageCount Value="102"/>
         <Loaded Value="True"/>
       </Unit10>
       <Unit11>
@@ -112,14 +112,14 @@
       <Unit13>
         <Filename Value="../units/lowlevelunit.pas"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="865"/>
-        <CursorPos Y="883"/>
+        <TopLine Value="1516"/>
+        <CursorPos Y="1525"/>
         <UsageCount Value="101"/>
         <Loaded Value="True"/>
       </Unit13>
       <Unit14>
         <Filename Value="../units/matheunit.pas"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="5"/>
         <UsageCount Value="101"/>
         <Loaded Value="True"/>
       </Unit14>
@@ -211,126 +211,134 @@
         <CursorPos X="7"/>
         <UsageCount Value="10"/>
       </Unit27>
+      <Unit28>
+        <Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/filutilh.inc"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="128"/>
+        <CursorPos X="3" Y="145"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit28>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4744" Column="55" TopLine="4715"/>
+        <Caret Line="5030" Column="23" TopLine="5002"/>
       </Position1>
       <Position2>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4896" Column="23" TopLine="4868"/>
+        <Caret Line="9658" Column="16" TopLine="9650"/>
       </Position2>
       <Position3>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="4935" Column="43" TopLine="4924"/>
+        <Filename Value="werteunit.pas"/>
+        <Caret Line="98" Column="28" TopLine="83"/>
       </Position3>
       <Position4>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5016" Column="23" TopLine="5006"/>
+        <Caret Line="9692" Column="35" TopLine="9664"/>
       </Position4>
       <Position5>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="5027" Column="23" TopLine="5006"/>
+        <Caret Line="4500" TopLine="4483"/>
       </Position5>
       <Position6>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="9657" Column="42" TopLine="9637"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="231" Column="19" TopLine="219"/>
       </Position6>
       <Position7>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="7836" Column="80" TopLine="7818"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="227" Column="11" TopLine="219"/>
       </Position7>
       <Position8>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="9668" Column="48" TopLine="9642"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="237" Column="32" TopLine="219"/>
       </Position8>
       <Position9>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5030" Column="19" TopLine="5010"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="243" Column="33" TopLine="219"/>
       </Position9>
       <Position10>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="2073" Column="77" TopLine="2057"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="249" Column="39" TopLine="220"/>
       </Position10>
       <Position11>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="437" Column="17" TopLine="419"/>
+        <Caret Line="4970" Column="83" TopLine="4955"/>
       </Position11>
       <Position12>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4744" Column="55" TopLine="4715"/>
       </Position12>
       <Position13>
         <Filename Value="epostunit.pas"/>
-        <Caret Line="4896" Column="23" TopLine="4868"/>
+        <Caret Line="189" Column="41" TopLine="161"/>
       </Position13>
       <Position14>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="4938" Column="43" TopLine="4909"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="450" Column="33" TopLine="432"/>
       </Position14>
       <Position15>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5019" Column="23" TopLine="4991"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="1702" Column="12" TopLine="1686"/>
       </Position15>
       <Position16>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="5030" Column="23" TopLine="5002"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="8" Column="40"/>
       </Position16>
       <Position17>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="9658" Column="16" TopLine="9650"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="1703" Column="3" TopLine="1687"/>
       </Position17>
       <Position18>
-        <Filename Value="werteunit.pas"/>
-        <Caret Line="98" Column="28" TopLine="83"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="1704" Column="21" TopLine="1688"/>
       </Position18>
       <Position19>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="9692" Column="35" TopLine="9664"/>
+        <Filename Value="typenunit.pas"/>
+        <Caret Line="1694" Column="26" TopLine="1687"/>
       </Position19>
       <Position20>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="4500" TopLine="4483"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="188" TopLine="174"/>
       </Position20>
       <Position21>
         <Filename Value="typenunit.pas"/>
-        <Caret Line="231" Column="19" TopLine="219"/>
+        <Caret Line="1699" TopLine="1689"/>
       </Position21>
       <Position22>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="227" Column="11" TopLine="219"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="1522" Column="8" TopLine="1504"/>
       </Position22>
       <Position23>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="237" Column="32" TopLine="219"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="1525" Column="12" TopLine="1507"/>
       </Position23>
       <Position24>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="243" Column="33" TopLine="219"/>
+        <Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/filutilh.inc"/>
+        <Caret Line="89" Column="3" TopLine="63"/>
       </Position24>
       <Position25>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="249" Column="39" TopLine="220"/>
+        <Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/filutilh.inc"/>
+        <Caret Line="87" Column="13" TopLine="63"/>
       </Position25>
       <Position26>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="4970" Column="83" TopLine="4955"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="1528" Column="24" TopLine="1507"/>
       </Position26>
       <Position27>
-        <Filename Value="epostunit.pas"/>
+        <Filename Value="/usr/lib/fpc/src/rtl/objpas/sysutils/filutilh.inc"/>
+        <Caret Line="89" Column="3" TopLine="63"/>
       </Position27>
       <Position28>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="189" Column="41" TopLine="161"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="1526" Column="36" TopLine="1510"/>
       </Position28>
       <Position29>
-        <Filename Value="epostunit.pas"/>
-        <Caret Line="6169" Column="44" TopLine="6206"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="1531" Column="13" TopLine="1510"/>
       </Position29>
       <Position30>
-        <Filename Value="typenunit.pas"/>
-        <Caret Line="450" Column="33" TopLine="432"/>
+        <Filename Value="../units/lowlevelunit.pas"/>
+        <Caret Line="1540" Column="77" TopLine="1524"/>
       </Position30>
     </JumpHistory>
     <RunParams>
diff --git a/typenunit.pas b/typenunit.pas
index d73f9a8..4680c3d 100644
--- a/typenunit.pas
+++ b/typenunit.pas
@@ -1689,13 +1689,19 @@ end;
 // tFontRenderer ***************************************************************
 
 constructor tFontRenderer.create(schriftgroesze: longint);
+var
+  fontFile: string;
 begin
   inherited create;
 
   gibAus('FontRenderer erzeugen (Schriftgröße '+intToStr(schriftgroesze)+') ...',1);
 
+  if not findeRekursiv('/usr/share/fonts','DejaVuSans.ttf',fontFile) then
+    if not findeRekursiv('/usr/share/fonts','*.ttf',fontFile) then
+      raise exception.create('Kann keine Schriftart finden.');
+
   New(agg, Construct);
-  agg^.font('/usr/share/fonts/TTF/DejaVuSans.ttf',schriftgroesze,false,false,RasterFontCache,0.0);
+  agg^.font(char_ptr(fontFile),schriftgroesze,false,false,RasterFontCache,0.0);
 
   gibAus('... fertig',1);
 end;