X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1aeefd997cc362c3b37c1587c5f08891b35c3a75..c00bc7c512b270dc02917bc8e582c77a95180499:/lib/gdi/grc.cpp diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp index 4597034f..736630a8 100644 --- a/lib/gdi/grc.cpp +++ b/lib/gdi/grc.cpp @@ -1,38 +1,36 @@ -// for debugging use: - #define SYNC_PAINT #include -#ifndef SYNC_PAINT -#include -#endif - #include #include #include #include -#define MAXSIZE 1024 - #ifndef SYNC_PAINT void *gRC::thread_wrapper(void *ptr) { - nice(3); return ((gRC*)ptr)->thread(); } #endif gRC *gRC::instance=0; -gRC::gRC(): queue(2048), queuelock(MAXSIZE) +gRC::gRC(): rp(0), wp(0) +#ifdef SYNC_PAINT +,m_notify_pump(eApp, 0) +#else +,m_notify_pump(eApp, 1) +#endif { ASSERT(!instance); instance=this; - queuelock.lock(MAXSIZE); + CONNECT(m_notify_pump.recv_msg, gRC::recv_notify); #ifndef SYNC_PAINT + pthread_mutex_init(&mutex, 0); + pthread_cond_init(&cond, 0); 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"); + eDebug("RC thread created successfully"); #endif } @@ -52,21 +50,91 @@ gRC::~gRC() #endif } +void gRC::submit(const gOpcode &o) +{ + while(1) + { +#ifndef SYNC_PAINT + pthread_mutex_lock(&mutex); +#endif + int tmp=wp+1; + if ( tmp == MAXSIZE ) + tmp=0; + if ( tmp == rp ) + { +#ifndef SYNC_PAINT + pthread_cond_signal(&cond); // wakeup gdi thread + pthread_mutex_unlock(&mutex); +#else + thread(); +#endif + //printf("render buffer full...\n"); + //fflush(stdout); + usleep(1000); // wait 1 msec + continue; + } + int free=rp-wp; + if ( free <= 0 ) + free+=MAXSIZE; + queue[wp++]=o; + if ( wp == MAXSIZE ) + wp = 0; + if (o.opcode==gOpcode::flush||o.opcode==gOpcode::shutdown||o.opcode==gOpcode::notify) +#ifndef SYNC_PAINT + pthread_cond_signal(&cond); // wakeup gdi thread + pthread_mutex_unlock(&mutex); +#else + thread(); // paint +#endif + break; + } +} + void *gRC::thread() { + int need_notify = 0; #ifndef SYNC_PAINT while (1) + { #else - while (queue.size()) -#endif + while (rp != wp) { - queuelock.lock(1); - gOpcode& o(queue.current()); - if (o.opcode==gOpcode::shutdown) - break; - o.dc->exec(&o); - o.dc->Release(); - queue.dequeue(); +#endif +#ifndef SYNC_PAINT + pthread_mutex_lock(&mutex); +#endif + if ( rp != wp ) + { + 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 + { + o.dc->exec(&o); + // o.dc is a gDC* filled with grabref... so we must release it here + o.dc->Release(); + } + } + else + { + if (need_notify) + { + need_notify = 0; + m_notify_pump.send(1); + } +#ifndef SYNC_PAINT + while(rp == wp) + pthread_cond_wait(&cond, &mutex); + pthread_mutex_unlock(&mutex); +#endif + } } #ifndef SYNC_PAINT pthread_exit(0); @@ -74,6 +142,11 @@ void *gRC::thread() return 0; } +void gRC::recv_notify(const int &i) +{ + notify(); +} + gRC *gRC::getInstance() { return instance; @@ -96,52 +169,88 @@ 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(); 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) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::renderPara; o.dc = m_dc.grabRef(); @@ -155,6 +264,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; @@ -164,8 +275,23 @@ void gPainter::fill(const eRect &area) m_rc->submit(o); } +void gPainter::fill(const gRegion ®ion) +{ + if ( m_dc->islocked() ) + return; + 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() { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::clear; o.dc = m_dc.grabRef(); @@ -176,8 +302,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(); @@ -185,21 +315,23 @@ void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags) o.parm.blit->pixmap = pixmap; o.parm.blit->position = pos; o.parm.blit->clip = clip; - o.flags=flags; + o.parm.blit->flags=flags; m_rc->submit(o); } 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; @@ -207,18 +339,29 @@ 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) { + if ( m_dc->islocked() ) + return; 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); } void gPainter::line(ePoint start, ePoint end) { + if ( m_dc->islocked() ) + return; gOpcode o; o.opcode=gOpcode::line; o.dc = m_dc.grabRef(); @@ -230,6 +373,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(); @@ -241,6 +386,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(); @@ -252,6 +399,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(); @@ -263,6 +412,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(); @@ -273,6 +424,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(); @@ -283,6 +436,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(); @@ -291,10 +446,52 @@ void gPainter::clippop() void gPainter::flush() { + if ( m_dc->islocked() ) + return; + gOpcode o; + o.opcode = gOpcode::flush; + o.dc = m_dc.grabRef(); + m_rc->submit(o); +} + +void gPainter::waitVSync() +{ + if ( m_dc->islocked() ) + return; + gOpcode o; + o.opcode = gOpcode::waitVSync; + o.dc = m_dc.grabRef(); + m_rc->submit(o); +} + +void gPainter::flip() +{ + if ( m_dc->islocked() ) + return; + gOpcode o; + o.opcode = gOpcode::flip; + o.dc = m_dc.grabRef(); + m_rc->submit(o); +} + +void gPainter::notify() +{ + if ( m_dc->islocked() ) + return; + gOpcode o; + o.opcode = gOpcode::notify; + o.dc = m_dc.grabRef(); + m_rc->submit(o); } void gPainter::end() { + if ( m_dc->islocked() ) + return; + gOpcode o; + o.opcode = gOpcode::flush; + o.dc = m_dc.grabRef(); + m_rc->submit(o); } gDC::gDC() @@ -315,12 +512,26 @@ void gDC::exec(gOpcode *o) { 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; + m_background_color_rgb = getRGB(m_foreground_color); delete o->parm.setColor; break; + case gOpcode::setBackgroundColorRGB: + 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: + 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: m_current_font = o->parm.setFont->font; o->parm.setFont->font->Release(); @@ -329,16 +540,36 @@ void gDC::exec(gOpcode *o) case gOpcode::renderText: { 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, m_current_offset, getRGB(m_foreground_color), getRGB(m_background_color)); + 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) + 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.top() + ((o->parm.renderText->area.height() - bbox.height()) / 2); + int correction = vcentered_top - bbox.top(); + offset += ePoint(0, correction); + } + + para->blit(*this, offset, m_background_color_rgb, m_foreground_color_rgb); delete o->parm.renderText; break; } case gOpcode::renderPara: { - 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->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; @@ -348,22 +579,45 @@ void gDC::exec(gOpcode *o) 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; } + case gOpcode::fillRegion: + { + o->parm.fillRegion->region.moveBy(m_current_offset); + gRegion clip = m_current_clip & o->parm.fillRegion->region; + 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: - 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: { gRegion clip; - if (!o->parm.blit->clip.valid()) + // 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(gRegion(o->parm.blit->clip), clip); + o->parm.blit->clip.moveBy(m_current_offset); + clip.intersect(gRegion(o->parm.blit->clip), m_current_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; @@ -382,12 +636,10 @@ void gDC::exec(gOpcode *o) 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; + m_pixmap->mergePalette(*o->parm.mergePalette->target); + o->parm.mergePalette->target->Release(); + delete o->parm.mergePalette; + break; case gOpcode::line: { ePoint start = o->parm.line->start + m_current_offset, end = o->parm.line->end + m_current_offset; @@ -403,7 +655,7 @@ void gDC::exec(gOpcode *o) 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()); + m_current_clip = o->parm.clip->region & eRect(ePoint(0, 0), m_pixmap->size()); delete o->parm.clip; break; case gOpcode::popClip: @@ -420,6 +672,12 @@ void gDC::exec(gOpcode *o) 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); } @@ -440,4 +698,3 @@ gRGB gDC::getRGB(gColor col) DEFINE_REF(gDC); eAutoInitPtr init_grc(eAutoInitNumbers::graphic, "gRC"); -