X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/84fff4d373d10a3676e239c02e759cffff5b5cf2..8ecfc549ce93bc353d6a64f43a0c25dcd65f860e:/lib/gdi/grc.cpp diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp index 274d221b..c8af2457 100644 --- a/lib/gdi/grc.cpp +++ b/lib/gdi/grc.cpp @@ -32,6 +32,7 @@ gRC::gRC(): rp(0), wp(0) else eDebug("RC thread created successfully"); #endif + m_spinner_enabled = 0; } DEFINE_REF(gRC); @@ -63,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(); @@ -104,6 +106,9 @@ void *gRC::thread() #endif if ( rp != wp ) { + /* make sure the spinner is not displayed when we something is painted */ + disableSpinner(); + gOpcode o(queue[rp++]); if ( rp == MAXSIZE ) rp=0; @@ -114,8 +119,12 @@ void *gRC::thread() break; else if (o.opcode==gOpcode::notify) need_notify = 1; - else + else if(o.dc) + { o.dc->exec(&o); + // o.dc is a gDC* filled with grabref... so we must release it here + o.dc->Release(); + } } else { @@ -126,7 +135,42 @@ void *gRC::thread() } #ifndef SYNC_PAINT while(rp == wp) - pthread_cond_wait(&cond, &mutex); + { + + /* when the main thread is non-idle for a too long time without any display output, + we want to display a spinner. */ + struct timespec timeout; + clock_gettime(CLOCK_REALTIME, &timeout); + + if (m_spinner_enabled) + { + timeout.tv_nsec += 100*1000*1000; + /* yes, this is required. */ + if (timeout.tv_nsec > 1000*1000*1000) + { + timeout.tv_nsec -= 1000*1000*1000; + timeout.tv_sec++; + } + } + else + timeout.tv_sec += 2; + + int idle = 1; + + if (pthread_cond_timedwait(&cond, &mutex, &timeout) == ETIMEDOUT) + { + if (eApp && !eApp->isIdle()) + idle = 0; + } + + if (!idle) + { + if (!m_spinner_enabled) + eDebug("main thread is non-idle! display spinner!"); + enableSpinner(); + } else + disableSpinner(); + } pthread_mutex_unlock(&mutex); #endif } @@ -147,6 +191,42 @@ gRC *gRC::getInstance() return instance; } +void gRC::enableSpinner() +{ + if (!m_spinner_dc) + { + eDebug("no spinner DC!"); + return; + } + + gOpcode o; + o.opcode = m_spinner_enabled ? gOpcode::incrementSpinner : gOpcode::enableSpinner; + m_spinner_dc->exec(&o); + m_spinner_enabled = 1; + o.opcode = gOpcode::flush; + 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); + o.opcode = gOpcode::flush; + m_spinner_dc->exec(&o); +} + static int gPainter_instances; gPainter::gPainter(gDC *dc, eRect rect): m_dc(dc), m_rc(gRC::getInstance()) @@ -237,7 +317,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); } @@ -439,16 +519,6 @@ void gPainter::clippop() m_rc->submit(o); } -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() ) @@ -491,14 +561,17 @@ void gPainter::end() gDC::gDC() { + m_spinner_pic = 0; } gDC::gDC(gPixmap *pixmap): m_pixmap(pixmap) { + m_spinner_pic = 0; } gDC::~gDC() { + delete[] m_spinner_pic; } void gDC::exec(gOpcode *o) @@ -539,7 +612,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) @@ -672,6 +746,15 @@ void gDC::exec(gOpcode *o) break; case gOpcode::flush: break; + case gOpcode::enableSpinner: + enableSpinner(); + break; + case gOpcode::disableSpinner: + disableSpinner(); + break; + case gOpcode::incrementSpinner: + incrementSpinner(); + break; default: eFatal("illegal opcode %d. expect memory leak!", o->opcode); } @@ -689,6 +772,76 @@ gRGB gDC::getRGB(gColor col) return m_pixmap->surface->clut.data[col]; } +void gDC::enableSpinner() +{ + ASSERT(m_spinner_saved); + + /* save the background to restore it later. We need to negative position because we want to blit from the middle of the screen. */ + m_spinner_saved->blit(*m_pixmap, -m_spinner_pos.topLeft(), gRegion(eRect(ePoint(0, 0), m_spinner_saved->size())), 0); + + incrementSpinner(); +} + +void gDC::disableSpinner() +{ + ASSERT(m_spinner_saved); + + /* restore background */ + m_pixmap->blit(*m_spinner_saved, m_spinner_pos.topLeft(), gRegion(m_spinner_pos), 0); +} + +void gDC::incrementSpinner() +{ + ASSERT(m_spinner_saved); + + static int blub; + blub++; + +#if 0 + int i; + + for (i = 0; i < 5; ++i) + { + int x = i * 20 + m_spinner_pos.left(); + int y = m_spinner_pos.top(); + + int col = ((blub - i) * 30) % 256; + + m_pixmap->fill(eRect(x, y, 10, 10), gRGB(col, col, col)); + } +#endif + + m_spinner_temp->blit(*m_spinner_saved, ePoint(0, 0), eRect(ePoint(0, 0), m_spinner_pos.size())); + + if (m_spinner_pic[m_spinner_i]) + m_spinner_temp->blit(*m_spinner_pic[m_spinner_i], ePoint(0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()), gPixmap::blitAlphaTest); + + m_pixmap->blit(*m_spinner_temp, m_spinner_pos.topLeft(), gRegion(m_spinner_pos), 0); + m_spinner_i++; + m_spinner_i %= m_spinner_num; +} + +void gDC::setSpinner(eRect pos, ePtr *pic, int len) +{ + ASSERT(m_pixmap); + ASSERT(m_pixmap->surface); + m_spinner_saved = new gPixmap(pos.size(), m_pixmap->surface->bpp); + m_spinner_temp = new gPixmap(pos.size(), m_pixmap->surface->bpp); + m_spinner_pos = pos; + + m_spinner_i = 0; + m_spinner_num = len; + + int i; + if (m_spinner_pic) + delete[] m_spinner_pic; + + m_spinner_pic = new ePtr[len]; + + for (i = 0; i < len; ++i) + m_spinner_pic[i] = pic[i]; +} + DEFINE_REF(gDC); eAutoInitPtr init_grc(eAutoInitNumbers::graphic, "gRC");