Backup: Stable state with EPUB reader fixes (Freeze, OOM, Speed, State, Tooling)

lib/EpdFontLoader/EpdFontLoader.cpp

@@ -0,0 +1,74 @@
+#include "EpdFontLoader.h"
+
+#include <HardwareSerial.h>
+
+#include <cstring>
+#include <string>
+
+#include "../../src/CrossPointSettings.h"
+#include "../../src/managers/FontManager.h"
+
+void EpdFontLoader::loadFontsFromSd(GfxRenderer& renderer) {
+  // Check settings for custom font
+  if (SETTINGS.fontFamily == CrossPointSettings::FONT_CUSTOM) {
+    if (strlen(SETTINGS.customFontFamily) > 0) {
+      Serial.printf("Loading custom font: %s size %d\n", SETTINGS.customFontFamily, SETTINGS.fontSize);
+      Serial.flush();
+
+      // Map enum size to point size roughly (or use customFontSize if non-zero)
+      int size = 12;  // default
+      // Map generic sizes (Small, Medium, Large, XL) to likely point sizes if not specified
+      // Assume standard sizes: 12, 14, 16, 18
+      switch (SETTINGS.fontSize) {
+        case CrossPointSettings::SMALL:
+          size = 12;
+          break;
+        case CrossPointSettings::MEDIUM:
+          size = 14;
+          break;
+        case CrossPointSettings::LARGE:
+          size = 16;
+          break;
+        case CrossPointSettings::EXTRA_LARGE:
+          size = 18;
+          break;
+      }
+
+      EpdFontFamily* family = FontManager::getInstance().getCustomFontFamily(SETTINGS.customFontFamily, size);
+      if (family) {
+        // IDs are usually static consts. For custom font, we need a dynamic ID or reserved ID.
+        // In main.cpp or somewhere, a range might be reserved or we replace an existing one?
+        // The stash code in main.cpp step 120 showed:
+        // "Calculate hash ID manually... int id = (int)hash;"
+        // "renderer.insertFont(id, *msgFont);"
+
+        std::string key = std::string(SETTINGS.customFontFamily) + "-" + std::to_string(size);
+        uint32_t hash = 5381;
+        for (char c : key) hash = ((hash << 5) + hash) + c;
+        int id = (int)hash;
+
+        Serial.printf("[FontLoader] Inserting custom font '%s' with ID %d (key: %s)\n", SETTINGS.customFontFamily, id,
+                      key.c_str());
+        renderer.insertFont(id, *family);
+      } else {
+        Serial.println("Failed to load custom font family");
+      }
+    }
+  }
+}
+
+int EpdFontLoader::getBestFontId(const char* familyName, int size) {
+  if (!familyName || strlen(familyName) == 0) return -1;
+
+  // We assume the font is loaded if we are asking for its ID,
+  // or at least that the ID generation is deterministic.
+  // The renderer uses the ID to look up the font.
+  // If we return an ID that isn't inserted, renderer might crash or show nothing.
+  // So we should ideally check if it's available.
+
+  // For now, just return the deterministic hash.
+  std::string key = std::string(familyName) + "-" + std::to_string(size);
+  uint32_t hash = 5381;
+  for (char c : key) hash = ((hash << 5) + hash) + c;
+  return (int)hash;
+}

lib/EpdFontLoader/EpdFontLoader.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <GfxRenderer.h>
+
+class EpdFontLoader {
+ public:
+  static void loadFontsFromSd(GfxRenderer& renderer);
+  static int getBestFontId(const char* familyName, int size);
+};