X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/06469e38dc7f21a2587efc181f47fa219efa8e5f..192ebca707866e0c95bf6737c2a6a6e7fa1551b0:/main/enigma.cpp?ds=sidebyside

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 2003a452..8a5dfa8c 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,46 +1,40 @@
-#undef WITH_SDL
-
 #ifdef WITH_SDL
-#error
 #define SDLDC
 #endif
 
 #include <stdio.h>
+#include <unistd.h>
 #include <libsig_comp.h>
+
+#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>
 #include <lib/base/init_num.h>
-
-#include <unistd.h>
-
-#include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
 #include <lib/gdi/glcddc.h>
-
+#include <lib/gdi/grc.h>
 #ifdef WITH_SDL
-#error
 #include <lib/gdi/sdl.h>
 #endif
+#include <lib/gdi/epng.h>
 #include <lib/gdi/font.h> 
-
+#include <lib/gui/ebutton.h>
+#include <lib/gui/elabel.h>
+#include <lib/gui/elistboxcontent.h>
 #include <lib/gui/ewidget.h>
 #include <lib/gui/ewidgetdesktop.h>
-#include <lib/gui/elabel.h>
-#include <lib/gui/ebutton.h>
-
 #include <lib/gui/ewindow.h>
-
-#include <lib/python/python.h>
 #include <lib/python/connections.h>
+#include <lib/python/python.h>
 
-#include <lib/gui/elistboxcontent.h>
-
-#include <lib/driver/rc.h>
-
-#include <lib/actions/action.h>
+#include "bsod.h" 
 
-#include <lib/gdi/epng.h>
+#ifdef HAVE_GSTREAMER
+#include <gst/gst.h>
+#endif
 
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
@@ -51,51 +45,46 @@ void object_dump()
 }
 #endif
 
-void dumpRegion(const gRegion &region)
-{
-	fprintf(stderr, "extends: %d %d -> %d %d (%d rects)\n", 
-		region.extends.left(), region.extends.top(),
-		region.extends.right(), region.extends.bottom(), region.rects.size());
-#if 0
-	for (int y=0; y<region.extends.bottom(); ++y)
-	{
-		for (int x=0; x<region.extends.right(); ++x)
-		{
-			unsigned char res = ' ';
-			for (unsigned int i=0; i < region.rects.size(); ++i)
-				if (region.rects[i].contains(ePoint(x, y)))
-					res = '0' + i;
-			fprintf(stderr, "%c", res);
-		}
-		fprintf(stderr, "\n");
-	}
-#endif
-
-}
-
-eWidgetDesktop *wdsk, *lcddsk;
-
-// typedef struct _object PyObject;
-
-void print(int i)
-{
-	printf("C++ says: it's a %d!!!\n", i);
-}
+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)
 {
+	static eRCKey last(0, 0, 0);
+	static int num_repeat;
+
 	ePtr<eActionMap> ptr;
 	eActionMap::getInstance(ptr);
-	ptr->keyPressed(0, key.code, key.flags);
-//	if (!key.flags)
-//		keyPressed(key.code);
+
+	if ((key.code == last.code) && (key.producer == last.producer) && key.flags & eRCKey::flagRepeat)
+		num_repeat++;
+	else
+	{
+		num_repeat = 0;
+		last = key;
+	}
+
+	if (num_repeat == 4)
+	{
+		ptr->keyPressed(key.producer->getIdentifier(), key.code, eRCKey::flagLong);
+		num_repeat++;
+	}
+
+	if (key.flags & eRCKey::flagAscii)
+	{
+		prev_ascii_code = key.code;
+		ptr->keyPressed(key.producer->getIdentifier(), 510 /* faked KEY_ASCII */, 0);
+	}
+	else
+		ptr->keyPressed(key.producer->getIdentifier(), key.code, key.flags);
 }
 
 /************************************************/
@@ -137,28 +126,31 @@ public:
 	}
 };
 
