FontPack: Font dropdown includes IDs if ambiguous

If some fonts have the same human-readable name, the unique font ID will be added to show which font it actually is.

2 files changed, 21 insertions, 2 deletions

diff --git a/src/fontpack.c b/src/fontpack.c
index c12b2ddc..bbf1833e 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -550,6 +550,21 @@ static void sortSpecs_Fonts_(iFonts *d) {
     sort_Array(&d->specOrder, cmpPriority_FontSpecPtr_);
 }
 
+static void disambiguateSpecs_Fonts_(iFonts *d) {
+    /* Names of specs with the same human-readable label are augmented with the font ID. */
+    const size_t numSpecs = size_PtrArray(&d->specOrder);
+    for (size_t i = 0; i < numSpecs; i++) {
+        iFontSpec *spec1 = at_PtrArray(&d->specOrder, i);
+        for (size_t j = i + 1; j < numSpecs; j++) {
+            iFontSpec *spec2 = at_PtrArray(&d->specOrder, j);
+            if (equalCase_String(&spec1->name, &spec2->name)) {
+                appendFormat_String(&spec1->name, " [%s]", cstr_String(&spec1->id));
+                appendFormat_String(&spec2->name, " [%s]", cstr_String(&spec2->id));
+            }
+        }
+    }    
+}
+
 static const iString *userFontsDirectory_Fonts_(const iFonts *d) {
     return collect_String(concatCStr_Path(&d->userDir, "fonts"));
 }
@@ -677,8 +692,12 @@ void init_Fonts(const char *userDir) {
                 pushBack_PtrArray(&d->packs, pack);
             }
         }
-    }    
+    }
     sortSpecs_Fonts_(d);
+    disambiguateSpecs_Fonts_(d);
+#if !defined (NDEBUG)
+    printf("[FontPack] %zu fonts available\n", size_Array(&d->specOrder));
+#endif
 }
 
 void deinit_Fonts(void) {
diff --git a/src/ui/text.c b/src/ui/text.c
index 46e355d7..abe8640c 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -338,7 +338,7 @@ static void initFonts_Text_(iText *d) {
         }
     }
 #if !defined (NDEBUG)
-    printf("[Text] %zu fonts ready\n", size_Array(&d->fonts));
+    printf("[Text] %zu font variants ready\n", size_Array(&d->fonts));
 #endif
     gap_Text = iRound(gap_UI * d->contentFontSize);
 }