#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;
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
/* 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_nsec += 500*1000*1000;
-
/* 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;
if (pthread_cond_timedwait(&cond, &mutex, &timeout) == ETIMEDOUT)
{
if (eApp && !eApp->isIdle())
- idle = 0;
+ {
+ int idle_count = eApp->idleCount();
+ if (idle_count == m_prev_idle_count)
+ idle = 0;
+ else
+ m_prev_idle_count = idle_count;
+ }
}
-
- pthread_mutex_unlock(&mutex);
if (!idle)
{
} else
disableSpinner();
}
+ pthread_mutex_unlock(&mutex);
#endif
}
}
return;
}
- m_spinner_enabled = 1;
-
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()
gOpcode o;
o.opcode = gOpcode::disableSpinner;
m_spinner_dc->exec(&o);
+ o.opcode = gOpcode::flush;
+ m_spinner_dc->exec(&o);
}
static int gPainter_instances;
{
if ( m_dc->islocked() )
return;
+ ASSERT(para);
gOpcode o;
o.opcode=gOpcode::renderPara;
o.dc = m_dc.grabRef();
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;
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();
{
if ( m_dc->islocked() )
return;
+ ASSERT(target);
gOpcode o;
o.opcode = gOpcode::mergePalette;
o.dc = m_dc.grabRef();
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() )
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;
m_rc->submit(o);
}
+void gPainter::end()
+{
+ if ( m_dc->islocked() )
+ return;
+}
+
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)
{
{
ePtr<eTextPara> 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)
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())
{
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);
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<gPixmap> *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<gPixmap>[len];
+
+ for (i = 0; i < len; ++i)
+ m_spinner_pic[i] = pic[i];
+}
+
DEFINE_REF(gDC);
eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
git.cweiske.de / enigma2.git / blobdiff