fix

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 3102c20a514f069404d6ef6096cc5305c85f933d..f9b88e7f0e1e4892427d81faed16532fdf7dc80a 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -3,40 +3,37 @@
 #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
 #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 "bsod.h" 
 
-#include <lib/gdi/epng.h>
+#ifdef HAVE_GSTREAMER
+#include <gst/gst.h>
+#endif
 
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
@@ -47,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;
 
@@ -133,22 +101,27 @@ public:
        }
 };
 
-/************************************************/
-
-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;
@@ -167,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);
@@ -209,48 +180,33 @@ 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, 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));
        
        printf("executing main\n");
-
+       
+       bsodCatchSignals();
+       
        python.execute("mytest", "__main__");
        
-       lcd_win->hide();
+       if (exit_code == 5) /* python crash */
+               bsodFatal();
        
        dsk.paint();
        dsk_lcd.paint();
 
+       {
+               gPainter p(my_lcd_dc);
+               p.resetClip(eRect(0, 0, 132, 64));
+               p.clear();
+               p.flush();
+       }
+
        return exit_code;
 }
 
-eWidgetDesktop *getDesktop()
+eWidgetDesktop *getDesktop(int which)
 {
-       return wdsk;
+       return which ? lcddsk : wdsk;
 }
 
 eApplication *getApplication()
@@ -269,12 +225,9 @@ void quitMainloop(int exitCode)
        eApp->quit(0);
 }
 
-void setLCD(const char *string)
-{
-       lcd_label->setText(string);
-}
-
-void setLCDClock(const char *string)
+void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement)
 {
-       lcd_clock->setText(string);
+       fontRenderClass::getInstance()->AddFont(filename, alias, scale_factor);
+       if (is_replacement)
+               eTextPara::setReplacementFont(alias);
 }