X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6ae5817707cf77c29ff070e76791cc4816946ec4..1f3e4e59174d695fd9cfe2fb16caf883e8e9477f:/lib/gdi/grc.cpp diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp index 76c02d2d..4b2c5550 100644 --- a/lib/gdi/grc.cpp +++ b/lib/gdi/grc.cpp @@ -119,7 +119,11 @@ 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 @@ -139,24 +143,21 @@ void *gRC::thread() /* 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; - + clock_gettime(CLOCK_REALTIME, &timeout); + if (m_spinner_enabled) + { timeout.tv_nsec += 100*1000*1000; - else - timeout.tv_sec += 2; - /* yes, this is required. */ - if (timeout.tv_nsec > 1000*1000*1000) - { - timeout.tv_nsec -= 1000*1000*1000; - timeout.tv_sec++; + if (timeout.tv_nsec > 1000*1000*1000) + { + timeout.tv_nsec -= 1000*1000*1000; + timeout.tv_sec++; + } } + else + timeout.tv_sec += 2; int idle = 1; @@ -165,8 +166,6 @@ void *gRC::thread() if (eApp && !eApp->isIdle()) idle = 0; } - - pthread_mutex_unlock(&mutex); if (!idle) { @@ -176,6 +175,7 @@ void *gRC::thread() } else disableSpinner(); } + pthread_mutex_unlock(&mutex); #endif } } @@ -207,7 +207,8 @@ void gRC::enableSpinner() 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() @@ -226,6 +227,8 @@ void gRC::disableSpinner() gOpcode o; o.opcode = gOpcode::disableSpinner; m_spinner_dc->exec(&o); + o.opcode = gOpcode::flush; + m_spinner_dc->exec(&o); } static int gPainter_instances; @@ -378,6 +381,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; @@ -389,13 +399,12 @@ 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() ) @@ -520,16 +529,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() ) @@ -560,7 +559,17 @@ void gPainter::notify() m_rc->submit(o); } -void gPainter::end() +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() ) return; @@ -570,6 +579,12 @@ void gPainter::end() m_rc->submit(o); } +void gPainter::end() +{ + if ( m_dc->islocked() ) + return; +} + gDC::gDC() { m_spinner_pic = 0; @@ -620,7 +635,7 @@ 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); if (o->parm.renderText->text) @@ -688,7 +703,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()) { @@ -788,7 +803,7 @@ 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); + m_spinner_saved->blit(*m_pixmap, eRect(-m_spinner_pos.topLeft(), eSize()), gRegion(eRect(ePoint(0, 0), m_spinner_saved->size())), 0); incrementSpinner(); } @@ -798,7 +813,7 @@ void gDC::disableSpinner() ASSERT(m_spinner_saved); /* restore background */ - m_pixmap->blit(*m_spinner_saved, m_spinner_pos.topLeft(), gRegion(m_spinner_pos), 0); + m_pixmap->blit(*m_spinner_saved, eRect(m_spinner_pos.topLeft(), eSize()), gRegion(m_spinner_pos), 0); } void gDC::incrementSpinner() @@ -822,12 +837,12 @@ void gDC::incrementSpinner() } #endif - m_spinner_temp->blit(*m_spinner_saved, ePoint(0, 0), eRect(ePoint(0, 0), m_spinner_pos.size())); + 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], ePoint(0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()), gPixmap::blitAlphaTest); + 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, m_spinner_pos.topLeft(), gRegion(m_spinner_pos), 0); + 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; }