X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2Fenigma.cpp;h=3f420b4bb6ee2e996e5a863dc42d457fc8073ae5;hp=a3770b863448ba95ab581767a113e9123c8ca720;hb=9c998a40679f9b630ccf8cc6fda7384ce94c30e5;hpb=d026012d8ba6198d879df68cb4bf6c92c95a633a

diff --git a/main/enigma.cpp b/main/enigma.cpp
index a3770b8..3f420b4 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,46 +1,39 @@
-#undef WITH_SDL
-
-#ifdef WITH_SDL
-#error
-#define SDLDC
-#endif
-
+#include <unistd.h>
+#include <fcntl.h>
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/ioctl.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/font.h> 
-
+#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 +44,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
+static eWidgetDesktop *wdsk, *lcddsk;
 
-}
+static int prev_ascii_code;
 
-eWidgetDesktop *wdsk, *lcddsk;
-
-// typedef struct _object PyObject;
-
-void print(int i)
-{
-	printf("C++ says: it's a %d!!!\n", i);
-}
-
-PSignal1<void,int> keyPressed;
-
-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);
 }
 
 /************************************************/
@@ -110,19 +98,17 @@ void keyEvent(const eRCKey &key)
 class eMain: public eApplication, public Object
 {
 	eInit init;
-	
-	ePtr<eDVBResourceManager> m_mgr;
+
 	ePtr<eDVBDB> m_dvbdb;
+	ePtr<eDVBResourceManager> m_mgr;
 	ePtr<eDVBLocalTimeHandler> m_locale_time_handler;
-	ePtr<eComponentScan> m_scan;
 	ePtr<eEPGCache> m_epgcache;
 
 public:
 	eMain()
 	{
 		init.setRunlevel(eAutoInitNumbers::main);
-
-				/* TODO: put into init */
+		/* TODO: put into init */
 		m_dvbdb = new eDVBDB();
 		m_mgr = new eDVBResourceManager();
 		m_locale_time_handler = new eDVBLocalTimeHandler();
@@ -133,51 +119,64 @@ public:
 	~eMain()
 	{
 		m_dvbdb->saveServicelist();
-		m_scan = 0;
+		m_mgr->releaseCachedChannel();
 	}
 };
 
-/************************************************/
-
-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
+#ifdef WITH_SDL
 	ePtr<gSDLDC> my_dc;
 	gSDLDC::getInstance(my_dc);
 #else
 	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.");
@@ -191,7 +190,7 @@ int main(int argc, char **argv)
 	dsk_lcd.setDC(my_lcd_dc);
 
 	ePtr<gPixmap> m_pm;
-	loadPNG(m_pm, DATADIR "/enigma2/pal.png");
+	loadPNG(m_pm, DATADIR "/enigma2/skin_default/pal.png");
 	if (!m_pm)
 	{
 		eFatal("pal.png not found!");
@@ -204,44 +203,72 @@ 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) + 41];
+			sprintf(filename, DATADIR "/enigma2/skin_default/spinner/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);
+		else
+			my_dc->setSpinner(eRect(100, 100, 0, 0), wait, 1);
+	}
 	
+	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__");
+	python.execFile("/usr/lib/enigma2/python/mytest.py");
+
+	extern void setFullsize(); // definend in lib/gui/evideo.cpp
+	setFullsize();
 
-	python.execute("mytest", "__main__");
+	if (exit_code == 5) /* python crash */
+	{
+		eDebug("(exit code 5)");
+		bsodFatal(0);
+	}
+	
+	dsk.paint();
+	dsk_lcd.paint();
+
+	{
+		gPainter p(my_lcd_dc);
+		p.resetClip(eRect(0, 0, 132, 64));
+		p.clear();
+	}
 
 	return exit_code;
 }
 
-eWidgetDesktop *getDesktop()
+eWidgetDesktop *getDesktop(int which)
 {
-	return wdsk;
+	return which ? lcddsk : wdsk;
 }
 
 eApplication *getApplication()
@@ -251,20 +278,56 @@ eApplication *getApplication()
 
 void runMainloop()
 {
-	exit_code = eApp->runLoop();
+	eApp->runLoop();
 }
 
 void quitMainloop(int exitCode)
 {
-	eApp->quit(exitCode);
+	FILE *f = fopen("/proc/stb/fp/was_timer_wakeup", "w");
+	if (f)
+	{
+		fprintf(f, "%d", 0);
+		fclose(f);
+	}
+	else
+	{
+		int fd = open("/dev/dbox/fp0", O_WRONLY);
+		if (fd >= 0)
+		{
+			if (ioctl(fd, 10 /*FP_CLEAR_WAKEUP_TIMER*/) < 0)
+				eDebug("FP_CLEAR_WAKEUP_TIMER failed (%m)");
+			close(fd);
+		}
+		else
+			eDebug("open /dev/dbox/fp0 for wakeup timer clear failed!(%m)");
+	}
+	exit_code = exitCode;
+	eApp->quit(0);
 }
 
-void setLCD(const char *string)
+#include "version.h"
+
+const char *getEnigmaVersionString()
 {
-	lcd_label->setText(string);
+	std::string date =
+#ifdef ENIGMA2_LAST_CHANGE_DATE
+		ENIGMA2_LAST_CHANGE_DATE;
+#else
+		__DATE__;
+#endif
+	std::string branch =
+#ifdef ENIGMA2_BRANCH
+		ENIGMA2_BRANCH;
+#else
+		"HEAD";
+#endif
+	return std::string(date + '-' + branch).c_str();
 }
 
-void setLCDClock(const char *string)
+#include <malloc.h>
+
+void dump_malloc_stats(void)
 {
-	lcd_clock->setText(string);
+	struct mallinfo mi = mallinfo();
+	eDebug("MALLOC: %d total", mi.uordblks);
 }