fix colors

[enigma2.git] / main / bsod.cpp

diff --git a/main/bsod.cpp b/main/bsod.cpp
index f08c6f348fcea6a83f022009185c54da8a77c368..bb4c7ad7c27efc0fcc4177b0087deae4784a5ff0 100644 (file)
--- a/main/bsod.cpp
+++ b/main/bsod.cpp
@@ -6,6 +6,9 @@
 #include <lib/base/smartptr.h>
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
+#ifdef WITH_SDL
+#include <lib/gdi/sdl.h>
+#endif
 
 #include "version.h"
 
@@ -86,16 +89,44 @@ void bsodFatal()
                std::string buffer = getLogBuffer();
                fwrite(buffer.c_str(), buffer.size(), 1, f);
                fclose(f);
+               
+               char cmd[256];
+               sprintf(cmd, "find /usr/lib/enigma2/python/ -name \"*.py\" | xargs md5sum >> %s", logfile);
+               system(cmd);
        }
        
+#ifdef WITH_SDL
+       ePtr<gSDLDC> my_dc;
+       gSDLDC::getInstance(my_dc);
+#else
        ePtr<gFBDC> my_dc;
        gFBDC::getInstance(my_dc);
+#endif
        
        {
                gPainter p(my_dc);
                p.resetOffset();
                p.resetClip(eRect(ePoint(0, 0), my_dc->size()));
-               p.setBackgroundColor(gRGB(0x0000C0));
+#ifdef ENIGMA2_CHECKOUT_TAG
+               if (ENIGMA2_CHECKOUT_TAG[0] == 'T') /* tagged checkout (release) */
+                       p.setBackgroundColor(gRGB(0x0000C0));
+               else if (ENIGMA2_CHECKOUT_TAG[0] == 'D') /* dated checkout (daily experimental build) */
+               {
+                       srand(time(0));
+                       int r = rand();
+                       unsigned int col = 0;
+                       if (r & 1)
+                               col |= 0x800000;
+                       if (r & 2)
+                               col |= 0x008000;
+                       if (r & 4)
+                               col |= 0x0000c0;
+                       p.setBackgroundColor(gRGB(col));
+               }
+#else
+                       p.setBackgroundColor(gRGB(0x008000));
+#endif
+
                p.setForegroundColor(gRGB(0xFFFFFF));
        
                ePtr<gFont> font = new gFont("Regular", 20);
@@ -132,7 +163,6 @@ void bsodFatal()
        
                p.renderText(usable_area, 
                        lines.substr(start), gPainter::RT_HALIGN_LEFT);
-               p.flush();
                sleep(10);
        }
 
@@ -164,7 +194,6 @@ void oops(const mcontext_t &context, int dumpcode)
 }
 #else
 #warning "no oops support!"
-#error bla
 #define NO_OOPS_SUPPORT
 #endif
 
@@ -173,7 +202,7 @@ void handleFatalSignal(int signum, siginfo_t *si, void *ctx)
        ucontext_t *uc = (ucontext_t*)ctx;
        eDebug("KILLED BY signal %d", signum);
 #ifndef NO_OOPS_SUPPORT
-       oops(uc->uc_mcontext, signum == SIGSEGV);
+       oops(uc->uc_mcontext, signum == SIGSEGV || signum == SIGABRT);
 #endif
        eDebug("-------");
        bsodFatal();
@@ -192,6 +221,7 @@ void bsodCatchSignals()
        sigaction(SIGSEGV, &act, 0);
        sigaction(SIGILL, &act, 0);
        sigaction(SIGBUS, &act, 0);
+       sigaction(SIGABRT, &act, 0);
 }
 
 void bsodLogInit()