X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d6f6602d7cea3a7899990fe79216af7d98d05917..94284f21b07f1756120e8b6f5dd53e485a9ff66d:/lib/gdi/grc.cpp diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp index 55c86a0b..756ed9b7 100644 --- a/lib/gdi/grc.cpp +++ b/lib/gdi/grc.cpp @@ -1,5 +1,5 @@ // for debugging use: -// #define SYNC_PAINT +#define SYNC_PAINT #include #ifndef SYNC_PAINT #include @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -29,24 +28,28 @@ gRC::gRC(): queue(2048), queuelock(MAXSIZE) 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() { - 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() @@ -82,7 +85,7 @@ gPainter::gPainter(gDC *dc, eRect rect): m_dc(dc), m_rc(gRC::getInstance()) { // ASSERT(!gPainter_instances); gPainter_instances++; - begin(rect); +// begin(rect); } gPainter::~gPainter() @@ -113,6 +116,28 @@ void gPainter::setForegroundColor(const gColor &color) 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; @@ -161,6 +186,17 @@ void gPainter::fill(const eRect &area) 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; @@ -171,17 +207,16 @@ void gPainter::clear() 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; m_rc->submit(o); @@ -195,7 +230,9 @@ void gPainter::setPalette(gRGB *colors, int start, int len) 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; @@ -203,12 +240,19 @@ void gPainter::setPalette(gRGB *colors, int start, int 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); } @@ -224,7 +268,7 @@ void gPainter::line(ePoint start, ePoint end) m_rc->submit(o); } -void gPainter::setLogicalZero(ePoint val) +void gPainter::setOffset(ePoint val) { gOpcode o; o.opcode=gOpcode::setOffset; @@ -235,10 +279,10 @@ void gPainter::setLogicalZero(ePoint val) 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; @@ -246,24 +290,34 @@ void gPainter::moveLogicalZero(ePoint rel) 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); } @@ -277,6 +331,10 @@ void gPainter::clippop() void gPainter::flush() { + gOpcode o; + o.opcode = gOpcode::flush; + o.dc = m_dc.grabRef(); + m_rc->submit(o); } void gPainter::end() @@ -297,79 +355,156 @@ 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 para = new eTextPara(o->parm.renderText.area); + ePtr 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(); + offset += ePoint(0, (o->parm.renderText->area.height() - bbox.height()) / 2); + } + 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::flush: break; default: eFatal("illegal opcode %d. expect memory leak!", o->opcode); } -#endif } gRGB gDC::getRGB(gColor col) @@ -386,4 +521,5 @@ gRGB gDC::getRGB(gColor col) DEFINE_REF(gDC); -eAutoInitP0 init_grc(eAutoInitNumbers::graphic, "gRC"); +eAutoInitPtr init_grc(eAutoInitNumbers::graphic, "gRC"); +