git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some FIXMEEE's
[enigma2.git]
/
lib
/
gdi
/
grc.cpp
diff --git
a/lib/gdi/grc.cpp
b/lib/gdi/grc.cpp
index e00bd540d57df2b64671ee3554ffb89078380cfe..67f0059face0513907d943e0dfc525c8b1e9b4e7 100644
(file)
--- a/
lib/gdi/grc.cpp
+++ b/
lib/gdi/grc.cpp
@@
-1,10
+1,4
@@
-// for debugging use:
-// #define SYNC_PAINT
#include <unistd.h>
#include <unistd.h>
-#ifndef SYNC_PAINT
-#include <pthread.h>
-#endif
-
#include <lib/gdi/grc.h>
#include <lib/gdi/font.h>
#include <lib/base/init.h>
#include <lib/gdi/grc.h>
#include <lib/gdi/font.h>
#include <lib/base/init.h>
@@
-63,8
+57,7
@@
void gRC::submit(const gOpcode &o)
#ifndef SYNC_PAINT
pthread_mutex_lock(&mutex);
#endif
#ifndef SYNC_PAINT
pthread_mutex_lock(&mutex);
#endif
- int tmp=wp;
- tmp+=1;
+ int tmp=wp+1;
if ( tmp == MAXSIZE )
tmp=0;
if ( tmp == rp )
if ( tmp == MAXSIZE )
tmp=0;
if ( tmp == rp )
@@
-102,23
+95,31
@@
void *gRC::thread()
#ifndef SYNC_PAINT
while (1)
{
#ifndef SYNC_PAINT
while (1)
{
- singleLock s(mutex);
#else
while (rp != wp)
{
#else
while (rp != wp)
{
+#endif
+#ifndef SYNC_PAINT
+ pthread_mutex_lock(&mutex);
#endif
if ( rp != wp )
{
#endif
if ( rp != wp )
{
- gOpcode& o(queue[rp]);
+ gOpcode o(queue[rp++]);
+ if ( rp == MAXSIZE )
+ rp=0;
+#ifndef SYNC_PAINT
+ pthread_mutex_unlock(&mutex);
+#endif
if (o.opcode==gOpcode::shutdown)
break;
else if (o.opcode==gOpcode::notify)
need_notify = 1;
else
if (o.opcode==gOpcode::shutdown)
break;
else if (o.opcode==gOpcode::notify)
need_notify = 1;
else
+ {
o.dc->exec(&o);
o.dc->exec(&o);
- rp++;
- if ( rp == MAXSIZE )
- rp=0;
+ // o.dc is a gDC* filled with grabref... so we must release it here
+ o.dc->Release();
+ }
}
else
{
}
else
{
@@
-128,7
+129,9
@@
void *gRC::thread()
m_notify_pump.send(1);
}
#ifndef SYNC_PAINT
m_notify_pump.send(1);
}
#ifndef SYNC_PAINT
- pthread_cond_wait(&cond, &mutex);
+ while(rp == wp)
+ pthread_cond_wait(&cond, &mutex);
+ pthread_mutex_unlock(&mutex);
#endif
}
}
#endif
}
}
@@
-165,74
+168,88
@@
gPainter::~gPainter()
void gPainter::setBackgroundColor(const gColor &color)
{
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;
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)
{
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;
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)
{
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;
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)
{
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;
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)
{
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;
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)
{
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();
o.parm.renderText = new gOpcode::para::prenderText;
o.parm.renderText->area = pos;
gOpcode o;
o.opcode=gOpcode::renderText;
o.dc = m_dc.grabRef();
o.parm.renderText = new gOpcode::para::prenderText;
o.parm.renderText->area = pos;
- o.parm.renderText->text = string;
+ o.parm.renderText->text = string
.empty()?0:strdup(string.c_str())
;
o.parm.renderText->flags = flags;
m_rc->submit(o);
}
void gPainter::renderPara(eTextPara *para, ePoint offset)
{
o.parm.renderText->flags = flags;
m_rc->submit(o);
}
void gPainter::renderPara(eTextPara *para, ePoint offset)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::renderPara;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode=gOpcode::renderPara;
o.dc = m_dc.grabRef();
@@
-246,6
+263,8
@@
void gPainter::renderPara(eTextPara *para, ePoint offset)
void gPainter::fill(const eRect &area)
{
void gPainter::fill(const eRect &area)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::fill;
gOpcode o;
o.opcode=gOpcode::fill;
@@
-257,6
+276,8
@@
void gPainter::fill(const eRect &area)
void gPainter::fill(const gRegion ®ion)
{
void gPainter::fill(const gRegion ®ion)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::fillRegion;
gOpcode o;
o.opcode=gOpcode::fillRegion;
@@
-268,6
+289,8
@@
void gPainter::fill(const gRegion ®ion)
void gPainter::clear()
{
void gPainter::clear()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::clear;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode=gOpcode::clear;
o.dc = m_dc.grabRef();
@@
-278,10
+301,12
@@
void gPainter::clear()
void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
{
void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
gOpcode o;
-
+
ASSERT(pixmap);
ASSERT(pixmap);
-
+
o.opcode=gOpcode::blit;
o.dc = m_dc.grabRef();
pixmap->AddRef();
o.opcode=gOpcode::blit;
o.dc = m_dc.grabRef();
pixmap->AddRef();
@@
-296,14
+321,16
@@
void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
void gPainter::setPalette(gRGB *colors, int start, int len)
{
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;
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];
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;
memcpy(p->data, colors, len*sizeof(gRGB));
p->start=start;
p->colors=len;
@@
-319,6
+346,8
@@
void gPainter::setPalette(gPixmap *source)
void gPainter::mergePalette(gPixmap *target)
{
void gPainter::mergePalette(gPixmap *target)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::mergePalette;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode = gOpcode::mergePalette;
o.dc = m_dc.grabRef();
@@
-330,6
+359,8
@@
void gPainter::mergePalette(gPixmap *target)
void gPainter::line(ePoint start, ePoint end)
{
void gPainter::line(ePoint start, ePoint end)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::line;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode=gOpcode::line;
o.dc = m_dc.grabRef();
@@
-341,6
+372,8
@@
void gPainter::line(ePoint start, ePoint end)
void gPainter::setOffset(ePoint val)
{
void gPainter::setOffset(ePoint val)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::setOffset;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode=gOpcode::setOffset;
o.dc = m_dc.grabRef();
@@
-352,6
+385,8
@@
void gPainter::setOffset(ePoint val)
void gPainter::moveOffset(ePoint rel)
{
void gPainter::moveOffset(ePoint rel)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::setOffset;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode=gOpcode::setOffset;
o.dc = m_dc.grabRef();
@@
-363,6
+398,8
@@
void gPainter::moveOffset(ePoint rel)
void gPainter::resetOffset()
{
void gPainter::resetOffset()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::setOffset;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode=gOpcode::setOffset;
o.dc = m_dc.grabRef();
@@
-374,6
+411,8
@@
void gPainter::resetOffset()
void gPainter::resetClip(const gRegion ®ion)
{
void gPainter::resetClip(const gRegion ®ion)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::setClip;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode = gOpcode::setClip;
o.dc = m_dc.grabRef();
@@
-384,6
+423,8
@@
void gPainter::resetClip(const gRegion ®ion)
void gPainter::clip(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();
gOpcode o;
o.opcode = gOpcode::addClip;
o.dc = m_dc.grabRef();
@@
-394,6
+435,8
@@
void gPainter::clip(const gRegion ®ion)
void gPainter::clippop()
{
void gPainter::clippop()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::popClip;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode = gOpcode::popClip;
o.dc = m_dc.grabRef();
@@
-402,6
+445,8
@@
void gPainter::clippop()
void gPainter::flush()
{
void gPainter::flush()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::flush;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode = gOpcode::flush;
o.dc = m_dc.grabRef();
@@
-410,6
+455,8
@@
void gPainter::flush()
void gPainter::waitVSync()
{
void gPainter::waitVSync()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::waitVSync;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode = gOpcode::waitVSync;
o.dc = m_dc.grabRef();
@@
-418,6
+465,8
@@
void gPainter::waitVSync()
void gPainter::flip()
{
void gPainter::flip()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::flip;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode = gOpcode::flip;
o.dc = m_dc.grabRef();
@@
-426,6
+475,8
@@
void gPainter::flip()
void gPainter::notify()
{
void gPainter::notify()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::notify;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode = gOpcode::notify;
o.dc = m_dc.grabRef();
@@
-434,6
+485,8
@@
void gPainter::notify()
void gPainter::end()
{
void gPainter::end()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::flush;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode = gOpcode::flush;
o.dc = m_dc.grabRef();
@@
-458,18
+511,24
@@
void gDC::exec(gOpcode *o)
{
case gOpcode::setBackgroundColor:
m_background_color = o->parm.setColor->color;
{
case gOpcode::setBackgroundColor:
m_background_color = o->parm.setColor->color;
+ m_background_color_rgb = getRGB(m_background_color);
delete o->parm.setColor;
break;
case gOpcode::setForegroundColor:
m_foreground_color = o->parm.setColor->color;
delete o->parm.setColor;
break;
case gOpcode::setForegroundColor:
m_foreground_color = o->parm.setColor->color;
+ m_background_color_rgb = getRGB(m_foreground_color);
delete o->parm.setColor;
break;
case gOpcode::setBackgroundColorRGB:
delete o->parm.setColor;
break;
case gOpcode::setBackgroundColorRGB:
- m_background_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+ if (m_pixmap->needClut())
+ m_background_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+ m_background_color_rgb = o->parm.setColorRGB->color;
delete o->parm.setColorRGB;
break;
case gOpcode::setForegroundColorRGB:
delete o->parm.setColorRGB;
break;
case gOpcode::setForegroundColorRGB:
- m_foreground_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+ if (m_pixmap->needClut())
+ m_foreground_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+ m_foreground_color_rgb = o->parm.setColorRGB->color;
delete o->parm.setColorRGB;
break;
case gOpcode::setFont:
delete o->parm.setColorRGB;
break;
case gOpcode::setFont:
@@
-484,7
+543,8
@@
void gDC::exec(gOpcode *o)
assert(m_current_font);
para->setFont(m_current_font);
para->renderString(o->parm.renderText->text, (flags & gPainter::RT_WRAP) ? RS_WRAP : 0);
assert(m_current_font);
para->setFont(m_current_font);
para->renderString(o->parm.renderText->text, (flags & gPainter::RT_WRAP) ? RS_WRAP : 0);
-
+ if (o->parm.renderText->text)
+ free(o->parm.renderText->text);
if (flags & gPainter::RT_HALIGN_RIGHT)
para->realign(eTextPara::dirRight);
else if (flags & gPainter::RT_HALIGN_CENTER)
if (flags & gPainter::RT_HALIGN_RIGHT)
para->realign(eTextPara::dirRight);
else if (flags & gPainter::RT_HALIGN_CENTER)
@@
-501,13
+561,14
@@
void gDC::exec(gOpcode *o)
int correction = vcentered_top - bbox.top();
offset += ePoint(0, correction);
}
int correction = vcentered_top - bbox.top();
offset += ePoint(0, correction);
}
- para->blit(*this, offset, getRGB(m_background_color), getRGB(m_foreground_color));
+
+ para->blit(*this, offset, m_background_color_rgb, m_foreground_color_rgb);
delete o->parm.renderText;
break;
}
case gOpcode::renderPara:
{
delete o->parm.renderText;
break;
}
case gOpcode::renderPara:
{
- o->parm.renderPara->textpara->blit(*this, o->parm.renderPara->offset + m_current_offset,
getRGB(m_background_color), getRGB(m_foreground_color)
);
+ o->parm.renderPara->textpara->blit(*this, o->parm.renderPara->offset + m_current_offset,
m_background_color_rgb, m_foreground_color_rgb
);
o->parm.renderPara->textpara->Release();
delete o->parm.renderPara;
break;
o->parm.renderPara->textpara->Release();
delete o->parm.renderPara;
break;
@@
-517,7
+578,10
@@
void gDC::exec(gOpcode *o)
eRect area = o->parm.fill->area;
area.moveBy(m_current_offset);
gRegion clip = m_current_clip & area;
eRect area = o->parm.fill->area;
area.moveBy(m_current_offset);
gRegion clip = m_current_clip & area;
- m_pixmap->fill(clip, m_foreground_color);
+ if (m_pixmap->needClut())
+ m_pixmap->fill(clip, m_foreground_color);
+ else
+ m_pixmap->fill(clip, m_foreground_color_rgb);
delete o->parm.fill;
break;
}
delete o->parm.fill;
break;
}
@@
-525,12
+589,18
@@
void gDC::exec(gOpcode *o)
{
o->parm.fillRegion->region.moveBy(m_current_offset);
gRegion clip = m_current_clip & o->parm.fillRegion->region;
{
o->parm.fillRegion->region.moveBy(m_current_offset);
gRegion clip = m_current_clip & o->parm.fillRegion->region;
- m_pixmap->fill(clip, m_foreground_color);
+ if (m_pixmap->needClut())
+ m_pixmap->fill(clip, m_foreground_color);
+ else
+ m_pixmap->fill(clip, m_foreground_color_rgb);
delete o->parm.fillRegion;
break;
}
case gOpcode::clear:
delete o->parm.fillRegion;
break;
}
case gOpcode::clear:
- m_pixmap->fill(m_current_clip, m_background_color);
+ if (m_pixmap->needClut())
+ m_pixmap->fill(m_current_clip, m_background_color);
+ else
+ m_pixmap->fill(m_current_clip, m_background_color_rgb);
delete o->parm.fill;
break;
case gOpcode::blit:
delete o->parm.fill;
break;
case gOpcode::blit: