TTF font support

config/font.cfg

@@ -1,14 +1,25 @@
 
-// Execute dedicated game fonts here
+// Configure dedicated game fonts here
 
-loopfiles f "data/interface/font" cfg [
-    exec (+s "data/interface/font/" $f ".cfg")
+loopfiles f "data/interface/font" "ttf" [
+    registerfont (+s "data/interface/font/" $f ".ttf")
 ]
 
-// Change the two following lines to define default font
-fontalias "default"    "main"
-fontalias "default.ol" "main.ol"
+// font "name" "family name"
+    // fontweight        -3..6         // < 0 = thinner, > 0 = thicker
+    // fontstretch       -4..4         // < 0 = tighter, > 0 = wider ; many fonts don't support this
+    // fontstyle         0|1|2         // 0 = normal, 1 = oblique, 2 = italic
+    // fontsmallcaps     0|1
+    // fontfeatures      [...features] // OpenType features (in CSS format)
+    // fontvariations    "variations"  // for variable fonts; format: "AXIS1=VALUE,AXIS2=VALUE..."
 
-// Shorthand aliases
-fontalias "def"    "default"
-fontalias "def.ol" "default.ol"
+font "default"  "Inter Variable, Sans"
+    fontfeatures ["ss04", "cv12", "cv13", "tnum"]
+font "mono"     "Roboto Mono, Monospace"
+font "bold" "Jura, Inter Variable, Sans"
+    fontfeatures ["liga", "calt", "zero"]
+    fontweight 3
+font "wide" "Tektur, Inter Variable, Sans"
+font "modernpics" "ModernPictograms"
+
+uiFontList = [ default mono bold wide modernpics ]

config/glsl/hud.cfg

@@ -41,17 +41,14 @@ shader 0 "hudtext" [
         colorscale = vcolor;
     }
 ] [
-    uniform sampler2D tex0;
-    uniform vec4 textparams;
+    uniform sampler2DRect tex0;
     varying vec2 texcoord0;
     varying vec4 colorscale;
     fragdata(0) vec4 fragcolor;
     void main(void)
     {
-        float dist = texture2D(tex0, texcoord0).r;
-        float border = smoothstep(textparams.x, textparams.y, dist);
-        float outline = smoothstep(textparams.z, textparams.w, dist);
-        fragcolor = vec4(colorscale.rgb * outline, colorscale.a * border);
+        fragcolor = colorscale * texture2DRect(tex0, texcoord0);
+        if(fragcolor.a != 0) fragcolor.rgb /= fragcolor.a;
     }
 ]
 

config/glsl/particle.cfg

@@ -107,17 +107,14 @@ shader 0 "particletext" [
         color = vec4(vcolor.rgb * ldrscale, vcolor.a);
     }
 ] [
-    uniform vec4 textparams;
-    uniform sampler2D tex0;
+    uniform sampler2DRect tex0;
     varying vec4 color;
     varying vec2 texcoord0;
     fragdata(0) vec4 fragcolor;
     void main(void)
     {
-        float dist = texture2D(tex0, texcoord0).r;
-        float border = smoothstep(textparams.x, textparams.y, dist);
-        float outline = smoothstep(textparams.z, textparams.w, dist);
-        fragcolor = vec4(color.rgb * outline, color.a * border);
+        fragcolor = color * texture2DRect(tex0, texcoord0);
+        if(fragcolor.a != 0) fragcolor.rgb /= fragcolor.a;
     }
 ]
 

config/ui/hud/editstats.cfg

