- sdl is now default output

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index b055619e240b3d505c9abc407680db9c163e8aa4..222bdebc3526ad9e9c769057fc77e316dcd838df 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,3 +1,4 @@
+#define SDLDC
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
@@ -9,6 +10,7 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
+#include <lib/gdi/sdl.h>
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -25,6 +27,8 @@
 
 #include <lib/driver/rc.h>
 
+#include <lib/actions/action.h>
+
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
@@ -71,8 +75,11 @@ PSignal1<void,int> &keyPressedSignal()
 
 void keyEvent(const eRCKey &key)
 {
-       if (!key.flags)
-               keyPressed(key.code);
+       ePtr<eActionMap> ptr;
+       eActionMap::getInstance(ptr);
+       ptr->keyPressed(0, key.code, key.flags);
+//     if (!key.flags)
+//             keyPressed(key.code);
 }
 
 /************************************************/
@@ -127,8 +134,13 @@ int main(int argc, char **argv)
        eMain main;
 
 #if 1
+#ifdef SDLDC
+       ePtr<gSDLDC> my_dc;
+       gSDLDC::getInstance(my_dc);
+#else
        ePtr<gFBDC> my_dc;
        gFBDC::getInstance(my_dc);
+#endif
 
        gPainter p(my_dc);
        
@@ -146,9 +158,13 @@ int main(int argc, char **argv)
                pal[a | 0x30] = (0x110011 * a) | 0xFF00;
        for (int a=0; a<0x10; ++a)
                pal[a | 0x40] = (0x001111 * a) | 0xFF0000;
+       
+       pal[0x50] = 0x586D88;
+       pal[0x51] = 0x4075a7;
+       
        p.setPalette(pal, 0, 256);
 
-       fontRenderClass::getInstance()->AddFont("/dbox2/cdkroot/share/fonts/arial.ttf", "Arial", 100);
+       fontRenderClass::getInstance()->AddFont("/home/tmbinc/enigma2/fonts/arial.ttf", "Arial", 100);
 
        eWidgetDesktop dsk(eSize(720, 576));
        
@@ -163,8 +179,10 @@ int main(int argc, char **argv)
        eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        
        printf("executing main\n");
+
        python.execute("mytest", "__main__");
 
+
 //     eApp->exec();
 
        return 0;