Return the default font to Terminus and slightly improve fallback han…

…dling (#37573) * Always load unifont as a fallback This prevents users from shooting themselves in the foot by selecting a different font and removing unifont from their font list * Add better default font settings Return the default font to Terminus Make the (over)map font square
CleverRaven · Jan 31, 2020 · 5d5194c · 5d5194c
1 parent 169355f
commit 5d5194c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/data/fontdata.json b/data/fontdata.json
@@ -1,15 +1,16 @@
 {
-  "fontblending": false,
-  "fontwidth": 8,
-  "fontheight": 16,
-  "fontsize": 16,
-  "typeface": "unifont",
-  "map_fontwidth": 8,
-  "map_fontheight": 16,
-  "map_fontsize": 16,
-  "map_typeface": "unifont",
-  "overmap_fontwidth": 8,
-  "overmap_fontheight": 16,
-  "overmap_fontsize": 16,
-  "overmap_typeface": "unifont"
+  "//1": "If more than one font is specified for a typeface the list is treated as a fallback order.",
+  "//2": "unifont will always be used as a 'last resort' fallback even if not listed here.",
+  "typeface": [
+    "Terminus",
+    "unifont"
+  ],
+  "map_typeface": [
+    "Terminus",
+    "unifont"
+  ],
+  "overmap_typeface": [
+    "Terminus",
+    "unifont"
+  ]
 }
diff --git a/src/font_loader.h b/src/font_loader.h
@@ -2,6 +2,7 @@
 #ifndef FONT_LOADER_H
 #define FONT_LOADER_H
 
+#include <algorithm>
 #include <fstream>
 #include <stdexcept>
 #include <string>
@@ -51,6 +52,17 @@ class font_loader
                 } else {
                     config.read( "overmap_typeface", overmap_typeface );
                 }
+
+                // Ensure that unifont is always loaded as a fallback font to prevent users from shooting themselves in the foot
+                auto ensure_unifont_loaded = []( std::vector<std::string> &font_list ) {
+                    if( std::find( std::begin( font_list ), std::end( font_list ), "unifont" ) == font_list.end() ) {
+                        font_list.emplace_back( "unifont" );
+                    }
+                };
+                ensure_unifont_loaded( typeface );
+                ensure_unifont_loaded( map_typeface );
+                ensure_unifont_loaded( overmap_typeface );
+
             } catch( const std::exception &err ) {
                 throw std::runtime_error( std::string( "loading font settings from " ) + path + " failed: " +
                                           err.what() );

diff --git a/src/options.cpp b/src/options.cpp
@@ -1681,7 +1681,7 @@ void options_manager::add_options_graphics()
 
     add( "MAP_FONT_WIDTH", "graphics", translate_marker( "Map font width" ),
          translate_marker( "Set the map font width.  Requires restart." ),
-         8, 100, 8, COPT_CURSES_HIDE
+         8, 100, 16, COPT_CURSES_HIDE
        );
 
     add( "MAP_FONT_HEIGHT", "graphics", translate_marker( "Map font height" ),
@@ -1696,7 +1696,7 @@ void options_manager::add_options_graphics()
 
     add( "OVERMAP_FONT_WIDTH", "graphics", translate_marker( "Overmap font width" ),
          translate_marker( "Set the overmap font width.  Requires restart." ),
-         8, 100, 8, COPT_CURSES_HIDE
+         8, 100, 16, COPT_CURSES_HIDE
        );
 
     add( "OVERMAP_FONT_HEIGHT", "graphics", translate_marker( "Overmap font height" ),