@@ -335,8 +335,8 @@ uiLiteMenu "edithud" [
                                 uigrid 2 $uiPad:3XL $uiPad:L [
                                     uihlist $uiPad:XL [
                                         uitext "WTR" 0.5
-                                        uitext (tabify (format "%1k" $editstatwtr) 1) 0.5
-                                        uitext (tabify (format "(%1%%)" $editstatvtr) 2) 0.5
+                                        uitext (format "%1k^t" $editstatwtr) 0.5
+                                        uitext (format "(%1%%)^t^t" $editstatvtr) 0.5
                                     ]
                                     uihlist $uiPad:XL [
                                         uitext "WVT" 0.5

config/ui/hud/gamehud.cfg

@@ -1135,12 +1135,12 @@ newui "scoreboard" [
                     uispace $uiPad:M $uiPad:M- [
                         uiFancyText "wide" @@@(
                             at "FFA Aesir Vanir" $arg1
-                        ) 1.4 @@@(INT:TRANS (
+                        ) 1.25 @@@(INT:TRANS (
                             at [0x40D060 0x4060D0 0xD04040] $arg1
                         ) % 80)
                     ] ; uialign- @@(? $bflip 1 -1) -1
                     uispace $uiPad:O5 (*f $uiPad:O5 2.9) [
-                        uiFancyText "wide" (getteamscore @@@arg1) 1 @@@(
+                        uiFancyText "wide" (getteamscore @@@arg1) 0.85 @@@(
                             at [0x40D060 0x4060D0 0xD04040] $arg1
                         )
                     ] ; uialign- @@(? $bflip -1 1) -1
@@ -1300,7 +1300,9 @@ newui "scoreboard" [
                 uiFastImg (fade (? $arg1 0.5 0.25)) "hud/" "shelf" "" $uiPad:5XL
                 uiFastImg <mad:.18/.18/.18> "hud/" "glow" "" $uiPad:5XL
                 push n (+ $n 1) [
-                    uifontcolortext "def.ol" $n (|A! (? $arg1 0xB0 0x60)) 0.55
+                    uifontoutline 1 0x7F [
+                        uifontcolortext "default" $n (|A! (? $arg1 0xB0 0x60)) 0.55
+                    ]
                 ]
             ] ; uialign- -1
         ]

config/ui/hud/geo_prefab.cfg

@@ -24,7 +24,9 @@ uiLiteMenu "geo_prefab" [
                         uiclamp*e
                         uispace $uiPad:S $uiPad:O3 [
                             uialign -1 -1
-                            uifontcolortext "def.ol" $i (|A! 0x98) 0.55
+                            uifontoutline 1 0x7F [
+                                uifontcolortext "default" $i (|A! 0x98) 0.55
+                            ]
                         ]
                         uihover [
                             if (!= $i $.UI_obrsel) [

config/ui/hud/mapmodel_browser.cfg

@@ -54,11 +54,11 @@ uiLiteMenu "mapmodel_browser" [
                                 uimodelpreview (mapmodelname $i 1) "mapmodel"
                                 uiclamp*e
                                 uispace $uiPad:S $uiPad:O3 [
-                                    uifonttext "def.ol" $i 0.55
+                                    uifontoutline 1 0x7F [ uifonttext "default" $i 0.55 ]
                                 ] ; uialign- -1 -1
                                 if (iskeyheld "LSHIFT") [
                                     uispace $uiPad:S 0 [
-                                        uifonttext "modernpics.ol" "R" 0.65
+                                        uifontoutline 1 0x7F [uifonttext "modernpics" "R" 0.65 ]
                                     ] ; uialign- -1 1
                                     uirelease [ clearmodel (+s "mapmodel/" (mapmodelname $i)) ]
                                 ] [
@@ -77,14 +77,14 @@ uiLiteMenu "mapmodel_browser" [
                                 uimodelpreview (mapmodelname $i 1) "mapmodel"
                                 uiclamp*e
                                 uispace $uiPad:S $uiPad:O3 [
-                                    uifontcolortext "def.ol" $i (|A! 0xA0) 0.55
+                                    uifontoutline 1 0x7F [ uifontcolortext "default" $i (|A! 0xA0) 0.55 ]
                                 ] ; uialign- -1 -1
                                 uihover [ .mm_selidx = $n ; uiSetMillis ]
                                 uioutline $c_line1 $.z $.z
                             ]
                             if (mapmodelloaded $i) [
                                 uispace $uiPad:S $uiPad:O3 [
-                                    uifonttext "modernpics.ol" "%" 0.55
+                                    uifontoutline 1 0x7F [ uifonttext "modernpics" "%" 0.55 ]
                                 ] ; uialign- 1 -1
                             ]
                             uiHoverOnce [ uiHoverSound ]

config/ui/hud/texture_browser.cfg

@@ -29,7 +29,9 @@ uiLiteMenu "texture_browser" [
                             ]
                             uispace $uiPad:S $uiPad:O3 [
                                 uialign -1 -1
-                                uifontcolortext "def.ol" $i (|A! 0x98) 0.55
+                                uifontoutline 1 0x7F [
+                                    uifontcolortext "default" $i (|A! 0x98) 0.55
+                                ]
                             ]
                         ]
                         uipress [ uiSetMillis ]
@@ -83,7 +85,7 @@ uiLiteMenu "texture_browser" [
                             uiclip 0 $uiPad:6XL [ uicolortext "/" $c_gray 1.2 ]
                         ] // text takes up a lot of vertical space, have to "cut" it
                         uifill $uiPad:DXS 0 [
-                            uifonttext "def.ol" (max $.tb_totalpg 1) 0.7
+                            uifonttext "mono" (max $.tb_totalpg 1) 0.7
                             uialign- -1 1
                         ]
                         uiclamp*y
@@ -110,7 +112,9 @@ uiLiteMenu "texture_browser" [
                                 uislotview $i
                                 uiclamp*e
                                 uispace $uiPad:S $uiPad:O3 [
-                                    uifontcolortext "def.ol" $i (|A! 0xA0) 0.55
+                                    uifontoutline 1 0x7F [
+                                        uifontcolortext "default" $i (|A! 0xA0) 0.55
+                                    ]
                                 ] ; uialign- -1 -1
                                 uirelease [
                                     settex (getslottex $i)

config/ui/lib.cfg

@@ -810,23 +810,21 @@ uiButton = [
 
 // uiFancyText  FONT  TEXT  SIZE  0xCOLOR  TRANSPARENCY
 uiFancyText = [
-    if (=s $arg1 "") [ arg1 = "def" ]
+    if (=s $arg1 "") [ arg1 = "default" ]
     if $arg4 [] [ arg4 = $c_white ]
     if (< $numargs 5) [ arg5 = 1 ]
-    uigroup [
-        uioffset $uiPad:O1- $uiPad:O1 [
-            uifontcolortext [@arg1.ol] (stripcolors $arg2) (|A (*fA $arg5 0x20)) $arg3
-            uifontcolortext  $arg1     (stripcolors $arg2) (|A (*fA $arg5))      $arg3
-        ]
-        uioffset $uiPad:O1 $uiPad:O1- [
-            uifontcolortext $arg1 $arg2 (|A (*fA $arg5) $arg4) $arg3
+    uifont $arg1 [
+        uifontoutline 1 0x20 [
+            uishadow 255 [
+                uicolortext $arg2 (|A (*fA $arg5) $arg4) $arg3
+            ]
         ]
     ]
 ]
 
 // uiEmbossText  FONT  TEXT  SIZE  0xCOLOR
 uiEmbossText = [
-    if (=s $arg1 "") [ arg1 = "def" ]
+    if (=s $arg1 "") [ arg1 = "default" ]
     uigroup [
         uioffset $uiPad:O2- $uiPad:O2 [
             uifontcolortext $arg1 (stripcolors $arg2) 0 $arg3
@@ -866,9 +864,11 @@ uiVerSld = [
                     uiclamp*x
                 ]
             ] ; uiclamp-x
-            uivlist $uiPad:M- [
-                loop i (strlen $arg6) [
-                    uifontcolortext "def.ol" (substr $arg6 $i 1) (|A! (? $arg9 0xA0 0x60)) 0.65
+            uifontoutline 1 0xFF [
+                uivlist $uiPad:M- [
+                    loop i (strlen $arg6) [
+                        uifontcolortext "default" (substr $arg6 $i 1) (|A! (? $arg9 0xA0 0x60)) 0.65
+                    ]
                 ]
             ]
         ]
@@ -897,7 +897,9 @@ uiHorSld = [
                     uiclamp*y
                 ]
             ] ; uiclamp-y
-            uifontcolortext "def.ol" $arg6 (|A! (? $arg9 0xA0 0x60)) 0.65
+            uifontoutline 1 0xFF [
+                uifontcolortext "default" $arg6 (|A! (? $arg9 0xA0 0x60)) 0.65
+            ]
         ]
         uiclamp*e
     ]
@@ -925,9 +927,11 @@ uiVerColorSld = [
                     uiclamp*x
                 ]
             ] ; uiclamp-x
-            uivlist $uiPad:M- [
-                loop i (strlen $$arg1) [
-                    uifontcolortext "wide.ol" (substr $$arg1 $i 1) (|A! (? $arg9 0xA0 0x60)) 0.7
+            uifontoutline 1 0xFF [
+                uivlist $uiPad:M- [
+                    loop i (strlen $$arg1) [
+                        uifontcolortext "wide" (substr $$arg1 $i 1) (|A! (? $arg9 0xA0 0x60)) 0.7
+                    ]
                 ]
             ]
         ]
@@ -957,7 +961,9 @@ uiHorColorSld = [
                     uiclamp*y
                 ]
             ] ; uiclamp-y
-            uifontcolortext "wide.ol" $$arg1 (|A! (? $arg9 0xA0 0x60)) 0.7
+            uifontoutline 1 0xFF [
+                uifontcolortext "wide" $$arg1 (|A! (? $arg9 0xA0 0x60)) 0.7
+            ]
         ]
         uiclamp*e
     ]
@@ -1185,6 +1191,7 @@ uiEntColor24B = [
         uioutline (? $isfocused $c_red $c_line1)
         uipress [
             local newvarcur
+            resetcursorblink
             newvarcur = (escape (+s "#" $type "bind" " " $action))
             if (=s $newvarcur $.UI_KBvarcur) [
                 (+s $type "bind") MOUSELEFT $action
@@ -1207,6 +1214,7 @@ uiEntColor24B = [
                     .UI_KBvarcur = ""
             ] [
                 if (!=s "MOUSELEFT" $uikeycode) [
+                    resetcursorblink
                     (+s $type "bind") $uikeycode $action
                 ] [
                     .UI_KBvarcur = ""
@@ -1296,6 +1304,7 @@ uiKeyField = [
     uitarget $width 0 [
         uioutline (? $isfocused $c_red $c_line1)
         uipress [
+            resetcursorblink
             if (< $uicursorindex 0) [
                 .UI_KBcaret = 0
             ] [
@@ -1314,6 +1323,7 @@ uiKeyField = [
                 .UI_KBcaret = -1
                 uisettextinput 0
             ] [
+                resetcursorblink
                 cases $uikeycode "DELETE" [
                     $.UI_KBvarcur = (clamp (.delzeroes (strsplice $$.UI_KBvarcur "" $.UI_KBcaret 1)) $min_ $max_)
                     do $onchange
@@ -1427,12 +1437,12 @@ uiTextField = [
     uitarget $width 0 [
         uioutline (? $isfocused $c_red $c_line1)
         uipress [
+            resetcursorblink
             if (< $uicursorindex 0) [
-                .UI_KBcaret = (? (> $align 0) 0 (strlen $$var))
+                .UI_KBcaret = (? (> $align 0) 0 (char2byteindex $$var (strlen $$var)))
             ] [
                 .UI_KBcaret = (? (> (strlen $$var) 0) $uicursorindex 0)
             ]
-
             .UI_KBvarcur = $arg1
         ]
 
@@ -1448,37 +1458,49 @@ uiTextField = [
                 .UI_KBcaret = -1
                 uisettextinput 0
             ] [
+                resetcursorblink
                 cases $uikeycode "DELETE" [
-                    $.UI_KBvarcur = (strsplice $$.UI_KBvarcur "" $.UI_KBcaret 1)
+                    $.UI_KBvarcur = (strsplice $$.UI_KBvarcur "" (byte2charindex $$.UI_KBvarcur $.UI_KBcaret) 1)
                     do $onchange
                 ] "BACKSPACE" [
                     if (> $.UI_KBcaret 0) [
-                        $.UI_KBvarcur = (strsplice $$.UI_KBvarcur "" (- $.UI_KBcaret 1) 1)
-                        -- .UI_KBcaret
+                        local ix_c
+                        ix_c = (byte2charindex $$.UI_KBvarcur $.UI_KBcaret)
+                        $.UI_KBvarcur = (strsplice $$.UI_KBvarcur "" (- $ix_c 1) 1)
+                        .UI_KBcaret = (char2byteindex $$.UI_KBvarcur (- $ix_c 1))
                     ]
                     do $onchange
                 ] "LEFT" [
+                    // move cursor to the left by 1 character (not byte!)
                     if (> $.UI_KBcaret 0) [
-                        -- .UI_KBcaret
+                        local ix_c
+                        ix_c = (byte2charindex $$.UI_KBvarcur $.UI_KBcaret)
+                        .UI_KBcaret = (char2byteindex $$.UI_KBvarcur (- $ix_c 1))
                     ]
                 ] "RIGHT" [
-                    if (&& [>= $.UI_KBcaret 0] [< $.UI_KBcaret (strlen $$.UI_KBvarcur)]) [
-                        ++ .UI_KBcaret
+                    // move cursor to the right by 1 character (not byte!)
+                    if (&& [>= $.UI_KBcaret 0] [< (byte2charindex $$.UI_KBvarcur $.UI_KBcaret) (strlen $$.UI_KBvarcur)]) [
+                        local ix_c
+                        ix_c = (byte2charindex $$.UI_KBvarcur $.UI_KBcaret)
+                        .UI_KBcaret = (char2byteindex $$.UI_KBvarcur (+ $ix_c 1))
                     ]
                 ] () [
-                    local inputlen pastestr
+                    local inputlen pastestr pastebytelen
                     if (&& [=s "V" $uikeycode] [|| [iskeyheld "LCTRL"] [iskeyheld "RCTRL"]]) [ // CTRL-V
                         inputlen = (clamp (strlen $getclipboard) 0 (- $maxstrlen (strlen $$.UI_KBvarcur)))
                         pastestr = (substr $getclipboard 0 $inputlen)
-                        $.UI_KBvarcur = (substr (strsplice $$.UI_KBvarcur $pastestr $.UI_KBcaret 0) 0 $maxstrlen)
-                        .UI_KBcaret = (min $maxstrlen (+ $.UI_KBcaret $inputlen))
+                        pastebytelen = (strbytelen $pastestr)
+                        $.UI_KBvarcur = (strsplice $$.UI_KBvarcur $pastestr (byte2charindex $$.UI_KBvarcur $.UI_KBcaret) 0)
+                        .UI_KBcaret = (+ $.UI_KBcaret $pastebytelen)
                         do $onchange
                     ] [
                         if (&& [!=s "" $uitextinput] [< (strlen $$.UI_KBvarcur) $maxstrlen]) [
                             inputlen = (strlen $uitextinput)
-                            $.UI_KBvarcur = (substr (strsplice $$.UI_KBvarcur $uitextinput $.UI_KBcaret 0) 0 $maxstrlen)
-                            .UI_KBcaret = (min $maxstrlen (+ $.UI_KBcaret $inputlen))
+                            $.UI_KBvarcur = (substr (strsplice $$.UI_KBvarcur $uitextinput (byte2charindex $$.UI_KBvarcur $.UI_KBcaret) 0) 0 $maxstrlen)
+                            .UI_KBcaret = (char2byteindex $$.UI_KBvarcur (min $maxstrlen (+ (byte2charindex $$.UI_KBvarcur $.UI_KBcaret) $inputlen)))
+
                             do $onchange
+
                         ]
                     ]
                 ]

config/ui/libnew.cfg

@@ -170,7 +170,9 @@ uiSliderH = [
                         uiFastImgStretched "" "shadow2" "" "" [ uiclamp.x ]
                         uiclamp*e
                         if $arg9 [ arg10 = 0xA0FFFFFF ] [ arg10 = 0x60FFFFFF ]
-                        uiFontColorText "def.ol" $arg6 0.65 $arg10
+                        uifontoutline 1 0xFF [
+                            uiFontColorText "default" $arg6 0.65 $arg10
+                        ]
                     ] ; uiclamp-y
                 ]
             ] ; uiclamp-y

config/ui/menus/server_browser.cfg

@@ -169,7 +169,7 @@ uiServer = [
 			uigroup [
 				uifill $uiPad:DS
 				uiimage (+s "data/interface/ui/" (servinfomastermodeicon $arg1) ".png") $uiPad:DSS $uiPad:DSS
-				uispace 0 $uiPad:L [ uifonttext "wide.ol" (servinfomodename $arg1) 0.5 ]
+				uispace 0 $uiPad:L [ uifontoutline 1 0x7F [ uifonttext "wide" (servinfomodename $arg1) 0.5 ] ]
 				uialign- 0 1
 			]
 			uivlist $uiPad:S [