update ok and cancel in the timer editor

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 6bf0bb9759e711a7a910859862de8f8542bcd308..b6c5730490acb8c3a048e355db867c3d65fd01bd 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,3 +1,10 @@
+#undef WITH_SDL
+
+#ifdef WITH_SDL
+#error
+#define SDLDC
+#endif
+
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
@@ -9,6 +16,12 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
+#include <lib/gdi/glcddc.h>
+
+#ifdef WITH_SDL
+#error
+#include <lib/gdi/sdl.h>
+#endif
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -27,6 +40,8 @@
 
 #include <lib/actions/action.h>
 
+#include <lib/gdi/epng.h>
+
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
@@ -41,6 +56,7 @@ 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)
@@ -53,9 +69,11 @@ void dumpRegion(const gRegion &region)
                }
                fprintf(stderr, "\n");
        }
+#endif
+
 }
 
-eWidgetDesktop *wdsk;
+eWidgetDesktop *wdsk, *lcddsk;
 
 // typedef struct _object PyObject;
 
@@ -86,6 +104,8 @@ void keyEvent(const eRCKey &key)
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/db.h>
+#include <lib/dvb/dvbtime.h>
+#include <lib/dvb/epgcache.h>
 
 class eMain: public eApplication, public Object
 {
@@ -93,9 +113,10 @@ class eMain: public eApplication, public Object
        
        ePtr<eDVBResourceManager> m_mgr;
        ePtr<eDVBDB> m_dvbdb;
-
+       ePtr<eDVBLocalTimeHandler> m_locale_time_handler;
        ePtr<eComponentScan> m_scan;
-       
+       ePtr<eEPGCache> m_epgcache;
+
 public:
        eMain()
        {
@@ -104,7 +125,8 @@ public:
                                /* TODO: put into init */
                m_dvbdb = new eDVBDB();
                m_mgr = new eDVBResourceManager();
-               
+               m_locale_time_handler = new eDVBLocalTimeHandler();
+               m_epgcache = new eEPGCache();
                m_mgr->setChannelList(m_dvbdb);
                
 //             m_scan = new eComponentScan();
@@ -114,12 +136,16 @@ public:
        
        ~eMain()
        {
+               m_dvbdb->save();
                m_scan = 0;
        }
 };
 
 /************************************************/
 
+eLabel *lcd_label, *lcd_clock;
+
+int exit_code;
 
 int main(int argc, char **argv)
 {
@@ -127,43 +153,86 @@ int main(int argc, char **argv)
        atexit(object_dump);
 #endif
 
+       // set pythonpath if unset
+       setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
+       printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
+
 
        ePython python;
        eMain main;
+       
+       int double_buffer = 0;
 
 #if 1
+#ifdef SDLDC
+       ePtr<gSDLDC> my_dc;
+       gSDLDC::getInstance(my_dc);
+#else
        ePtr<gFBDC> my_dc;
        gFBDC::getInstance(my_dc);
-
-       gPainter p(my_dc);
-       
-       gRGB pal[256];
-       pal[0] = 0;
-       pal[1] = 0xff00ff;
-       pal[2] = 0xffFFff;
-       pal[3] = 0x00ff00;
        
-       for (int a=0; a<0x10; ++a)
-               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);
+       double_buffer = my_dc->haveDoubleBuffering();
+#endif
+
+       ePtr<gLCDDC> my_lcd_dc;
+       gLCDDC::getInstance(my_lcd_dc);
+
+       fontRenderClass::getInstance()->AddFont(FONTDIR "/md_khmurabi_10.ttf", "Regular", 100);
 
        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;
-       dsk.setBackgroundColor(gColor(0));
+       lcddsk = &dsk_lcd;
+
        dsk.setDC(my_dc);
+       dsk_lcd.setDC(my_lcd_dc);
+
+       ePtr<gPixmap> m_pm;
+       loadPNG(m_pm, DATADIR "/enigma2/pal.png");
+       if (!m_pm)
+       {
+               eFatal("pal.png not found!");
+       } else
+               dsk.setPalette(*m_pm);
+
+       dsk.setBackgroundColor(gRGB(0,0,0,0xFF));
 #endif
 
                /* redrawing is done in an idle-timer, so we have to set the context */
        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));
        
@@ -171,10 +240,9 @@ int main(int argc, char **argv)
 
        python.execute("mytest", "__main__");
 
-
 //     eApp->exec();
 
-       return 0;
+       return exit_code;
 }
 
 eWidgetDesktop *getDesktop()
@@ -184,10 +252,20 @@ eWidgetDesktop *getDesktop()
 
 void runMainloop()
 {
-       eApp->exec();
+       exit_code = eApp->exec();
+}
+
+void quitMainloop(int exitCode)
+{
+       eApp->quit(exitCode);
+}
+
+void setLCD(const char *string)
+{
+       lcd_label->setText(string);
 }
 
-void quitMainloop()
+void setLCDClock(const char *string)
 {
-       eApp->quit(0);
+       lcd_clock->setText(string);
 }