remove xmltree

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 81391c323bc6ba21af5a91ff66d375434d87d44c..92982e5b19ef9ed0771d4f003c30867ca63dd8dc 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -14,10 +14,12 @@
 #include <lib/gui/ewidget.h>
 #include <lib/gui/ewidgetdesktop.h>
 #include <lib/gui/elabel.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/gui/ewindow.h>
 
 #include <lib/python/python.h>

+#include <lib/python/connections.h>

 
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
 #ifdef OBJECT_DEBUG
 int object_total_remaining;


@@ -47,20 +49,38 @@ 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);
+}
+
+int main(int argc, char **argv)

 {
 #ifdef OBJECT_DEBUG
        atexit(object_dump);
 #endif
 {
 #ifdef OBJECT_DEBUG
        atexit(object_dump);
 #endif

-       eInit init;
-       
-       init.setRunlevel(eAutoInitNumbers::main);

 
 

-               // gui stuff
-#if 0
+
+#if 1
+       eMain main;
+

        ePtr<gFBDC> my_dc;
        gFBDC::getInstance(my_dc);
        ePtr<gFBDC> my_dc;
        gFBDC::getInstance(my_dc);

-#if 1

 
        gPainter p(my_dc);
        
 
        gPainter p(my_dc);
        


@@ -71,110 +91,41 @@ int main()
        pal[3] = 0x00ff00;
        
        for (int a=0; a<0x10; ++a)
        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);
 
        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));
        eWidgetDesktop dsk(eSize(720, 576));

-       dsk.setDC(my_dc);
-
-       eWindow *bla = new eWindow(&dsk);
-       
-       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);
-       
-       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);

        
        

-       eDebug("painting!");
-
-       dsk.invalidate(gRegion(eRect(0, 0, 720, 576)));
-       dsk.paint();
-#endif
-
-#else
-
-       extern void contentTest();
-
-       eDebug("Contenttest");
-       contentTest();
-
+       wdsk = &dsk;
+       dsk.setBackgroundColor(gColor(0));
+       dsk.setDC(my_dc);

 #endif
 
 #endif
 

-       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();
+               /* redrawing is done in an idle-timer, so we have to set the context */
+       dsk.setRedrawTask(main);

        
        

-
-#endif
-

        ePython python;
        
        ePython python;
        

-       printf("about to execute TEST :)\n");
-       python.execute("mytest", "test");
+       printf("executing main\n");
+       python.execute("mytest", "__main__");

 
        return 0;
 }
 
        return 0;
 }

+
+eWidgetDesktop *getDesktop()
+{
+       return wdsk;
+}
+
+void runMainloop()
+{
+       eApp->exec();
+}