X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/748a6dedb52d5b6a978efc26c22032f6bb4032fd..c7239788f111d2a6a8ca3bb8b95b72579095bad4:/main/enigma.cpp?ds=sidebyside

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 31b81a3f..5a22110e 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -8,6 +8,7 @@
 
 #include <lib/actions/action.h>
 #include <lib/driver/rc.h>
+#include <lib/base/ioprio.h>
 #include <lib/base/ebase.h>
 #include <lib/base/eerror.h>
 #include <lib/base/init.h>
@@ -46,20 +47,26 @@ void object_dump()
 
 static eWidgetDesktop *wdsk, *lcddsk;
 
-PSignal1<void,int> keyPressed;
+static int prev_ascii_code;
 
-PSignal1<void,int> &keyPressedSignal()
+int getPrevAsciiCode()
 {
-	return keyPressed;
+	int ret = prev_ascii_code;
+	prev_ascii_code = 0;
+	return ret;
 }
 
 void keyEvent(const eRCKey &key)
 {
 	ePtr<eActionMap> ptr;
 	eActionMap::getInstance(ptr);
-	ptr->keyPressed(0, key.code, key.flags);
-//	if (!key.flags)
-//		keyPressed(key.code);
+	if (key.flags & eRCKey::flagAscii)
+	{
+		prev_ascii_code = key.code;
+		ptr->keyPressed(0, 510 /* faked KEY_ASCII */, 0);
+	}
+	else
+		ptr->keyPressed(0, key.code, key.flags);
 }
 
 /************************************************/
@@ -140,10 +147,8 @@ int main(int argc, char **argv)
 	ePtr<gLCDDC> my_lcd_dc;
 	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");
-	
+
+		/* ok, this is currently hardcoded for arabic. */
 			/* 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);
@@ -187,7 +192,9 @@ int main(int argc, char **argv)
 	printf("executing main\n");
 	
 	bsodCatchSignals();
-	
+
+	setIoPrio(IOPRIO_CLASS_BE, 3);
+
 	python.execute("mytest", "__main__");
 	
 	if (exit_code == 5) /* python crash */
@@ -226,3 +233,10 @@ void quitMainloop(int exitCode)
 	exit_code = exitCode;
 	eApp->quit(0);
 }
+
+void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement)
+{
+	fontRenderClass::getInstance()->AddFont(filename, alias, scale_factor);
+	if (is_replacement)
+		eTextPara::setReplacementFont(alias);
+}