git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/dvb/sec.cpp: remove not needed satpos depends check when the tuner is linked...
[enigma2.git]
/
lib
/
gdi
/
grc.cpp
diff --git
a/lib/gdi/grc.cpp
b/lib/gdi/grc.cpp
index 1c8e3a6587ee8994089b5019288b5e79ed4e334b..dff6b059a0f9351ac80f9420b6aa8027721f67b4 100644
(file)
--- 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;
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->exec(&o);
// o.dc is a gDC* filled with grabref... so we must release it here
@@
-139,34
+143,35
@@
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. */
/* 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;
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)
if (m_spinner_enabled)
+ {
timeout.tv_nsec += 100*1000*1000;
timeout.tv_nsec += 100*1000*1000;
- else
- timeout.tv_nsec += 500*1000*1000;
-
/* yes, this is required. */
/* 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())
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)
{
if (!idle)
{
@@
-176,6
+181,7
@@
void *gRC::thread()
} else
disableSpinner();
}
} else
disableSpinner();
}
+ pthread_mutex_unlock(&mutex);
#endif
}
}
#endif
}
}
@@
-207,7
+213,8
@@
void gRC::enableSpinner()
o.opcode = m_spinner_enabled ? gOpcode::incrementSpinner : gOpcode::enableSpinner;
m_spinner_dc->exec(&o);
m_spinner_enabled = 1;
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()
}
void gRC::disableSpinner()
@@
-226,6
+233,8
@@
void gRC::disableSpinner()
gOpcode o;
o.opcode = gOpcode::disableSpinner;
m_spinner_dc->exec(&o);
gOpcode o;
o.opcode = gOpcode::disableSpinner;
m_spinner_dc->exec(&o);
+ o.opcode = gOpcode::flush;
+ m_spinner_dc->exec(&o);
}
static int gPainter_instances;
}
static int gPainter_instances;
@@
-327,6
+336,7
@@
void gPainter::renderPara(eTextPara *para, ePoint offset)
{
if ( m_dc->islocked() )
return;
{
if ( m_dc->islocked() )
return;
+ ASSERT(para);
gOpcode o;
o.opcode=gOpcode::renderPara;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode=gOpcode::renderPara;
o.dc = m_dc.grabRef();
@@
-378,6
+388,13
@@
void gPainter::clear()
void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
{
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;
if ( m_dc->islocked() )
return;
gOpcode o;
@@
-389,17
+406,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;
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->clip = clip;
- o.parm.blit->flags=flags;
+ o.parm.blit->flags = flags;
+ o.parm.blit->position = position;
m_rc->submit(o);
}
m_rc->submit(o);
}
-
void gPainter::setPalette(gRGB *colors, int start, int len)
{
if ( m_dc->islocked() )
return;
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();
gOpcode o;
o.opcode=gOpcode::setPalette;
o.dc = m_dc.grabRef();
@@
-425,6
+442,7
@@
void gPainter::mergePalette(gPixmap *target)
{
if ( m_dc->islocked() )
return;
{
if ( m_dc->islocked() )
return;
+ ASSERT(target);
gOpcode o;
o.opcode = gOpcode::mergePalette;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode = gOpcode::mergePalette;
o.dc = m_dc.grabRef();
@@
-520,16
+538,6
@@
void gPainter::clippop()
m_rc->submit(o);
}
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() )
void gPainter::waitVSync()
{
if ( m_dc->islocked() )
@@
-560,7
+568,17
@@
void gPainter::notify()
m_rc->submit(o);
}
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;
{
if ( m_dc->islocked() )
return;
@@
-570,6
+588,12
@@
void gPainter::end()
m_rc->submit(o);
}
m_rc->submit(o);
}
+void gPainter::end()
+{
+ if ( m_dc->islocked() )
+ return;
+}
+
gDC::gDC()
{
m_spinner_pic = 0;
gDC::gDC()
{
m_spinner_pic = 0;
@@
-620,7
+644,7
@@
void gDC::exec(gOpcode *o)
{
ePtr<eTextPara> para = new eTextPara(o->parm.renderText->area);
int flags = o->parm.renderText->flags;
{
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)
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
+712,7
@@
void gDC::exec(gOpcode *o)
gRegion clip;
// this code should be checked again but i'm too tired now
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())
{
if (o->parm.blit->clip.valid())
{
@@
-788,7
+812,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. */
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();
}
incrementSpinner();
}
@@
-798,7
+822,7
@@
void gDC::disableSpinner()
ASSERT(m_spinner_saved);
/* restore background */
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()
}
void gDC::incrementSpinner()
@@
-822,12
+846,12
@@
void gDC::incrementSpinner()
}
#endif
}
#endif
- m_spinner_temp->blit(*m_spinner_saved, e
Point(
0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()));
+ m_spinner_temp->blit(*m_spinner_saved, e
Rect(0, 0,
0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()));
if (m_spinner_pic[m_spinner_i])
if (m_spinner_pic[m_spinner_i])
- m_spinner_temp->blit(*m_spinner_pic[m_spinner_i], e
Point(
0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()), gPixmap::blitAlphaTest);
+ m_spinner_temp->blit(*m_spinner_pic[m_spinner_i], e
Rect(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;
}
m_spinner_i++;
m_spinner_i %= m_spinner_num;
}