#include <lib/gdi/font.h>
#include <lib/base/init.h>
#include <lib/base/init_num.h>
+#ifdef USE_LIBVUGLES2
+#include <vuplus_gles.h>
+#endif
#ifndef SYNC_PAINT
void *gRC::thread_wrapper(void *ptr)
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)
{
break;
else if (o.opcode==gOpcode::notify)
need_notify = 1;
- else if(o.dc)
+ 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
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;
+ }
}
if (!idle)
#endif
}
}
+#ifdef USE_LIBVUGLES2
+ gles_state_close();
+ gles_close();
+#endif
#ifndef SYNC_PAINT
pthread_exit(0);
#endif
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;
o.parm.renderText->area = pos;
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);
}
{
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::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;
+}
+
+void gPainter::sendShow(ePoint point, eSize size)
+{
+ if ( m_dc->islocked() )
+ return;
+ gOpcode o;
+ 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::sendHide(ePoint point, eSize size)
+{
+ if ( m_dc->islocked() )
+ return;
+ gOpcode o;
+ 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);
+}
+
+#ifdef USE_LIBVUGLES2
+void gPainter::sendShowItem(long dir, ePoint point, eSize size)
+{
+ if ( m_dc->islocked() )
+ return;
+ gOpcode o;
+ 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::setFlush(bool val)
+{
+ if ( m_dc->islocked() )
+ return;
+ gOpcode o;
+ 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;
delete[] m_spinner_pic;
}
-void gDC::exec(gOpcode *o)
+void gDC::exec(const gOpcode *o)
{
switch (o->opcode)
{
int flags = o->parm.renderText->flags;
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)
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;
}
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())
{
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;
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();
}
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()
}
#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;
}
projects / vuplus_dvbapp / blobdiff