// for debugging use:
-// #define SYNC_PAINT
+ #define SYNC_PAINT
#include <unistd.h>
#ifndef SYNC_PAINT
#include <pthread.h>
gRC *gRC::instance=0;
-gRC::gRC(): queuelock(MAXSIZE), queue(2048)
+gRC::gRC(): queue(2048), queuelock(MAXSIZE)
{
ASSERT(!instance);
instance=this;
queuelock.lock(MAXSIZE);
#ifndef SYNC_PAINT
- eDebug(pthread_create(&the_thread, 0, thread_wrapper, this)?"RC thread couldn't be created":"RC thread createted successfully");
+ int res = pthread_create(&the_thread, 0, thread_wrapper, this);
+ if (res)
+ eFatal("RC thread couldn't be created");
+ else
+ eDebug("RC thread createted successfully");
#endif
}
+DEFINE_REF(gRC);
+
gRC::~gRC()
{
+ instance=0;
+
gOpcode o;
- o.dc=0;
o.opcode=gOpcode::shutdown;
submit(o);
- instance=0;
+#ifndef SYNC_PAINT
+ eDebug("waiting for gRC thread shutdown");
+ pthread_join(the_thread, 0);
+ eDebug("gRC thread has finished");
+#endif
}
void *gRC::thread()
if (o.opcode==gOpcode::shutdown)
break;
o.dc->exec(&o);
+ o.dc->Release();
queue.dequeue();
}
#ifndef SYNC_PAINT
return 0;
}
-gRC &gRC::getInstance()
+gRC *gRC::getInstance()
{
- return *instance;
+ return instance;
}
static int gPainter_instances;
-gPainter::gPainter(gDC &dc, eRect rect): dc(dc), rc(gRC::getInstance()), foregroundColor(0), backgroundColor(0)
+gPainter::gPainter(gDC *dc, eRect rect): m_dc(dc), m_rc(gRC::getInstance())
{
- if (rect.isNull())
- rect=eRect(ePoint(0, 0), dc.getSize());
// ASSERT(!gPainter_instances);
gPainter_instances++;
- begin(rect);
+// begin(rect);
}
gPainter::~gPainter()
gPainter_instances--;
}
-void gPainter::begin(const eRect &rect)
-{
- gOpcode o;
- dc.lock();
- o.dc=&dc;
- o.opcode=gOpcode::begin;
- o.parm.begin=new gOpcode::para::pbegin(rect);
-// cliparea=std::stack<eRect, std::list<eRect> >();
- cliparea=std::stack<eRect>();
- cliparea.push(rect);
- setLogicalZero(cliparea.top().topLeft());
- rc.submit(o);
-}
-
void gPainter::setBackgroundColor(const gColor &color)
{
- backgroundColor=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)
{
- foregroundColor=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::setFont(const gFont &mfont)
+void gPainter::setFont(gFont *font)
{
- font=mfont;
+ 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)
{
- eRect area=pos;
- area.moveBy(logicalZero.x(), logicalZero.y());
-
gOpcode o;
- o.dc=&dc;
o.opcode=gOpcode::renderText;
- o.parm.renderText=new gOpcode::para::prenderText(font, area, string, dc.getRGB(foregroundColor), dc.getRGB(backgroundColor));
- o.flags=flags;
- rc.submit(o);
+ 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->flags = flags;
+ m_rc->submit(o);
}
-void gPainter::renderPara(eTextPara ¶, ePoint offset)
+void gPainter::renderPara(eTextPara *para, ePoint offset)
{
gOpcode o;
- o.dc=&dc;
o.opcode=gOpcode::renderPara;
- o.parm.renderPara=new gOpcode::para::prenderPara(logicalZero+offset, para.grab(), dc.getRGB(foregroundColor), dc.getRGB(backgroundColor));
- rc.submit(o);
+ o.dc = m_dc.grabRef();
+ o.parm.renderPara = new gOpcode::para::prenderPara;
+ o.parm.renderPara->offset = offset;
+
+ para->AddRef();
+ o.parm.renderPara->textpara = para;
+ m_rc->submit(o);
}
void gPainter::fill(const eRect &area)
{
gOpcode o;
- o.dc=&dc;
o.opcode=gOpcode::fill;
- eRect a=area;
- a.moveBy(logicalZero.x(), logicalZero.y());
- a&=cliparea.top();
-
- o.parm.fill=new gOpcode::para::pfill(a, foregroundColor);
- rc.submit(o);
+
+ o.dc = m_dc.grabRef();
+ o.parm.fill = new gOpcode::para::pfillRect;
+ o.parm.fill->area = area;
+ m_rc->submit(o);
}
void gPainter::clear()
{
gOpcode o;
- o.dc=&dc;
- o.opcode=gOpcode::fill;
- o.parm.fill=new gOpcode::para::pfill(cliparea.top(), backgroundColor);
- rc.submit(o);
+ o.opcode=gOpcode::clear;
+ o.dc = m_dc.grabRef();
+ o.parm.fill = new gOpcode::para::pfillRect;
+ o.parm.fill->area = eRect();
+ m_rc->submit(o);
}
+void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
+{
+ gOpcode o;
+
+ o.opcode=gOpcode::blit;
+ o.dc = m_dc.grabRef();
+ pixmap->AddRef();
+ o.parm.blit = new gOpcode::para::pblit;
+ o.parm.blit->pixmap = pixmap;
+ o.parm.blit->position = pos;
+ o.parm.blit->clip = clip;
+ o.flags=flags;
+ m_rc->submit(o);
+}
+
+
void gPainter::setPalette(gRGB *colors, int start, int len)
{
gOpcode o;
- o.dc=&dc;
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;
- o.parm.setPalette=new gOpcode::para::psetPalette(p);
- rc.submit(o);
+ o.parm.setPalette->palette = p;
+ m_rc->submit(o);
}
void gPainter::mergePalette(gPixmap *target)
{
gOpcode o;
- o.dc=&dc;
o.opcode=gOpcode::mergePalette;
- o.parm.mergePalette=new gOpcode::para::pmergePalette(target);
- rc.submit(o);
+ o.dc = m_dc.grabRef();
+ target->AddRef();
+ o.parm.mergePalette->target = target;
+ m_rc->submit(o);
}
void gPainter::line(ePoint start, ePoint end)
{
gOpcode o;
- o.dc=&dc;
o.opcode=gOpcode::line;
- o.parm.line=new gOpcode::para::pline(start+logicalZero, end+logicalZero, foregroundColor);
- rc.submit(o);
+ o.dc = m_dc.grabRef();
+ o.parm.line = new gOpcode::para::pline;
+ o.parm.line->start = start;
+ o.parm.line->end = end;
+ m_rc->submit(o);
}
-void gPainter::setLogicalZero(ePoint rel)
+void gPainter::setOffset(ePoint val)
{
- logicalZero=rel;
+ gOpcode o;
+ o.opcode=gOpcode::setOffset;
+ o.dc = m_dc.grabRef();
+ o.parm.setOffset = new gOpcode::para::psetOffset;
+ o.parm.setOffset->rel = 0;
+ o.parm.setOffset->value = val;
+ m_rc->submit(o);
}
-void gPainter::moveLogicalZero(ePoint rel)
+void gPainter::moveOffset(ePoint rel)
{
- logicalZero+=rel;
+ gOpcode o;
+ o.opcode=gOpcode::setOffset;
+ o.dc = m_dc.grabRef();
+ o.parm.setOffset = new gOpcode::para::psetOffset;
+ o.parm.setOffset->rel = 1;
+ o.parm.setOffset->value = rel;
+ m_rc->submit(o);
}
-void gPainter::resetLogicalZero()
+void gPainter::resetOffset()
{
- logicalZero.setX(0);
- logicalZero.setY(0);
+ gOpcode o;
+ o.opcode=gOpcode::setOffset;
+ o.dc = m_dc.grabRef();
+ o.parm.setOffset = new gOpcode::para::psetOffset;
+ o.parm.setOffset->rel = 0;
+ o.parm.setOffset->value = ePoint(0, 0);
+ m_rc->submit(o);
}
-void gPainter::clip(eRect clip)
+void gPainter::resetClip(const gRegion ®ion)
{
gOpcode o;
- o.dc=&dc;
- o.opcode=gOpcode::clip;
- clip.moveBy(logicalZero.x(), logicalZero.y());
- cliparea.push(cliparea.top()&clip);
- o.parm.clip=new gOpcode::para::pclip(cliparea.top());
-
- rc.submit(o);
+ o.opcode = gOpcode::setClip;
+ o.dc = m_dc.grabRef();
+ o.parm.clip = new gOpcode::para::psetClip;
+ o.parm.clip->region = region;
+ m_rc->submit(o);
}
-void gPainter::clippop()
+void gPainter::clip(const gRegion ®ion)
{
- ASSERT (cliparea.size()>1);
gOpcode o;
- o.dc=&dc;
- o.opcode=gOpcode::clip;
- cliparea.pop();
- o.parm.clip=new gOpcode::para::pclip(cliparea.top());
- rc.submit(o);
+ o.opcode = gOpcode::addClip;
+ o.dc = m_dc.grabRef();
+ o.parm.clip = new gOpcode::para::psetClip;
+ o.parm.clip->region = region;
+ m_rc->submit(o);
}
-void gPainter::flush()
+void gPainter::clippop()
{
gOpcode o;
- o.dc=&dc;
- o.opcode=gOpcode::flush;
- rc.submit(o);
+ o.opcode = gOpcode::popClip;
+ o.dc = m_dc.grabRef();
+ m_rc->submit(o);
}
-void gPainter::end()
+void gPainter::flush()
{
- gOpcode o;
- o.dc=&dc;
- o.opcode=gOpcode::end;
- rc.submit(o);
}
-gDC::~gDC()
+void gPainter::end()
{
}
-gPixmapDC::gPixmapDC(): pixmap(0)
+gDC::gDC()
{
}
-gPixmapDC::gPixmapDC(gPixmap *pixmap): pixmap(pixmap)
+gDC::gDC(gPixmap *pixmap): m_pixmap(pixmap)
{
}
-gPixmapDC::~gPixmapDC()
+gDC::~gDC()
{
- dclock.lock();
}
-void gPixmapDC::exec(gOpcode *o)
+void gDC::exec(gOpcode *o)
{
- switch(o->opcode)
+ switch (o->opcode)
{
- case gOpcode::begin:
- clip=o->parm.begin->area;
- delete o->parm.begin;
+ case gOpcode::setBackgroundColor:
+ m_background_color = o->parm.setColor->color;
+ delete o->parm.setColor;
+ break;
+ case gOpcode::setForegroundColor:
+ m_foreground_color = o->parm.setColor->color;
+ delete o->parm.setColor;
+ break;
+ case gOpcode::setFont:
+ m_current_font = o->parm.setFont->font;
+ o->parm.setFont->font->Release();
+ delete o->parm.setFont;
break;
case gOpcode::renderText:
{
- eTextPara *para=new eTextPara(o->parm.renderText->area);
- para->setFont(o->parm.renderText->font);
- para->renderString(o->parm.renderText->text, o->flags);
- para->blit(*this, ePoint(0, 0), o->parm.renderText->backgroundColor, o->parm.renderText->foregroundColor);
- para->destroy();
+ ePtr<eTextPara> para = new eTextPara(o->parm.renderText->area);
+ assert(m_current_font);
+ para->setFont(m_current_font);
+ para->renderString(o->parm.renderText->text, o->parm.renderText->flags);
+ para->blit(*this, m_current_offset, getRGB(m_foreground_color), getRGB(m_background_color));
delete o->parm.renderText;
break;
}
case gOpcode::renderPara:
{
- o->parm.renderPara->textpara->blit(*this, o->parm.renderPara->offset, o->parm.renderPara->backgroundColor, o->parm.renderPara->foregroundColor);
- o->parm.renderPara->textpara->destroy();
+ o->parm.renderPara->textpara->blit(*this, o->parm.renderPara->offset + m_current_offset, getRGB(m_foreground_color), getRGB(m_background_color));
+ o->parm.renderPara->textpara->Release();
delete o->parm.renderPara;
break;
}
case gOpcode::fill:
- pixmap->fill(o->parm.fill->area, o->parm.fill->color);
+ {
+ eRect area = o->parm.fill->area;
+ area.moveBy(m_current_offset);
+ gRegion clip = m_current_clip & area;
+ m_pixmap->fill(clip, m_foreground_color);
+ delete o->parm.fill;
+ break;
+ }
+ case gOpcode::clear:
+ m_pixmap->fill(m_current_clip, m_background_color);
delete o->parm.fill;
break;
case gOpcode::blit:
{
- if (o->parm.blit->clip.isNull())
- o->parm.blit->clip=clip;
- else
- o->parm.blit->clip&=clip;
- pixmap->blit(*o->parm.blit->pixmap, o->parm.blit->position, o->parm.blit->clip, o->flags);
+ gRegion clip;
+ if (!o->parm.blit->clip.valid())
+ {
+ clip.intersect(gRegion(o->parm.blit->clip), clip);
+ } else
+ clip = m_current_clip;
+ m_pixmap->blit(*o->parm.blit->pixmap, o->parm.blit->position, clip, o->parm.blit->flags);
+ o->parm.blit->pixmap->Release();
delete o->parm.blit;
break;
}
case gOpcode::setPalette:
- if (o->parm.setPalette->palette->start>pixmap->clut.colors)
- o->parm.setPalette->palette->start=pixmap->clut.colors;
- if (o->parm.setPalette->palette->colors>(pixmap->clut.colors-o->parm.setPalette->palette->start))
- o->parm.setPalette->palette->colors=pixmap->clut.colors-o->parm.setPalette->palette->start;
+ if (o->parm.setPalette->palette->start > m_pixmap->surface->clut.colors)
+ o->parm.setPalette->palette->start = m_pixmap->surface->clut.colors;
+ if (o->parm.setPalette->palette->colors > (m_pixmap->surface->clut.colors-o->parm.setPalette->palette->start))
+ o->parm.setPalette->palette->colors = m_pixmap->surface->clut.colors-o->parm.setPalette->palette->start;
if (o->parm.setPalette->palette->colors)
- memcpy(pixmap->clut.data+o->parm.setPalette->palette->start, o->parm.setPalette->palette->data, o->parm.setPalette->palette->colors*sizeof(gRGB));
+ memcpy(m_pixmap->surface->clut.data+o->parm.setPalette->palette->start, o->parm.setPalette->palette->data, o->parm.setPalette->palette->colors*sizeof(gRGB));
+
delete[] o->parm.setPalette->palette->data;
delete o->parm.setPalette->palette;
delete o->parm.setPalette;
break;
case gOpcode::mergePalette:
+#if 0
pixmap->mergePalette(*o->parm.blit->pixmap);
+ o->parm.blit->pixmap->unlock();
delete o->parm.blit;
+#endif
break;
case gOpcode::line:
- pixmap->line(o->parm.line->start, o->parm.line->end, o->parm.line->color);
+ {
+ ePoint start = o->parm.line->start + m_current_offset, end = o->parm.line->end + m_current_offset;
+ m_pixmap->line(m_current_clip, start, end, m_foreground_color);
delete o->parm.line;
break;
- case gOpcode::clip:
- clip=o->parm.clip->clip;
+ }
+ case gOpcode::addClip:
+ m_clip_stack.push(m_current_clip);
+ o->parm.clip->region.moveBy(m_current_offset);
+ m_current_clip &= o->parm.clip->region;
+ delete o->parm.clip;
+ break;
+ case gOpcode::setClip:
+ o->parm.clip->region.moveBy(m_current_offset);
+ m_current_clip = o->parm.clip->region & eRect(ePoint(0, 0), m_pixmap->getSize());
delete o->parm.clip;
break;
- case gOpcode::end:
- unlock();
- case gOpcode::flush:
+ case gOpcode::popClip:
+ if (!m_clip_stack.empty())
+ {
+ m_current_clip = m_clip_stack.top();
+ m_clip_stack.pop();
+ }
+ break;
+ case gOpcode::setOffset:
+ if (o->parm.setOffset->rel)
+ m_current_offset += o->parm.setOffset->value;
+ else
+ m_current_offset = o->parm.setOffset->value;
+ delete o->parm.setOffset;
break;
default:
eFatal("illegal opcode %d. expect memory leak!", o->opcode);
}
}
-gRGB gPixmapDC::getRGB(gColor col)
+gRGB gDC::getRGB(gColor col)
{
- if ((!pixmap) || (!pixmap->clut.data))
+ if ((!m_pixmap) || (!m_pixmap->surface->clut.data))
return gRGB(col, col, col);
if (col<0)
{
eFatal("bla transp");
return gRGB(0, 0, 0, 0xFF);
}
- return pixmap->clut.data[col];
+ return m_pixmap->surface->clut.data[col];
}
-eAutoInitP0<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
+DEFINE_REF(gDC);
+
+eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
+
git.cweiske.de / enigma2.git / blobdiff