X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgdi%2Fgrc.cpp;h=f108a1799cecfae0d72fa68688aea801fa169d64;hp=de6761e810d4f0f335a4f338c95489c6e9339e53;hb=5a585807121575a50ac7ecc47276336f24188377;hpb=3d9a041b1ae9244499a5fd54a62d5c6d755d98b7 diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp index de6761e..f108a17 100644 --- a/lib/gdi/grc.cpp +++ b/lib/gdi/grc.cpp @@ -1,10 +1,4 @@ -// for debugging use: -// #define SYNC_PAINT #include -#ifndef SYNC_PAINT -#include -#endif - #include #include #include @@ -38,6 +32,7 @@ gRC::gRC(): rp(0), wp(0) else eDebug("RC thread created successfully"); #endif + m_spinner_enabled = 0; } DEFINE_REF(gRC); @@ -69,6 +64,7 @@ void gRC::submit(const gOpcode &o) if ( tmp == rp ) { #ifndef SYNC_PAINT + pthread_cond_signal(&cond); // wakeup gdi thread pthread_mutex_unlock(&mutex); #else thread(); @@ -84,10 +80,10 @@ void gRC::submit(const gOpcode &o) queue[wp++]=o; if ( wp == MAXSIZE ) wp = 0; - pthread_mutex_unlock(&mutex); 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 @@ -105,19 +101,27 @@ void *gRC::thread() while (rp != wp) { #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 { @@ -127,7 +131,48 @@ void *gRC::thread() m_notify_pump.send(1); } #ifndef SYNC_PAINT - pthread_cond_wait(&cond, &mutex); + while(rp == wp) + { + + /* when the main thread is non-idle for a too long time without any display output, + we want to display a spinner. */ + + struct timeval time; + struct timespec timeout; + gettimeofday(&time, NULL); + timeout.tv_sec = time.tv_sec; + timeout.tv_nsec = time.tv_usec * 1000; + + if (m_spinner_enabled) + timeout.tv_nsec += 100*1000*1000; + else + timeout.tv_nsec += 500*1000*1000; + + /* yes, this is required. */ + if (timeout.tv_nsec > 1000*1000*1000) + { + timeout.tv_nsec -= 1000*1000*1000; + timeout.tv_sec++; + } + + int idle = 1; + + if (pthread_cond_timedwait(&cond, &mutex, &timeout) == ETIMEDOUT) + { + if (eApp && !eApp->isIdle()) + idle = 0; + } + + pthread_mutex_unlock(&mutex); + + if (!idle) + { + if (!m_spinner_enabled) + eDebug("main thread is non-idle! display spinner!"); + enableSpinner(); + } else + disableSpinner(); + } #endif } } @@ -147,6 +192,39 @@ gRC *gRC::getInstance() return instance; } +void gRC::enableSpinner() +{ + if (!m_spinner_dc) + { + eDebug("no spinner DC!"); + return; + } + + m_spinner_enabled = 1; + + gOpcode o; + o.opcode = m_spinner_enabled ? gOpcode::incrementSpinner : gOpcode::enableSpinner; + m_spinner_dc->exec(&o); +} + +void gRC::disableSpinner() +{ + if (!m_spinner_enabled) + return; + + if (!m_spinner_dc) + { + eDebug("no spinner DC!"); + return; + } + + m_spinner_enabled = 0; + + gOpcode o; + o.opcode = gOpcode::disableSpinner; + m_spinner_dc->exec(&o); +} + static int gPainter_instances; gPainter::gPainter(gDC *dc, eRect rect): m_dc(dc), m_rc(gRC::getInstance()) @@ -237,7 +315,7 @@ void gPainter::renderText(const eRect &pos, const std::string &string, int flags 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); } @@ -507,18 +585,24 @@ 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: - 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: - 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: @@ -533,7 +617,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); - + 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) @@ -550,13 +635,14 @@ void gDC::exec(gOpcode *o) 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: { - 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; @@ -566,7 +652,10 @@ 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; } @@ -574,12 +663,18 @@ void gDC::exec(gOpcode *o) { 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: - 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: @@ -656,6 +751,12 @@ void gDC::exec(gOpcode *o) break; case gOpcode::flush: break; + case gOpcode::enableSpinner: + break; + case gOpcode::disableSpinner: + break; + case gOpcode::incrementSpinner: + break; default: eFatal("illegal opcode %d. expect memory leak!", o->opcode); }