X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5174356b931680de69dc9560fc788feb5c0f64fa..675f9d0eeb82577252a68ee263049acc1ff80bcc:/main/enigma.cpp diff --git a/main/enigma.cpp b/main/enigma.cpp index a370d55c..b8554d58 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -1,13 +1,13 @@ -#ifdef WITH_SDL -#define SDLDC -#endif - -#include #include +#include +#include +#include +#include #include #include #include +#include #include #include #include @@ -19,7 +19,7 @@ #include #endif #include -#include +#include #include #include #include @@ -29,6 +29,8 @@ #include #include +#include "bsod.h" + #ifdef HAVE_GSTREAMER #include #endif @@ -42,51 +44,46 @@ void object_dump() } #endif -void dumpRegion(const gRegion ®ion) -{ - 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 keyPressed; +static int prev_ascii_code; -PSignal1 &keyPressedSignal() +int getPrevAsciiCode() { - return keyPressed; + int ret = prev_ascii_code; + prev_ascii_code = 0; + return ret; } void keyEvent(const eRCKey &key) { + static eRCKey last(0, 0, 0); + static int num_repeat; + ePtr ptr; eActionMap::getInstance(ptr); - ptr->keyPressed(0, key.code, key.flags); -// if (!key.flags) -// keyPressed(key.code); + + if ((key.code == last.code) && (key.producer == last.producer) && key.flags & eRCKey::flagRepeat) + num_repeat++; + else + { + num_repeat = 0; + last = key; + } + + if (num_repeat == 4) + { + ptr->keyPressed(key.producer->getIdentifier(), key.code, eRCKey::flagLong); + num_repeat++; + } + + if (key.flags & eRCKey::flagAscii) + { + prev_ascii_code = key.code; + ptr->keyPressed(key.producer->getIdentifier(), 510 /* faked KEY_ASCII */, 0); + } + else + ptr->keyPressed(key.producer->getIdentifier(), key.code, key.flags); } /************************************************/ @@ -101,19 +98,17 @@ void keyEvent(const eRCKey &key) class eMain: public eApplication, public Object { eInit init; - - ePtr m_mgr; + ePtr m_dvbdb; + ePtr m_mgr; ePtr m_locale_time_handler; - ePtr m_scan; ePtr m_epgcache; public: eMain() { init.setRunlevel(eAutoInitNumbers::main); - - /* TODO: put into init */ + /* TODO: put into init */ m_dvbdb = new eDVBDB(); m_mgr = new eDVBResourceManager(); m_locale_time_handler = new eDVBLocalTimeHandler(); @@ -124,16 +119,18 @@ public: ~eMain() { m_dvbdb->saveServicelist(); - m_scan = 0; + m_mgr->releaseCachedChannel(); } }; -/************************************************/ - int exit_code; int main(int argc, char **argv) { +#ifdef MEMLEAK_CHECK + atexit(DumpUnfreed); +#endif + #ifdef OBJECT_DEBUG atexit(object_dump); #endif @@ -145,13 +142,14 @@ int main(int argc, char **argv) // set pythonpath if unset setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0); printf("PYTHONPATH: %s\n", getenv("PYTHONPATH")); - + + bsodLogInit(); ePython python; eMain main; - + #if 1 -#ifdef SDLDC +#ifdef WITH_SDL ePtr my_dc; gSDLDC::getInstance(my_dc); #else @@ -164,21 +162,21 @@ int main(int argc, char **argv) ePtr my_lcd_dc; gLCDDC::getInstance(my_lcd_dc); - fontRenderClass::getInstance()->AddFont(FONTDIR "/md_khmurabi_10.ttf", "Regular", 100); - fontRenderClass::getInstance()->AddFont(FONTDIR "/ae_AlMateen.ttf", "Replacement", 90); - eTextPara::setReplacementFont("Replacement"); - + + /* 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_lcd(eSize(132, 64)); - + eWidgetDesktop dsk_lcd(my_lcd_dc->size()); + + dsk.setStyleID(0); + dsk_lcd.setStyleID(my_lcd_dc->size().width() == 96 ? 2 : 1); + /* if (double_buffer) { eDebug(" - double buffering found, enable buffered graphics mode."); @@ -192,7 +190,7 @@ int main(int argc, char **argv) dsk_lcd.setDC(my_lcd_dc); ePtr m_pm; - loadPNG(m_pm, DATADIR "/enigma2/pal.png"); + loadPNG(m_pm, DATADIR "/enigma2/skin_default/pal.png"); if (!m_pm) { eFatal("pal.png not found!"); @@ -205,12 +203,56 @@ int main(int argc, char **argv) /* redrawing is done in an idle-timer, so we have to set the context */ dsk.setRedrawTask(main); dsk_lcd.setRedrawTask(main); + + + eDebug("Loading spinners..."); + + { + int i; +#define MAX_SPINNER 64 + ePtr wait[MAX_SPINNER]; + for (i=0; isetSpinner(eRect(ePoint(100, 100), wait[0]->size()), wait, i); + else + my_dc->setSpinner(eRect(100, 100, 0, 0), wait, 1); + } + + gRC::getInstance()->setSpinnerDC(my_dc); eRCInput::getInstance()->keyEvent.connect(slot(keyEvent)); printf("executing main\n"); + + bsodCatchSignals(); + + setIoPrio(IOPRIO_CLASS_BE, 3); + +// python.execute("mytest", "__main__"); + python.execFile("/usr/lib/enigma2/python/mytest.py"); - python.execute("mytest", "__main__"); + extern void setFullsize(); // definend in lib/gui/evideo.cpp + setFullsize(); + + if (exit_code == 5) /* python crash */ + { + eDebug("(exit code 5)"); + bsodFatal(0); + } dsk.paint(); dsk_lcd.paint(); @@ -219,7 +261,6 @@ int main(int argc, char **argv) gPainter p(my_lcd_dc); p.resetClip(eRect(0, 0, 132, 64)); p.clear(); - p.flush(); } return exit_code; @@ -242,14 +283,51 @@ void runMainloop() void quitMainloop(int exitCode) { + FILE *f = fopen("/proc/stb/fp/was_timer_wakeup", "w"); + if (f) + { + fprintf(f, "%d", 0); + fclose(f); + } + else + { + int fd = open("/dev/dbox/fp0", O_WRONLY); + if (fd >= 0) + { + if (ioctl(fd, 10 /*FP_CLEAR_WAKEUP_TIMER*/) < 0) + eDebug("FP_CLEAR_WAKEUP_TIMER failed (%m)"); + close(fd); + } + else + eDebug("open /dev/dbox/fp0 for wakeup timer clear failed!(%m)"); + } exit_code = exitCode; eApp->quit(0); } -void setLCD(const char *string) +#include "version.h" + +const char *getEnigmaVersionString() { + std::string date = +#ifdef ENIGMA2_LAST_CHANGE_DATE + ENIGMA2_LAST_CHANGE_DATE; +#else + __DATE__; +#endif + std::string branch = +#ifdef ENIGMA2_BRANCH + ENIGMA2_BRANCH; +#else + "HEAD"; +#endif + return std::string(date + '-' + branch).c_str(); } -void setLCDClock(const char *string) +#include + +void dump_malloc_stats(void) { + struct mallinfo mi = mallinfo(); + eDebug("MALLOC: %d total", mi.uordblks); }