X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1b4f887b1a2307a2db662345aaafe0a606143d83..5174356b931680de69dc9560fc788feb5c0f64fa:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index f1eb6cc9..a370d55c 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,46 +1,37 @@
-#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/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 <lib/gdi/epng.h>
+#ifdef HAVE_GSTREAMER
+#include <gst/gst.h>
+#endif
 
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
@@ -128,21 +119,18 @@ 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)
 {
@@ -150,12 +138,18 @@ int main(int argc, char **argv)
 	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"));
+
 
 	ePython python;
 	eMain main;
 	
-	int double_buffer = 0;
-
 #if 1
 #ifdef SDLDC
 	ePtr<gSDLDC> my_dc;
@@ -164,22 +158,32 @@ 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 "/arial.ttf", "Arial", 100);
+	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));
 	
-	if (double_buffer)
+/*	if (double_buffer)
 	{
 		eDebug(" - double buffering found, enable buffered graphics mode.");
 		dsk.setCompositionMode(eWidgetDesktop::cmBuffered);
-	}
+	} */
 	
 	wdsk = &dsk;
 	lcddsk = &dsk_lcd;
@@ -188,10 +192,10 @@ int main(int argc, char **argv)
 	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);
 
@@ -202,62 +206,50 @@ int main(int argc, char **argv)
 	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, 10));
-	lcd_label->resize(eSize(132, 36));
-	ePtr<gFont> font = new gFont("Arial", 16);
-	lcd_label->setFont(font);
-
-	lcd_clock = new eLabel(lcd_win);
-	lcd_clock->move(ePoint(50, 46));
-	lcd_clock->resize(eSize(132, 20));
-	//ePtr<gFont> clkfont = new gFont("Arial", 18);
-	lcd_clock->setFont(font);
-
-	//lcd_label->setText("bla bla bla, this lcd\nSUCKS!");
-	//lcd_clock->setText("88:88:88");
-
-	lcd_win->show();
-	
 	eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
 	
 	printf("executing main\n");
 
 	python.execute("mytest", "__main__");
+	
+	dsk.paint();
+	dsk_lcd.paint();
+
+	{
+		gPainter p(my_lcd_dc);
+		p.resetClip(eRect(0, 0, 132, 64));
+		p.clear();
+		p.flush();
+	}
 
-//	eApp->exec();
+	return exit_code;
+}
 
-	return 0;
+eWidgetDesktop *getDesktop(int which)
+{
+	return which ? lcddsk : wdsk;
 }
 
-eWidgetDesktop *getDesktop()
+eApplication *getApplication()
 {
-	return wdsk;
+	return eApp;
 }
 
 void runMainloop()
 {
-	eApp->exec();
+	eApp->runLoop();
 }
 
-void quitMainloop()
+void quitMainloop(int exitCode)
 {
+	exit_code = exitCode;
 	eApp->quit(0);
 }
 
 void setLCD(const char *string)
 {
-	lcd_label->setText(string);
 }
 
 void setLCDClock(const char *string)
 {
-	lcd_clock->setText(string);
 }