-/************************************************/
-
-eLabel *lcd_label, *lcd_clock;
-
 int exit_code;
 
 int main(int argc, char **argv)
 {
+#ifdef MEMLEAK_CHECK
+	atexit(DumpUnfreed);
+#endif
+
 #ifdef OBJECT_DEBUG
 	atexit(object_dump);
 #endif
 
+#ifdef HAVE_GSTREAMER
+	gst_init(&argc, &argv);
+#endif
+
 	// set pythonpath if unset
 	setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
 	printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
-
+	
+	bsodLogInit();
 
 	ePython python;
 	eMain main;
 	
-	int double_buffer = 0;
-
 #if 1
 #ifdef SDLDC
 	ePtr<gSDLDC> my_dc;
@@ -167,17 +159,27 @@ int main(int argc, char **argv)
 	ePtr<gFBDC> my_dc;
 	gFBDC::getInstance(my_dc);
 	
-	double_buffer = my_dc->haveDoubleBuffering();
+	int double_buffer = my_dc->haveDoubleBuffering();
 #endif
 
 	ePtr<gLCDDC> my_lcd_dc;
 	gLCDDC::getInstance(my_lcd_dc);
 
-	fontRenderClass::getInstance()->AddFont(FONTDIR "/md_khmurabi_10.ttf", "Regular", 100);
+
+		/* 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);
+	eTextPara::forceReplacementGlyph(0xfdf2);
+	for (int i = 0xfe80; i < 0xff00; ++i)
+		eTextPara::forceReplacementGlyph(i);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	eWidgetDesktop dsk_lcd(eSize(132, 64));
 	
+	dsk.setStyleID(0);
+	dsk_lcd.setStyleID(1);
+	
 /*	if (double_buffer)
 	{
 		eDebug(" - double buffering found, enable buffered graphics mode.");
@@ -204,64 +206,78 @@ int main(int argc, char **argv)
 		/* redrawing is done in an idle-timer, so we have to set the context */
 	dsk.setRedrawTask(main);
 	dsk_lcd.setRedrawTask(main);
-
-	eWindow *lcd_win = new eWindow(&dsk_lcd);
 	
-	lcd_win->setFlag(eWindow::wfNoBorder);
 	
-	lcd_win->move(ePoint(0, 0));
-	lcd_win->resize(eSize(132, 64));
+	eDebug("Loading spinners...");
 	
-	lcd_label = new eLabel(lcd_win);
-	lcd_label->move(ePoint(0, 4));
-	lcd_label->resize(eSize(132, 42));
-	ePtr<gFont> font = new gFont("Regular", 19);
-	//ePtr<gFont> font = new gFont("Regular", 16);
-	lcd_label->setFont(font);
-
-	lcd_clock = new eLabel(lcd_win);
-	lcd_clock->move(ePoint(50, 46));
-	lcd_clock->resize(eSize(132, 18));
-	ePtr<gFont> clkfont = new gFont("Regular", 16);
-	lcd_clock->setFont(clkfont);
-
-	//lcd_label->setText("bla bla bla, this lcd\nSUCKS!");
-	//lcd_clock->setText("88:88:88");
-
-	lcd_win->show();
+	{
+		int i;
+#define MAX_SPINNER 64
+		ePtr<gPixmap> wait[MAX_SPINNER];
+		for (i=0; i<MAX_SPINNER; ++i)
+		{
+			char filename[strlen(DATADIR) + 20];
+			sprintf(filename, DATADIR "/enigma2/wait%d.png", i + 1);
+			loadPNG(wait[i], filename);
+			
+			if (!wait[i])
+			{
+				if (!i)
+					eDebug("failed to load %s! (%m)", filename);
+				else
+					eDebug("found %d spinner!\n", i);
+				break;
+			}
+		}
+		if (i)
+			my_dc->setSpinner(eRect(ePoint(100, 100), wait[0]->size()), wait, i);
+	}
 	
+	gRC::getInstance()->setSpinnerDC(my_dc);
+
 	eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
 	
 	printf("executing main\n");
+	
+	bsodCatchSignals();
+
+	setIoPrio(IOPRIO_CLASS_BE, 3);
 
 	python.execute("mytest", "__main__");
+	
+	if (exit_code == 5) /* python crash */
+		bsodFatal();
+	
+	dsk.paint();
+	dsk_lcd.paint();
 
-//	eApp->exec();
+	{
+		gPainter p(my_lcd_dc);
+		p.resetClip(eRect(0, 0, 132, 64));
+		p.clear();
+		p.flush();
+	}
 
 	return exit_code;
 }
 
-eWidgetDesktop *getDesktop()
-{
-	return wdsk;
-}
-
-void runMainloop()
+eWidgetDesktop *getDesktop(int which)
 {
-	exit_code = eApp->exec();
+	return which ? lcddsk : wdsk;
 }
 
-void quitMainloop(int exitCode)
+eApplication *getApplication()
 {
-	eApp->quit(exitCode);
+	return eApp;
 }
 
-void setLCD(const char *string)
+void runMainloop()
 {
-	lcd_label->setText(string);
+	eApp->runLoop();
 }
 
-void setLCDClock(const char *string)
+void quitMainloop(int exitCode)
 {
-	lcd_clock->setText(string);
+	exit_code = exitCode;
+	eApp->quit(0);
 }