fix

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index b40c5ee212372ca472a871b4712df6b36ee07530..f9b88e7f0e1e4892427d81faed16532fdf7dc80a 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -29,6 +29,8 @@
 #include <lib/python/connections.h>
 #include <lib/python/python.h>
 
+#include "bsod.h" 
+
 #ifdef HAVE_GSTREAMER
 #include <gst/gst.h>
 #endif
@@ -42,36 +44,7 @@ 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;
 
@@ -128,26 +101,27 @@ public:
        }
 };
 
-/************************************************/
-
 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);
-#else
-#error bla
 #endif
 
        // set pythonpath if unset
        setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
        printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
-
+       
+       bsodLogInit();
 
        ePython python;
        eMain main;
@@ -166,10 +140,8 @@ int main(int argc, char **argv)
        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");
-       
+
+               /* 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);
@@ -211,9 +183,14 @@ int main(int argc, char **argv)
        eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        
        printf("executing main\n");
-
+       
+       bsodCatchSignals();
+       
        python.execute("mytest", "__main__");
        
+       if (exit_code == 5) /* python crash */
+               bsodFatal();
+       
        dsk.paint();
        dsk_lcd.paint();
 
@@ -248,10 +225,9 @@ void quitMainloop(int exitCode)
        eApp->quit(0);
 }
 
-void setLCD(const char *string)
-{
-}
-
-void setLCDClock(const char *string)
+void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement)
 {
+       fontRenderClass::getInstance()->AddFont(filename, alias, scale_factor);
+       if (is_replacement)
+               eTextPara::setReplacementFont(alias);
 }