fixed refcount of eListboxPythonStringContent

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index dd9084a2e95b5e6617892b929fa287791aef011a..df28bcd75c4c01bf1ef7c64884ae757018d517bf 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -14,9 +14,15 @@
 #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/driver/rc.h>
+
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
@@ -45,18 +51,51 @@ void dumpRegion(const gRegion &region)
        }
 }
 
-int main()
+
+class eMain: public eApplication, public Object
+{
+       eInit init;
+public:
+       eMain()
+       {
+               init.setRunlevel(eAutoInitNumbers::main);
+       }
+};
+
+eWidgetDesktop *wdsk;
+
+// 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()
+{
+       return keyPressed;
+}
+
+void keyEvent(const eRCKey &key)
+{
+       if (!key.flags)
+               keyPressed(key.code);
+}
+
+int main(int argc, char **argv)
 {
 #ifdef OBJECT_DEBUG
        atexit(object_dump);
 #endif
 
-       eInit init;
 
-       init.setRunlevel(eAutoInitNumbers::main);
+#if 1
+       eMain main;
+
        ePtr<gFBDC> my_dc;
        gFBDC::getInstance(my_dc);
-#if 1
 
        gPainter p(my_dc);
        
@@ -67,102 +106,43 @@ int main()
        pal[3] = 0x00ff00;
        
        for (int a=0; a<0x10; ++a)
-               pal[a | 0x10] = (0x111111 * a) | 0xFF;
+               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);
 
-#if 0
-       p.resetClip(gRegion(eRect(0, 0, 720, 576)));
-       
-        
-       gRegion c;
-       eDebug("0");
-       int i;
-       
-       c |= eRect(0, 20, 100, 10);
-       c |= eRect(0, 50, 100, 10);
-       c |= eRect(10, 10, 80, 100);
-       
-       c -= eRect(20, 20, 40, 40);
-       
-       p.setForegroundColor(gColor(3));
-       p.fill(eRect(0, 0, 100, 100));
-       p.fill(eRect(200, 0, 100, 100));
-       
-       for (int a=0; a<c.rects.size(); ++a)
-               eDebug("%d %d -> %d %d", c.rects[a].left(), c.rects[a].top(), c.rects[a].right(), c.rects[a].bottom());
-       eDebug("extends: %d %d %d %d", c.extends.left(), c.extends.top(), c.extends.right(), c.extends.bottom());
-       p.setOffset(ePoint(100, 100));
-       p.clip(c);
-
-       p.setBackgroundColor(gColor(1));
-       p.clear();
-       p.setForegroundColor(gColor(2));
-       p.line(ePoint(0, 0), ePoint(220, 190));
-       p.clippop();
-
-       p.setBackgroundColor(gColor(0x1f));
-       p.setForegroundColor(gColor(0x10));
-
-       ePtr<gFont> fnt = new gFont("Arial", 70);
-       p.setFont(fnt);
-       p.renderText(eRect(100, 100, 500, 200), "Hello welt!");
-#else
-
-
        eWidgetDesktop dsk(eSize(720, 576));
+       
+       wdsk = &dsk;
+       dsk.setBackgroundColor(gColor(0));
        dsk.setDC(my_dc);
+#endif
 
-       eWindow *bla = new eWindow(&dsk);
+               /* redrawing is done in an idle-timer, so we have to set the context */
+       dsk.setRedrawTask(main);
        
-       bla->move(ePoint(100, 100));
-       bla->resize(eSize(200, 200));
-       bla->show();
-
-       eLabel *blablub = new eLabel(bla->child());
-       blablub->setText("hello world");
-       blablub->move(ePoint(0, 0));
-       blablub->resize(eSize(400,400));
-
-#if 0
-       eWidget *bla2 = new eWidget(0);
-       dsk.addRootWidget(bla2, 0);
+       eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        
-       bla2->move(ePoint(160, 160));
-       bla2->resize(eSize(200, 200));
-       bla2->show();
-#endif
-
-       dsk.recalcClipRegions();
-
-//     dumpRegion(bla->m_visible_region);
-//     dumpRegion(bla2->m_visible_region);
-//     dumpRegion(blablub->m_visible_region);
+       ePython python;
        
-       eDebug("painting!");
+       printf("executing main\n");
+       python.execute("mytest", "__main__");
 
-       dsk.invalidate(gRegion(eRect(0, 0, 720, 576)));
-       dsk.paint();
-#endif
-
-#else
-
-       extern void contentTest();
-
-       eDebug("Contenttest");
-       contentTest();
+       return 0;
+}
 
-#endif
+eWidgetDesktop *getDesktop()
+{
+       return wdsk;
+}
 
-       p.resetClip(gRegion(eRect(0, 0, 720, 576)));
-//     p.clear();
-       sleep(1);
-       
-//     blablub->setText("123");
-//     dumpRegion(blablub->m_visible_region);
-//     dumpRegion(dsk.m_dirty_region);
-       dsk.paint();
-       
-       return 0;
+void runMainloop()
+{
+       eApp->exec();
 }