X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/06469e38dc7f21a2587efc181f47fa219efa8e5f..32f4b90e3513e3cb4365e0ad1160de6e093f45d9:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 2003a452..c868902f 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,7 +1,4 @@
-#undef WITH_SDL
-
 #ifdef WITH_SDL
-#error
 #define SDLDC
 #endif
 
@@ -19,7 +16,6 @@
 #include <lib/gdi/glcddc.h>
 
 #ifdef WITH_SDL
-#error
 #include <lib/gdi/sdl.h>
 #endif
 #include <lib/gdi/font.h> 
@@ -174,6 +170,16 @@ int main(int argc, char **argv)
 	gLCDDC::getInstance(my_lcd_dc);
 
 	fontRenderClass::getInstance()->AddFont(FONTDIR "/md_khmurabi_10.ttf", "Regular", 100);
+	fontRenderClass::getInstance()->AddFont(FONTDIR "/ae_AlMateen.ttf", "Replacement", 90);
+	eTextPara::setReplacementFont("Replacement");
+	
+			/* some characters are wrong in the regular font, force them to use the replacement font */
+	for (int i = 0x60c; i <= 0x66d; ++i)
+		eTextPara::forceReplacementGlyph(i);
+	eTextPara::forceReplacementGlyph(0xfdf2);
+	for (int i = 0xfe80; i < 0xff00; ++i)
+		eTextPara::forceReplacementGlyph(i);
+	
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	eWidgetDesktop dsk_lcd(eSize(132, 64));
@@ -236,8 +242,6 @@ int main(int argc, char **argv)
 
 	python.execute("mytest", "__main__");
 
-//	eApp->exec();
-
 	return exit_code;
 }
 
@@ -246,9 +250,14 @@ eWidgetDesktop *getDesktop()
 	return wdsk;
 }
 
+eApplication *getApplication()
+{
+	return eApp;
+}
+
 void runMainloop()
 {
-	exit_code = eApp->exec();
+	exit_code = eApp->runLoop();
 }
 
 void quitMainloop(int exitCode)