From 4761063866d8e2112579e88d32e8c2a92af08e57 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Mon, 6 Mar 2006 12:52:36 +0000 Subject: [PATCH] add ability to lock/unlock the framebuffer (fix locking of lcd.. i hope) use like this: from enigma import fbClass, fbClassPtr (*) fbClass.getInstance().lock() ... unlock() ... islocked() --- lib/gdi/fb.h | 11 ++++-- lib/gdi/grc.cpp | 68 +++++++++++++++++++++++++++++++++----- lib/gdi/grc.h | 1 + lib/python/enigma_python.i | 2 ++ 4 files changed, 70 insertions(+), 12 deletions(-) diff --git a/lib/gdi/fb.h b/lib/gdi/fb.h index 332819fd..c83e7571 100644 --- a/lib/gdi/fb.h +++ b/lib/gdi/fb.h @@ -16,6 +16,11 @@ class fbClass int locked; int m_number_of_pages; +#ifdef SWIG + fbClass(const char *fb="/dev/fb/0"); + ~fbClass(); +public: +#else public: unsigned char *lfb; int showConsole(int state); @@ -32,10 +37,10 @@ public: fbClass(const char *fb="/dev/fb/0"); ~fbClass(); - static fbClass *getInstance(); - - // low level gfx stuff + // low level gfx stuff int PutCMAP(); +#endif + static fbClass *getInstance(); int lock(); void unlock(); diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp index e00bd540..d1380953 100644 --- a/lib/gdi/grc.cpp +++ b/lib/gdi/grc.cpp @@ -165,62 +165,74 @@ gPainter::~gPainter() void gPainter::setBackgroundColor(const gColor &color) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::setBackgroundColor; o.dc = m_dc.grabRef(); o.parm.setColor = new gOpcode::para::psetColor; o.parm.setColor->color = color; - + m_rc->submit(o); } void gPainter::setForegroundColor(const gColor &color) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::setForegroundColor; o.dc = m_dc.grabRef(); o.parm.setColor = new gOpcode::para::psetColor; o.parm.setColor->color = color; - + m_rc->submit(o); } void gPainter::setBackgroundColor(const gRGB &color) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::setBackgroundColorRGB; o.dc = m_dc.grabRef(); o.parm.setColorRGB = new gOpcode::para::psetColorRGB; o.parm.setColorRGB->color = color; - + m_rc->submit(o); } void gPainter::setForegroundColor(const gRGB &color) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::setForegroundColorRGB; o.dc = m_dc.grabRef(); o.parm.setColorRGB = new gOpcode::para::psetColorRGB; o.parm.setColorRGB->color = color; - + m_rc->submit(o); } void gPainter::setFont(gFont *font) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::setFont; o.dc = m_dc.grabRef(); font->AddRef(); o.parm.setFont = new gOpcode::para::psetFont; o.parm.setFont->font = font; - + m_rc->submit(o); } void gPainter::renderText(const eRect &pos, const std::string &string, int flags) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::renderText; o.dc = m_dc.grabRef(); @@ -233,6 +245,8 @@ void gPainter::renderText(const eRect &pos, const std::string &string, int flags void gPainter::renderPara(eTextPara *para, ePoint offset) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::renderPara; o.dc = m_dc.grabRef(); @@ -246,6 +260,8 @@ void gPainter::renderPara(eTextPara *para, ePoint offset) void gPainter::fill(const eRect &area) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::fill; @@ -257,6 +273,8 @@ void gPainter::fill(const eRect &area) void gPainter::fill(const gRegion ®ion) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::fillRegion; @@ -268,6 +286,8 @@ void gPainter::fill(const gRegion ®ion) void gPainter::clear() { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::clear; o.dc = m_dc.grabRef(); @@ -278,10 +298,12 @@ void gPainter::clear() void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags) { + if ( m_dc->islocked() ) + return; gOpcode o; - + ASSERT(pixmap); - + o.opcode=gOpcode::blit; o.dc = m_dc.grabRef(); pixmap->AddRef(); @@ -296,14 +318,16 @@ void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags) void gPainter::setPalette(gRGB *colors, int start, int len) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::setPalette; o.dc = m_dc.grabRef(); gPalette *p=new gPalette; - + o.parm.setPalette = new gOpcode::para::psetPalette; p->data=new gRGB[len]; - + memcpy(p->data, colors, len*sizeof(gRGB)); p->start=start; p->colors=len; @@ -319,6 +343,8 @@ void gPainter::setPalette(gPixmap *source) void gPainter::mergePalette(gPixmap *target) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::mergePalette; o.dc = m_dc.grabRef(); @@ -330,6 +356,8 @@ void gPainter::mergePalette(gPixmap *target) void gPainter::line(ePoint start, ePoint end) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::line; o.dc = m_dc.grabRef(); @@ -341,6 +369,8 @@ void gPainter::line(ePoint start, ePoint end) void gPainter::setOffset(ePoint val) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::setOffset; o.dc = m_dc.grabRef(); @@ -352,6 +382,8 @@ void gPainter::setOffset(ePoint val) void gPainter::moveOffset(ePoint rel) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::setOffset; o.dc = m_dc.grabRef(); @@ -363,6 +395,8 @@ void gPainter::moveOffset(ePoint rel) void gPainter::resetOffset() { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::setOffset; o.dc = m_dc.grabRef(); @@ -374,6 +408,8 @@ void gPainter::resetOffset() void gPainter::resetClip(const gRegion ®ion) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::setClip; o.dc = m_dc.grabRef(); @@ -384,6 +420,8 @@ void gPainter::resetClip(const gRegion ®ion) void gPainter::clip(const gRegion ®ion) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::addClip; o.dc = m_dc.grabRef(); @@ -394,6 +432,8 @@ void gPainter::clip(const gRegion ®ion) void gPainter::clippop() { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::popClip; o.dc = m_dc.grabRef(); @@ -402,6 +442,8 @@ void gPainter::clippop() void gPainter::flush() { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::flush; o.dc = m_dc.grabRef(); @@ -410,6 +452,8 @@ void gPainter::flush() void gPainter::waitVSync() { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::waitVSync; o.dc = m_dc.grabRef(); @@ -418,6 +462,8 @@ void gPainter::waitVSync() void gPainter::flip() { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::flip; o.dc = m_dc.grabRef(); @@ -426,6 +472,8 @@ void gPainter::flip() void gPainter::notify() { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::notify; o.dc = m_dc.grabRef(); @@ -434,6 +482,8 @@ void gPainter::notify() void gPainter::end() { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode = gOpcode::flush; o.dc = m_dc.grabRef(); diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h index 3231aab3..925b29d7 100644 --- a/lib/gdi/grc.h +++ b/lib/gdi/grc.h @@ -263,6 +263,7 @@ public: int getPixmap(ePtr &pm) { pm = m_pixmap; return 0; } gRGB getRGB(gColor col); virtual eSize size() { return m_pixmap->size(); } + virtual int islocked() { return 0; } }; #endif diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index 4572243a..36aeaa13 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -44,6 +44,7 @@ is usually caused by not marking PSignals as immutable. #include #include #include +#include #include #include #include @@ -152,6 +153,7 @@ typedef long time_t; %include %include +%include %include %include %include -- 2.30.2