#include <lib/gdi/grc.h>
#include <lib/gdi/font.h>
-#include <lib/gdi/lcd.h>
#include <lib/base/init.h>
#include <lib/base/init_num.h>
gRC *gRC::instance=0;
-gRC::gRC(): queue(2048), queuelock(MAXSIZE)
+gRC::gRC(): queue(2048), m_notify_pump(eApp, 0), queuelock(MAXSIZE)
{
ASSERT(!instance);
instance=this;
queuelock.lock(MAXSIZE);
+ CONNECT(m_notify_pump.recv_msg, gRC::recv_notify);
#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 created successfully");
#endif
}
+DEFINE_REF(gRC);
+
gRC::~gRC()
{
- fbClass::getInstance()->lock();
-#ifndef DISABLE_LCD
- eDBoxLCD::getInstance()->lock();
-#endif
instance=0;
gOpcode o;
o.opcode=gOpcode::shutdown;
submit(o);
+#ifndef SYNC_PAINT
eDebug("waiting for gRC thread shutdown");
pthread_join(the_thread, 0);
eDebug("gRC thread has finished");
+#endif
}
void *gRC::thread()
{
+ int need_notify = 0;
#ifndef SYNC_PAINT
while (1)
#else
gOpcode& o(queue.current());
if (o.opcode==gOpcode::shutdown)
break;
- o.dc->exec(&o);
+ if (o.opcode==gOpcode::notify)
+ need_notify = 1;
+ else
+ o.dc->exec(&o);
o.dc->Release();
queue.dequeue();
+
+ if ((!queue.size()) && need_notify)
+ {
+ need_notify = 0;
+ m_notify_pump.send(1);
+ }
}
#ifndef SYNC_PAINT
pthread_exit(0);
return 0;
}
+void gRC::recv_notify(const int &i)
+{
+ notify();
+}
+
gRC *gRC::getInstance()
{
return instance;
{
// ASSERT(!gPainter_instances);
gPainter_instances++;
- begin(rect);
+// begin(rect);
}
gPainter::~gPainter()
m_rc->submit(o);
}
+void gPainter::setBackgroundColor(const gRGB &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)
+{
+ 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)
{
gOpcode o;
m_rc->submit(o);
}
+void gPainter::fill(const gRegion ®ion)
+{
+ gOpcode o;
+ o.opcode=gOpcode::fillRegion;
+
+ o.dc = m_dc.grabRef();
+ o.parm.fillRegion = new gOpcode::para::pfillRegion;
+ o.parm.fillRegion->region = region;
+ m_rc->submit(o);
+}
+
void gPainter::clear()
{
gOpcode o;
m_rc->submit(o);
}
-void gPainter::blit(gPixmap *pixmap, ePoint pos, gRegion *clip, int flags)
+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;
- clip->AddRef();
o.parm.blit->clip = clip;
- o.flags=flags;
+ o.parm.blit->flags=flags;
m_rc->submit(o);
}
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;
m_rc->submit(o);
}
+void gPainter::setPalette(gPixmap *source)
+{
+ ASSERT(source);
+ setPalette(source->surface->clut.data, source->surface->clut.start, source->surface->clut.colors);
+}
+
void gPainter::mergePalette(gPixmap *target)
{
gOpcode o;
- o.opcode=gOpcode::mergePalette;
+ o.opcode = gOpcode::mergePalette;
o.dc = m_dc.grabRef();
target->AddRef();
+ o.parm.mergePalette = new gOpcode::para::pmergePalette;
o.parm.mergePalette->target = target;
m_rc->submit(o);
}
m_rc->submit(o);
}
-void gPainter::setLogicalZero(ePoint val)
+void gPainter::setOffset(ePoint val)
{
gOpcode o;
o.opcode=gOpcode::setOffset;
m_rc->submit(o);
}
-void gPainter::moveLogicalZero(ePoint rel)
+void gPainter::moveOffset(ePoint rel)
{
gOpcode o;
- o.opcode=gOpcode::moveOffset;
+ o.opcode=gOpcode::setOffset;
o.dc = m_dc.grabRef();
o.parm.setOffset = new gOpcode::para::psetOffset;
o.parm.setOffset->rel = 1;
m_rc->submit(o);
}
-void gPainter::resetLogicalZero()
+void gPainter::resetOffset()
{
gOpcode o;
- o.opcode=gOpcode::moveOffset;
+ 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::resetClip(const gRegion ®ion)
+{
+ gOpcode 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::clip(const gRegion ®ion)
{
gOpcode o;
o.opcode = gOpcode::addClip;
o.dc = m_dc.grabRef();
o.parm.clip = new gOpcode::para::psetClip;
- o.parm.clip->region = new gRegion(region);
- o.parm.clip->region->AddRef();
+ o.parm.clip->region = region;
m_rc->submit(o);
}
void gPainter::flush()
{
+ gOpcode o;
+ o.opcode = gOpcode::flush;
+ o.dc = m_dc.grabRef();
+ m_rc->submit(o);
+}
+
+void gPainter::waitVSync()
+{
+ gOpcode o;
+ o.opcode = gOpcode::waitVSync;
+ o.dc = m_dc.grabRef();
+ m_rc->submit(o);
+}
+
+void gPainter::flip()
+{
+ gOpcode o;
+ o.opcode = gOpcode::flip;
+ o.dc = m_dc.grabRef();
+ m_rc->submit(o);
+}
+
+void gPainter::notify()
+{
+ gOpcode o;
+ o.opcode = gOpcode::notify;
+ o.dc = m_dc.grabRef();
+ m_rc->submit(o);
}
void gPainter::end()
{
+ gOpcode o;
+ o.opcode = gOpcode::flush;
+ o.dc = m_dc.grabRef();
+ m_rc->submit(o);
}
gDC::gDC()
void gDC::exec(gOpcode *o)
{
-#if 0
- switch(o->opcode)
+ switch (o->opcode)
{
+ 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::setBackgroundColorRGB:
+ m_background_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+ delete o->parm.setColorRGB;
+ break;
+ case gOpcode::setForegroundColorRGB:
+ m_foreground_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+ delete o->parm.setColorRGB;
+ break;
+ case gOpcode::setFont:
+ m_current_font = o->parm.setFont->font;
+ o->parm.setFont->font->Release();
+ delete o->parm.setFont;
+ break;
case gOpcode::renderText:
{
- ePtr<eTextPara> para = new eTextPara(o->parm.renderText.area);
+ ePtr<eTextPara> para = new eTextPara(o->parm.renderText->area);
+ int flags = o->parm.renderText->flags;
+ assert(m_current_font);
para->setFont(m_current_font);
- para->renderString(*o->parm.renderText.text, o->parm.renderText.flags);
- para->blit(*this, ePoint(0, 0), m_foregroundColor, m_backgroundColor);
- delete o->parm.renderText->text;
+ para->renderString(o->parm.renderText->text, (flags & gPainter::RT_WRAP) ? RS_WRAP : 0);
+
+ if (flags & gPainter::RT_HALIGN_RIGHT)
+ para->realign(eTextPara::dirRight);
+ else if (flags & gPainter::RT_HALIGN_CENTER)
+ para->realign(eTextPara::dirCenter);
+ else if (flags & gPainter::RT_HALIGN_BLOCK)
+ para->realign(eTextPara::dirBlock);
+
+ ePoint offset = m_current_offset;
+
+ if (o->parm.renderText->flags & gPainter::RT_VALIGN_CENTER)
+ {
+ eRect bbox = para->getBoundBox();
+ int vcentered_top = (o->parm.renderText->area.height() - bbox.height()) / 2;
+ int correction = vcentered_top - bbox.top();
+ offset += ePoint(0, correction);
+ }
+ para->blit(*this, offset, getRGB(m_background_color), getRGB(m_foreground_color));
+ delete o->parm.renderText;
break;
}
case gOpcode::renderPara:
{
- o->parm.renderPara.textpara->blit(*this, o->parm.renderPara.offset, m_foregroundColor, m_backgroundColor);
- o->parm.renderPara.textpara.Release();
+ 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->Release();
+ delete o->parm.renderPara;
break;
}
case gOpcode::fill:
- m_pixmap->fill(o->parm.fill.area, m_foregroundColor);
+ {
+ 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::fillRegion:
+ {
+ o->parm.fillRegion->region.moveBy(m_current_offset);
+ gRegion clip = m_current_clip & o->parm.fillRegion->region;
+ m_pixmap->fill(clip, m_foreground_color);
+ delete o->parm.fillRegion;
+ break;
+ }
+ case gOpcode::clear:
+ m_pixmap->fill(m_current_clip, m_background_color);
delete o->parm.fill;
break;
case gOpcode::blit:
{
gRegion clip;
- if (o->parm.blit.clip)
+ // this code should be checked again but i'm too tired now
+
+ o->parm.blit->position += m_current_offset;
+
+ if (o->parm.blit->clip.valid())
{
- clip.intersect(o->parm.blit.clip, clip);
- o->parm.blit.clip->Release();
+ o->parm.blit->clip.moveBy(m_current_offset);
+ clip.intersect(gRegion(o->parm.blit->clip), m_current_clip);
} else
clip = m_current_clip;
- pixmap->blit(*o->parm.blit.pixmap, o->parm.blit.pos, clip, o->parm.blit.flags);
- o->parm.blit.pixmap->Release();
+
+ 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 0
- if (o->parm.setPalette->palette->start>pixmap->surface->clut.colors)
- o->parm.setPalette->palette->start=pixmap->surface->clut.colors;
- if (o->parm.setPalette->palette->colors>(pixmap->surface->clut.colors-o->parm.setPalette->palette->start))
- o->parm.setPalette->palette->colors=pixmap->surface->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->surface->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;
-#endif
break;
case gOpcode::mergePalette:
-#if 0
- pixmap->mergePalette(*o->parm.blit->pixmap);
- o->parm.blit->pixmap->unlock();
- delete o->parm.blit;
-#endif
- break;
+ m_pixmap->mergePalette(*o->parm.mergePalette->target);
+ o->parm.mergePalette->target->Release();
+ delete o->parm.mergePalette;
+ break;
case gOpcode::line:
-#if 0
- 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;
-#endif
break;
- case gOpcode::setBackgroundColor:
- m_backgroundColor = o->parm.setColor.color;
+ }
+ 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::setForegroundColor:
- m_foregroundColor = o->parm.setColor.color;
+ case gOpcode::setClip:
+ o->parm.clip->region.moveBy(m_current_offset);
+ m_current_clip = o->parm.clip->region & eRect(ePoint(0, 0), m_pixmap->size());
+ delete o->parm.clip;
break;
- case gOpcode::clip:
+ 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;
+ case gOpcode::waitVSync:
+ break;
+ case gOpcode::flip:
+ break;
+ case gOpcode::flush:
break;
default:
eFatal("illegal opcode %d. expect memory leak!", o->opcode);
}
-#endif
}
gRGB gDC::getRGB(gColor col)
DEFINE_REF(gDC);
-eAutoInitP0<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
+eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
git.cweiske.de / enigma2.git / blobdiff