add function to get a comparable service reference string (useable to

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 3a728b8df7e5e5d11b98989818ddfd1fd63ef3d4..5a22110e4e15280050d223d51284559707fae6ea 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,42 +1,40 @@
-#undef WITH_SDL

 #ifdef WITH_SDL
 #ifdef WITH_SDL

-#error

 #define SDLDC
 #endif
 #define SDLDC
 #endif

+

 #include <stdio.h>
 #include <stdio.h>

+#include <unistd.h>

 #include <libsig_comp.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 <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/gfbdc.h>

+#include <lib/gdi/glcddc.h>
+#include <lib/gdi/grc.h>

 #ifdef WITH_SDL
 #ifdef WITH_SDL

-#error

 #include <lib/gdi/sdl.h>
 #endif
 #include <lib/gdi/sdl.h>
 #endif

+#include <lib/gdi/epng.h>

 #include <lib/gdi/font.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/ewidget.h>
 #include <lib/gui/ewidgetdesktop.h>

-#include <lib/gui/elabel.h>
-#include <lib/gui/ebutton.h>
-

 #include <lib/gui/ewindow.h>
 #include <lib/gui/ewindow.h>

-
-#include <lib/python/python.h>

 #include <lib/python/connections.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;
 
 #ifdef OBJECT_DEBUG
 int object_total_remaining;


@@ -47,48 +45,28 @@ void object_dump()
 }
 #endif
 
 }
 #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());
-       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");
-       }
-}
-
-eWidgetDesktop *wdsk;
-
-// 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;
+static int prev_ascii_code;

 
 

-PSignal1<void,int> &keyPressedSignal()
+int getPrevAsciiCode()

 {
 {

-       return keyPressed;
+       int ret = prev_ascii_code;
+       prev_ascii_code = 0;
+       return ret;

 }
 
 void keyEvent(const eRCKey &key)
 {
        ePtr<eActionMap> ptr;
        eActionMap::getInstance(ptr);
 }
 
 void keyEvent(const eRCKey &key)
 {
        ePtr<eActionMap> ptr;
        eActionMap::getInstance(ptr);

-       ptr->keyPressed(0, key.code, key.flags);
-//     if (!key.flags)
-//             keyPressed(key.code);
+       if (key.flags & eRCKey::flagAscii)
+       {
+               prev_ascii_code = key.code;
+               ptr->keyPressed(0, 510 /* faked KEY_ASCII */, 0);
+       }
+       else
+               ptr->keyPressed(0, key.code, key.flags);

 }
 
 /************************************************/
 }
 
 /************************************************/


@@ -121,31 +99,40 @@ public:
                m_locale_time_handler = new eDVBLocalTimeHandler();
                m_epgcache = new eEPGCache();
                m_mgr->setChannelList(m_dvbdb);
                m_locale_time_handler = new eDVBLocalTimeHandler();
                m_epgcache = new eEPGCache();
                m_mgr->setChannelList(m_dvbdb);

-               
-//             m_scan = new eComponentScan();
-//             m_scan->start();
-

        }
        
        ~eMain()
        {
        }
        
        ~eMain()
        {

+               m_dvbdb->saveServicelist();

                m_scan = 0;
        }
 };
 
                m_scan = 0;
        }
 };
 

-/************************************************/
-
+int exit_code;

 
 int main(int argc, char **argv)
 {
 
 int main(int argc, char **argv)
 {

+#ifdef MEMLEAK_CHECK
+       atexit(DumpUnfreed);
+#endif
+

 #ifdef OBJECT_DEBUG
        atexit(object_dump);
 #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;
 
        ePython python;
        eMain main;

-
+       

 #if 1
 #ifdef SDLDC
        ePtr<gSDLDC> my_dc;
 #if 1
 #ifdef SDLDC
        ePtr<gSDLDC> my_dc;


@@ -153,22 +140,43 @@ int main(int argc, char **argv)
 #else
        ePtr<gFBDC> my_dc;
        gFBDC::getInstance(my_dc);
 #else
        ePtr<gFBDC> my_dc;
        gFBDC::getInstance(my_dc);

+       
+       int double_buffer = my_dc->haveDoubleBuffering();

 #endif
 
 #endif
 

-       fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
+       ePtr<gLCDDC> my_lcd_dc;
+       gLCDDC::getInstance(my_lcd_dc);
+
+
+               /* 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(eSize(720, 576));

+       eWidgetDesktop dsk_lcd(eSize(132, 64));
+       
+/*     if (double_buffer)
+       {
+               eDebug(" - double buffering found, enable buffered graphics mode.");
+               dsk.setCompositionMode(eWidgetDesktop::cmBuffered);
+       } */

        
        wdsk = &dsk;
        
        wdsk = &dsk;

-
+       lcddsk = &dsk_lcd;

 
        dsk.setDC(my_dc);
 
        dsk.setDC(my_dc);

+       dsk_lcd.setDC(my_lcd_dc);

 
        ePtr<gPixmap> m_pm;
 
        ePtr<gPixmap> m_pm;

-       loadPNG(m_pm, "data/pal.png");
+       loadPNG(m_pm, DATADIR "/enigma2/pal.png");

        if (!m_pm)
        {
        if (!m_pm)
        {

-               eFatal("hi ghost, please copy pal.png into your ./data, thanks!");
+               eFatal("pal.png not found!");

        } else
                dsk.setPalette(*m_pm);
 
        } else
                dsk.setPalette(*m_pm);
 


@@ -177,29 +185,58 @@ int main(int argc, char **argv)
 
                /* redrawing is done in an idle-timer, so we have to set the context */
        dsk.setRedrawTask(main);
 
                /* redrawing is done in an idle-timer, so we have to set the context */
        dsk.setRedrawTask(main);

-       
+       dsk_lcd.setRedrawTask(main);
+

        eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        
        printf("executing main\n");
        eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        
        printf("executing main\n");

+       
+       bsodCatchSignals();
+
+       setIoPrio(IOPRIO_CLASS_BE, 3);

 
        python.execute("mytest", "__main__");
 
        python.execute("mytest", "__main__");

+       
+       if (exit_code == 5) /* python crash */
+               bsodFatal();
+       
+       dsk.paint();
+       dsk_lcd.paint();

 
 

-//     eApp->exec();
+       {
+               gPainter p(my_lcd_dc);
+               p.resetClip(eRect(0, 0, 132, 64));
+               p.clear();
+               p.flush();
+       }
+
+       return exit_code;
+}

 
 

-       return 0;
+eWidgetDesktop *getDesktop(int which)
+{
+       return which ? lcddsk : wdsk;

 }
 
 }
 

-eWidgetDesktop *getDesktop()
+eApplication *getApplication()

 {
 {

-       return wdsk;
+       return eApp;

 }
 
 void runMainloop()
 {
 }
 
 void runMainloop()
 {

-       eApp->exec();
+       eApp->runLoop();

 }
 
 }
 

-void quitMainloop()
+void quitMainloop(int exitCode)

 {
 {

+       exit_code = exitCode;

        eApp->quit(0);
 }
        eApp->quit(0);
 }

+
+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);
+}