X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgdi%2Fgrc.cpp;h=643e144507145747fe70305665f76d2af084fede;hp=a9bac4af0907a587a0c0922127424e75536b6c98;hb=74f5884fdc5a23465cf40c27b5c069ff7d882746;hpb=b887d75af86b430552cc28ea5e37bf58bd557d4b diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp index a9bac4a..643e144 100644 --- a/lib/gdi/grc.cpp +++ b/lib/gdi/grc.cpp @@ -3,6 +3,9 @@ #include #include #include +#ifdef USE_LIBVUGLES2 +#include +#endif #ifndef SYNC_PAINT void *gRC::thread_wrapper(void *ptr) @@ -32,6 +35,7 @@ gRC::gRC(): rp(0), wp(0) else eDebug("RC thread created successfully"); #endif + m_spinner_enabled = 0; } DEFINE_REF(gRC); @@ -63,6 +67,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(); @@ -92,6 +97,12 @@ void gRC::submit(const gOpcode &o) void *gRC::thread() { int need_notify = 0; +#ifdef USE_LIBVUGLES2 + if (gles_open()) { + gles_state_open(); + gles_viewport(720, 576, 720 * 4); + } +#endif #ifndef SYNC_PAINT while (1) { @@ -104,6 +115,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 +128,16 @@ void *gRC::thread() break; else if (o.opcode==gOpcode::notify) need_notify = 1; - else + else if (o.opcode==gOpcode::setCompositing) + { + m_compositing = o.parm.setCompositing; + m_compositing->Release(); + } 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 { @@ -125,11 +147,57 @@ 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 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()) + { + int idle_count = eApp->idleCount(); + if (idle_count == m_prev_idle_count) + idle = 0; + else + m_prev_idle_count = idle_count; + } + } + + if (!idle) + { + if (!m_spinner_enabled) + eDebug("main thread is non-idle! display spinner!"); + enableSpinner(); + } else + disableSpinner(); + } pthread_mutex_unlock(&mutex); #endif } } +#ifdef USE_LIBVUGLES2 + gles_state_close(); + gles_close(); +#endif #ifndef SYNC_PAINT pthread_exit(0); #endif @@ -146,6 +214,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()) @@ -227,7 +331,7 @@ void gPainter::setFont(gFont *font) m_rc->submit(o); } -void gPainter::renderText(const eRect &pos, const std::string &string, int flags) +void gPainter::renderText(const eRect &pos, const std::string &string, int flags, gRGB bordercolor, int border) { if ( m_dc->islocked() ) return; @@ -236,8 +340,10 @@ 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; + o.parm.renderText->border = border; + o.parm.renderText->bordercolor = bordercolor; m_rc->submit(o); } @@ -245,6 +351,7 @@ void gPainter::renderPara(eTextPara *para, ePoint offset) { if ( m_dc->islocked() ) return; + ASSERT(para); gOpcode o; o.opcode=gOpcode::renderPara; o.dc = m_dc.grabRef(); @@ -296,6 +403,13 @@ void gPainter::clear() void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags) { + blitScale(pixmap, eRect(pos, eSize()), clip, flags, 0); +} + +void gPainter::blitScale(gPixmap *pixmap, const eRect &position, const eRect &clip, int flags, int aflags) +{ + flags |= aflags; + if ( m_dc->islocked() ) return; gOpcode o; @@ -307,17 +421,17 @@ void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags) pixmap->AddRef(); o.parm.blit = new gOpcode::para::pblit; o.parm.blit->pixmap = pixmap; - o.parm.blit->position = pos; o.parm.blit->clip = clip; - o.parm.blit->flags=flags; + o.parm.blit->flags = flags; + o.parm.blit->position = position; m_rc->submit(o); } - void gPainter::setPalette(gRGB *colors, int start, int len) { if ( m_dc->islocked() ) return; + ASSERT(colors); gOpcode o; o.opcode=gOpcode::setPalette; o.dc = m_dc.grabRef(); @@ -343,6 +457,7 @@ void gPainter::mergePalette(gPixmap *target) { if ( m_dc->islocked() ) return; + ASSERT(target); gOpcode o; o.opcode = gOpcode::mergePalette; o.dc = m_dc.grabRef(); @@ -438,6 +553,46 @@ void gPainter::clippop() 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::setCompositing(gCompositingData *comp) +{ + gOpcode o; + o.opcode = gOpcode::setCompositing; + o.dc = 0; + o.parm.setCompositing = comp; + comp->AddRef(); /* will be freed in ::thread */ + m_rc->submit(o); +} + void gPainter::flush() { if ( m_dc->islocked() ) @@ -448,59 +603,94 @@ void gPainter::flush() m_rc->submit(o); } -void gPainter::waitVSync() +void gPainter::end() +{ + if ( m_dc->islocked() ) + return; +} + +void gPainter::sendShow(ePoint point, eSize size) { if ( m_dc->islocked() ) return; gOpcode o; - o.opcode = gOpcode::waitVSync; + o.opcode=gOpcode::sendShow; o.dc = m_dc.grabRef(); + o.parm.setShowHideInfo = new gOpcode::para::psetShowHideInfo; + o.parm.setShowHideInfo->point = point; + o.parm.setShowHideInfo->size = size; m_rc->submit(o); } -void gPainter::flip() +void gPainter::sendHide(ePoint point, eSize size) { if ( m_dc->islocked() ) return; gOpcode o; - o.opcode = gOpcode::flip; + o.opcode=gOpcode::sendHide; o.dc = m_dc.grabRef(); + o.parm.setShowHideInfo = new gOpcode::para::psetShowHideInfo; + o.parm.setShowHideInfo->point = point; + o.parm.setShowHideInfo->size = size; m_rc->submit(o); } -void gPainter::notify() +#ifdef USE_LIBVUGLES2 +void gPainter::sendShowItem(long dir, ePoint point, eSize size) { if ( m_dc->islocked() ) return; gOpcode o; - o.opcode = gOpcode::notify; + o.opcode=gOpcode::sendShowItem; o.dc = m_dc.grabRef(); + o.parm.setShowItemInfo = new gOpcode::para::psetShowItemInfo; + o.parm.setShowItemInfo->dir = dir; + o.parm.setShowItemInfo->point = point; + o.parm.setShowItemInfo->size = size; m_rc->submit(o); } -void gPainter::end() +void gPainter::setFlush(bool val) { if ( m_dc->islocked() ) return; gOpcode o; - o.opcode = gOpcode::flush; + o.opcode=gOpcode::setFlush; + o.dc = m_dc.grabRef(); + o.parm.setFlush = new gOpcode::para::psetFlush; + o.parm.setFlush->enable = val; + m_rc->submit(o); +} + +void gPainter::setView(eSize size) +{ + if ( m_dc->islocked() ) + return; + gOpcode o; + o.opcode=gOpcode::setView; o.dc = m_dc.grabRef(); + o.parm.setViewInfo = new gOpcode::para::psetViewInfo; + o.parm.setViewInfo->size = size; m_rc->submit(o); } +#endif 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) +void gDC::exec(const gOpcode *o) { switch (o->opcode) { @@ -535,10 +725,11 @@ void gDC::exec(gOpcode *o) { ePtr para = new eTextPara(o->parm.renderText->area); int flags = o->parm.renderText->flags; - assert(m_current_font); + ASSERT(m_current_font); para->setFont(m_current_font); - para->renderString(o->parm.renderText->text, (flags & gPainter::RT_WRAP) ? RS_WRAP : 0); - + para->renderString(o->parm.renderText->text, (flags & gPainter::RT_WRAP) ? RS_WRAP : 0, o->parm.renderText->border); + 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) @@ -555,8 +746,14 @@ void gDC::exec(gOpcode *o) int correction = vcentered_top - bbox.top(); offset += ePoint(0, correction); } - - para->blit(*this, offset, m_background_color_rgb, m_foreground_color_rgb); + + if (o->parm.renderText->border) + { + para->blit(*this, offset, m_background_color_rgb, o->parm.renderText->bordercolor, true); + para->blit(*this, offset, o->parm.renderText->bordercolor, m_foreground_color_rgb); + } + else + para->blit(*this, offset, m_background_color_rgb, m_foreground_color_rgb); delete o->parm.renderText; break; } @@ -602,7 +799,7 @@ void gDC::exec(gOpcode *o) gRegion clip; // this code should be checked again but i'm too tired now - o->parm.blit->position += m_current_offset; + o->parm.blit->position.moveBy(m_current_offset); if (o->parm.blit->clip.valid()) { @@ -671,6 +868,27 @@ void gDC::exec(gOpcode *o) break; case gOpcode::flush: break; + case gOpcode::sendShow: + break; + case gOpcode::sendHide: + break; +#ifdef USE_LIBVUGLES2 + case gOpcode::sendShowItem: + break; + case gOpcode::setFlush: + break; + case gOpcode::setView: + break; +#endif + 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); } @@ -688,6 +906,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, eRect(-m_spinner_pos.topLeft(), eSize()), 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, eRect(m_spinner_pos.topLeft(), eSize()), 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, eRect(0, 0, 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], eRect(0, 0, 0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()), gPixmap::blitAlphaTest); + + m_pixmap->blit(*m_spinner_temp, eRect(m_spinner_pos.topLeft(), eSize()), 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");