Initialize font internally when required.

Author: netfab

src/bin/daemon/LCDPlugins/endscreen.cpp

@@ -55,8 +55,6 @@ void Endscreen::init(FontsManager* const pFonts, const std::string & product)
 	fs::path PBMDirectory(PBM_DATA_DIR);
 	PBMDirectory /= _plugin.getName();
 
-	pFonts->initializeFont(FontID::DEJAVUSANSBOLD1616);
-
 	this->addPBMClearedFrame();	/* frame #0 */
 	this->writeStringOnLastFrame(pFonts, FontID::DEJAVUSANSBOLD1616, product, 32, 10);
 

src/bin/daemon/LCDPlugins/fontsManager.cpp

@@ -2,7 +2,7 @@
  *
  *	This file is part of GLogiK project.
  *	GLogiK, daemon to handle special features on gaming keyboards
- *	Copyright (C) 2016-2018  Fabrice Delliaux <[email protected]>
+ *	Copyright (C) 2016-2021  Fabrice Delliaux <[email protected]>
  *
  *	This program is free software: you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -44,32 +44,30 @@ FontsManager::~FontsManager()
 
 void FontsManager::initializeFont(const FontID fontID)
 {
+#if DEBUGGING_ON
+	LOG(DEBUG2) << "initializing font " << toUInt(toEnumType(fontID));
+#endif
+	PBMFont* font = nullptr;
 	try {
-		_fonts.at(fontID);
-	}
-	catch (const std::out_of_range& oor) {
-		PBMFont* font = nullptr;
-		try {
-			switch(fontID) {
-				case FontID::MONOSPACE85:
-					font = new FontMonospace85();
-					break;
-				case FontID::MONOSPACE86:
-					font = new FontMonospace86();
-					break;
-				case FontID::DEJAVUSANSBOLD1616:
-					font = new FontDejaVuSansBold1616();
-					break;
-				default:
-					throw GLogiKExcept("unknown font ID");
-			}
+		switch(fontID) {
+			case FontID::MONOSPACE85:
+				font = new FontMonospace85();
+				break;
+			case FontID::MONOSPACE86:
+				font = new FontMonospace86();
+				break;
+			case FontID::DEJAVUSANSBOLD1616:
+				font = new FontDejaVuSansBold1616();
+				break;
+			default:
+				throw GLogiKExcept("unknown font ID");
 		}
-		catch (const std::bad_alloc& e) { /* handle new() failure */
-			throw GLogiKBadAlloc("font bad allocation");
-		}
-
-		_fonts[fontID] = font;
 	}
+	catch (const std::bad_alloc& e) { /* handle new() failure */
+		throw GLogiKBadAlloc("font bad allocation");
+	}
+
+	_fonts[fontID] = font;
 }
 
 void FontsManager::printCharacterOnFrame(
@@ -83,10 +81,8 @@ void FontsManager::printCharacterOnFrame(
 		_fonts.at(fontID)->printCharacterOnFrame(frame, c, PBMXPos, PBMYPos);
 	}
 	catch (const std::out_of_range& oor) {
-		std::string warn("unknown font : ");
-		warn += std::to_string(toEnumType(fontID));
-		GKSysLog(LOG_WARNING, WARNING, warn);
-		throw GLogiKExcept("unknown font ID");
+		this->initializeFont(fontID);
+		_fonts.at(fontID)->printCharacterOnFrame(frame, c, PBMXPos, PBMYPos);
 	}
 }
 

src/bin/daemon/LCDPlugins/fontsManager.hpp

@@ -2,7 +2,7 @@
  *
  *	This file is part of GLogiK project.
  *	GLogiK, daemon to handle special features on gaming keyboards
- *	Copyright (C) 2016-2018  Fabrice Delliaux <[email protected]>
+ *	Copyright (C) 2016-2021  Fabrice Delliaux <[email protected]>
  *
  *	This program is free software: you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License as published by
@@ -39,8 +39,6 @@ class FontsManager
 		FontsManager(void);
 		~FontsManager(void);
 
-		void initializeFont(const FontID fontID);
-
 		void printCharacterOnFrame(
 			const FontID fontID,
 			PBMDataArray & frame,
@@ -54,6 +52,7 @@ class FontsManager
 	private:
 		std::map<const FontID, PBMFont*> _fonts;
 
+		void initializeFont(const FontID fontID);
 };
 
 } // namespace GLogiK

src/bin/daemon/LCDPlugins/splashscreen.cpp

@@ -55,8 +55,6 @@ void Splashscreen::init(FontsManager* const pFonts, const std::string & product)
 	fs::path PBMDirectory(PBM_DATA_DIR);
 	PBMDirectory /= _plugin.getName();
 
-	pFonts->initializeFont(FontID::MONOSPACE85);
-
 	this->addPBMClearedFrame();	/* frame #0 */
 	this->addPBMFrame(PBMDirectory, "splashscreen01.pbm", 1); /* #1 */
 	this->addPBMFrame(PBMDirectory, "splashscreen01.pbm", 3); /* #2 #3 #4 */

src/bin/daemon/LCDPlugins/systemMonitor.cpp

@@ -65,8 +65,6 @@ void SystemMonitor::init(FontsManager* const pFonts, const std::string & product
 	fs::path PBMDirectory(PBM_DATA_DIR);
 	PBMDirectory /= _plugin.getName();
 
-	pFonts->initializeFont(FontID::MONOSPACE85);
-
 	this->addPBMFrame(PBMDirectory, "skeleton.pbm");
 
 	std::string host;