X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/54bd4123728628a6f77bad2584b70d1353a91666..5ec9643747ed0dc24917ddac6310be0e49f74ce5:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index b055619e..f81a3c28 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,3 +1,8 @@
+#undef WITH_SDL
+#ifdef WITH_SDL
+#error
+#define SDLDC
+#endif
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
@@ -9,6 +14,10 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
+#ifdef WITH_SDL
+#error
+#include <lib/gdi/sdl.h>
+#endif
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -25,6 +34,10 @@
 
 #include <lib/driver/rc.h>
 
+#include <lib/actions/action.h>
+
+#include <lib/gdi/epng.h>
+
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
@@ -39,6 +52,7 @@ 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)
@@ -51,6 +65,8 @@ void dumpRegion(const gRegion &region)
 		}
 		fprintf(stderr, "\n");
 	}
+#endif
+
 }
 
 eWidgetDesktop *wdsk;
@@ -71,8 +87,11 @@ PSignal1<void,int> &keyPressedSignal()
 
 void keyEvent(const eRCKey &key)
 {
-	if (!key.flags)
-		keyPressed(key.code);
+	ePtr<eActionMap> ptr;
+	eActionMap::getInstance(ptr);
+	ptr->keyPressed(0, key.code, key.flags);
+//	if (!key.flags)
+//		keyPressed(key.code);
 }
 
 /************************************************/
@@ -81,6 +100,8 @@ void keyEvent(const eRCKey &key)
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/db.h>
+#include <lib/dvb/dvbtime.h>
+#include <lib/dvb/epgcache.h>
 
 class eMain: public eApplication, public Object
 {
@@ -88,9 +109,10 @@ class eMain: public eApplication, public Object
 	
 	ePtr<eDVBResourceManager> m_mgr;
 	ePtr<eDVBDB> m_dvbdb;
-
+	ePtr<eDVBLocalTimeHandler> m_locale_time_handler;
 	ePtr<eComponentScan> m_scan;
-	
+	ePtr<eEPGCache> m_epgcache;
+
 public:
 	eMain()
 	{
@@ -99,7 +121,8 @@ public:
 				/* TODO: put into init */
 		m_dvbdb = new eDVBDB();
 		m_mgr = new eDVBResourceManager();
-		
+		m_locale_time_handler = new eDVBLocalTimeHandler();
+		m_epgcache = new eEPGCache();
 		m_mgr->setChannelList(m_dvbdb);
 		
 //		m_scan = new eComponentScan();
@@ -125,36 +148,43 @@ int main(int argc, char **argv)
 
 	ePython python;
 	eMain main;
+	
+	int double_buffer = 0;
 
 #if 1
+#ifdef SDLDC
+	ePtr<gSDLDC> my_dc;
+	gSDLDC::getInstance(my_dc);
+#else
 	ePtr<gFBDC> my_dc;
 	gFBDC::getInstance(my_dc);
-
-	gPainter p(my_dc);
 	
-	gRGB pal[256];
-	pal[0] = 0;
-	pal[1] = 0xff00ff;
-	pal[2] = 0xffFFff;
-	pal[3] = 0x00ff00;
-	
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x10] = 0x111111 * a;
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x20] = (0x111100 * a) | 0xFF;
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x30] = (0x110011 * a) | 0xFF00;
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x40] = (0x001111 * a) | 0xFF0000;
-	p.setPalette(pal, 0, 256);
-
-	fontRenderClass::getInstance()->AddFont("/dbox2/cdkroot/share/fonts/arial.ttf", "Arial", 100);
+	double_buffer = my_dc->haveDoubleBuffering();
+#endif
+
+	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	
+	if (double_buffer)
+	{
+		eDebug(" - double buffering found, enable buffered graphics mode.");
+		dsk.setCompositionMode(eWidgetDesktop::cmBuffered);
+	}
+	
 	wdsk = &dsk;
-	dsk.setBackgroundColor(gColor(0));
+
 	dsk.setDC(my_dc);
+
+	ePtr<gPixmap> m_pm;
+	loadPNG(m_pm, "data/pal.png");
+	if (!m_pm)
+	{
+		eFatal("hi ghost, please copy pal.png into your ./data, thanks!");
+	} else
+		dsk.setPalette(*m_pm);
+
+	dsk.setBackgroundColor(gRGB(0,0,0,0xFF));
 #endif
 
 		/* redrawing is done in an idle-timer, so we have to set the context */
@@ -163,6 +193,7 @@ int main(int argc, char **argv)
 	eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
 	
 	printf("executing main\n");
+
 	python.execute("mytest", "__main__");
 
 //	eApp->exec();