X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4ebd765cac9f8a7ae4934147ed876a9e228eeb8d..b80cca410573b20277bd0f1fdb673c37c2ec1b09:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 16bbcbce..c868902f 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,8 +1,7 @@
-#undef WITH_SDL
 #ifdef WITH_SDL
-#error
 #define SDLDC
 #endif
+
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
@@ -14,8 +13,9 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
+#include <lib/gdi/glcddc.h>
+
 #ifdef WITH_SDL
-#error
 #include <lib/gdi/sdl.h>
 #endif
 #include <lib/gdi/font.h> 
@@ -69,7 +69,7 @@ void dumpRegion(const gRegion &region)
 
 }
 
-eWidgetDesktop *wdsk;
+eWidgetDesktop *wdsk, *lcddsk;
 
 // typedef struct _object PyObject;
 
@@ -124,20 +124,20 @@ public:
 		m_locale_time_handler = new eDVBLocalTimeHandler();
 		m_epgcache = new eEPGCache();
 		m_mgr->setChannelList(m_dvbdb);
-		
-//		m_scan = new eComponentScan();
-//		m_scan->start();
-
 	}
 	
 	~eMain()
 	{
+		m_dvbdb->saveServicelist();
 		m_scan = 0;
 	}
 };
 
 /************************************************/
 
+eLabel *lcd_label, *lcd_clock;
+
+int exit_code;
 
 int main(int argc, char **argv)
 {
@@ -145,9 +145,15 @@ int main(int argc, char **argv)
 	atexit(object_dump);
 #endif
 
+	// set pythonpath if unset
+	setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
+	printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
+
 
 	ePython python;
 	eMain main;
+	
+	int double_buffer = 0;
 
 #if 1
 #ifdef SDLDC
@@ -156,23 +162,45 @@ int main(int argc, char **argv)
 #else
 	ePtr<gFBDC> my_dc;
 	gFBDC::getInstance(my_dc);
+	
+	double_buffer = my_dc->haveDoubleBuffering();
 #endif
 
-	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
+	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");
+	
+			/* 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.setCompositionMode(eWidgetDesktop::cmBuffered);
+/*	if (double_buffer)
+	{
+		eDebug(" - double buffering found, enable buffered graphics mode.");
+		dsk.setCompositionMode(eWidgetDesktop::cmBuffered);
+	} */
 	
 	wdsk = &dsk;
+	lcddsk = &dsk_lcd;
 
 	dsk.setDC(my_dc);
+	dsk_lcd.setDC(my_lcd_dc);
 
 	ePtr<gPixmap> m_pm;
-	loadPNG(m_pm, "data/pal.png");
+	loadPNG(m_pm, DATADIR "/enigma2/pal.png");
 	if (!m_pm)
 	{
-		eFatal("hi ghost, please copy pal.png into your ./data, thanks!");
+		eFatal("pal.png not found!");
 	} else
 		dsk.setPalette(*m_pm);
 
@@ -181,6 +209,32 @@ 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));
+	
+	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();
 	
 	eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
 	
@@ -188,9 +242,7 @@ int main(int argc, char **argv)
 
 	python.execute("mytest", "__main__");
 
-//	eApp->exec();
-
-	return 0;
+	return exit_code;
 }
 
 eWidgetDesktop *getDesktop()
@@ -198,12 +250,27 @@ eWidgetDesktop *getDesktop()
 	return wdsk;
 }
 
+eApplication *getApplication()
+{
+	return eApp;
+}
+
 void runMainloop()
 {
-	eApp->exec();
+	exit_code = eApp->runLoop();
+}
+
+void quitMainloop(int exitCode)
+{
+	eApp->quit(exitCode);
+}
+
+void setLCD(const char *string)
+{
+	lcd_label->setText(string);
 }
 
-void quitMainloop()
+void setLCDClock(const char *string)
 {
-	eApp->quit(0);
+	lcd_clock->setText(string);
 }