-// for debugging use:
-#define SYNC_PAINT
#include <unistd.h>
-#ifndef SYNC_PAINT
-#include <pthread.h>
-#endif
-
#include <lib/gdi/grc.h>
#include <lib/gdi/font.h>
#include <lib/base/init.h>
#include <lib/base/init_num.h>
-#define MAXSIZE 1024
-
#ifndef SYNC_PAINT
void *gRC::thread_wrapper(void *ptr)
{
- nice(3);
return ((gRC*)ptr)->thread();
}
#endif
gRC *gRC::instance=0;
-gRC::gRC(): queue(2048), queuelock(MAXSIZE)
+gRC::gRC(): rp(0), wp(0)
+#ifdef SYNC_PAINT
+,m_notify_pump(eApp, 0)
+#else
+,m_notify_pump(eApp, 1)
+#endif
{
ASSERT(!instance);
instance=this;
- queuelock.lock(MAXSIZE);
+ CONNECT(m_notify_pump.recv_msg, gRC::recv_notify);
#ifndef SYNC_PAINT
+ pthread_mutex_init(&mutex, 0);
+ pthread_cond_init(&cond, 0);
int res = pthread_create(&the_thread, 0, thread_wrapper, this);
if (res)
eFatal("RC thread couldn't be created");
else
- eDebug("RC thread createted successfully");
+ eDebug("RC thread created successfully");
#endif
}
#endif
}
+void gRC::submit(const gOpcode &o)
+{
+ while(1)
+ {
+#ifndef SYNC_PAINT
+ pthread_mutex_lock(&mutex);
+#endif
+ int tmp=wp+1;
+ if ( tmp == MAXSIZE )
+ tmp=0;
+ if ( tmp == rp )
+ {
+#ifndef SYNC_PAINT
+ pthread_mutex_unlock(&mutex);
+#else
+ thread();
+#endif
+ //printf("render buffer full...\n");
+ //fflush(stdout);
+ usleep(1000); // wait 1 msec
+ continue;
+ }
+ int free=rp-wp;
+ if ( free <= 0 )
+ free+=MAXSIZE;
+ queue[wp++]=o;
+ if ( wp == MAXSIZE )
+ wp = 0;
+ if (o.opcode==gOpcode::flush||o.opcode==gOpcode::shutdown||o.opcode==gOpcode::notify)
+#ifndef SYNC_PAINT
+ pthread_cond_signal(&cond); // wakeup gdi thread
+ pthread_mutex_unlock(&mutex);
+#else
+ thread(); // paint
+#endif
+ break;
+ }
+}
+
void *gRC::thread()
{
+ int need_notify = 0;
#ifndef SYNC_PAINT
while (1)
+ {
#else
- while (queue.size())
-#endif
+ while (rp != wp)
{
- queuelock.lock(1);
- gOpcode& o(queue.current());
- if (o.opcode==gOpcode::shutdown)
- break;
- o.dc->exec(&o);
- o.dc->Release();
- queue.dequeue();
+#endif
+#ifndef SYNC_PAINT
+ pthread_mutex_lock(&mutex);
+#endif
+ if ( rp != wp )
+ {
+ gOpcode o(queue[rp++]);
+ if ( rp == MAXSIZE )
+ rp=0;
+#ifndef SYNC_PAINT
+ pthread_mutex_unlock(&mutex);
+#endif
+ if (o.opcode==gOpcode::shutdown)
+ break;
+ else if (o.opcode==gOpcode::notify)
+ need_notify = 1;
+ else
+ o.dc->exec(&o);
+ }
+ else
+ {
+ if (need_notify)
+ {
+ need_notify = 0;
+ m_notify_pump.send(1);
+ }
+#ifndef SYNC_PAINT
+ while(rp == wp)
+ pthread_cond_wait(&cond, &mutex);
+ pthread_mutex_unlock(&mutex);
+#endif
+ }
}
#ifndef SYNC_PAINT
pthread_exit(0);
return 0;
}
+void gRC::recv_notify(const int &i)
+{
+ notify();
+}
+
gRC *gRC::getInstance()
{
return instance;
void gPainter::setBackgroundColor(const gColor &color)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::setBackgroundColor;
o.dc = m_dc.grabRef();
o.parm.setColor = new gOpcode::para::psetColor;
o.parm.setColor->color = color;
-
+
m_rc->submit(o);
}
void gPainter::setForegroundColor(const gColor &color)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::setForegroundColor;
o.dc = m_dc.grabRef();
o.parm.setColor = new gOpcode::para::psetColor;
o.parm.setColor->color = color;
-
+
m_rc->submit(o);
}
void gPainter::setBackgroundColor(const gRGB &color)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::setBackgroundColorRGB;
o.dc = m_dc.grabRef();
o.parm.setColorRGB = new gOpcode::para::psetColorRGB;
o.parm.setColorRGB->color = color;
-
+
m_rc->submit(o);
}
void gPainter::setForegroundColor(const gRGB &color)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::setForegroundColorRGB;
o.dc = m_dc.grabRef();
o.parm.setColorRGB = new gOpcode::para::psetColorRGB;
o.parm.setColorRGB->color = color;
-
+
m_rc->submit(o);
}
void gPainter::setFont(gFont *font)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::setFont;
o.dc = m_dc.grabRef();
font->AddRef();
o.parm.setFont = new gOpcode::para::psetFont;
o.parm.setFont->font = font;
-
+
m_rc->submit(o);
}
void gPainter::renderText(const eRect &pos, const std::string &string, int flags)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::renderText;
o.dc = m_dc.grabRef();
void gPainter::renderPara(eTextPara *para, ePoint offset)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::renderPara;
o.dc = m_dc.grabRef();
void gPainter::fill(const eRect &area)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::fill;
void gPainter::fill(const gRegion ®ion)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::fillRegion;
void gPainter::clear()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::clear;
o.dc = m_dc.grabRef();
void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
-
+
+ ASSERT(pixmap);
+
o.opcode=gOpcode::blit;
o.dc = m_dc.grabRef();
pixmap->AddRef();
o.parm.blit->pixmap = pixmap;
o.parm.blit->position = pos;
o.parm.blit->clip = clip;
- o.flags=flags;
+ o.parm.blit->flags=flags;
m_rc->submit(o);
}
void gPainter::setPalette(gRGB *colors, int start, int len)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::setPalette;
o.dc = m_dc.grabRef();
gPalette *p=new gPalette;
-
+
o.parm.setPalette = new gOpcode::para::psetPalette;
p->data=new gRGB[len];
-
+
memcpy(p->data, colors, len*sizeof(gRGB));
p->start=start;
p->colors=len;
void gPainter::mergePalette(gPixmap *target)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::mergePalette;
o.dc = m_dc.grabRef();
void gPainter::line(ePoint start, ePoint end)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::line;
o.dc = m_dc.grabRef();
void gPainter::setOffset(ePoint val)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::setOffset;
o.dc = m_dc.grabRef();
void gPainter::moveOffset(ePoint rel)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::setOffset;
o.dc = m_dc.grabRef();
void gPainter::resetOffset()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode=gOpcode::setOffset;
o.dc = m_dc.grabRef();
void gPainter::resetClip(const gRegion ®ion)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::setClip;
o.dc = m_dc.grabRef();
void gPainter::clip(const gRegion ®ion)
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::addClip;
o.dc = m_dc.grabRef();
void gPainter::clippop()
{
+ if ( m_dc->islocked() )
+ return;
gOpcode o;
o.opcode = gOpcode::popClip;
o.dc = m_dc.grabRef();
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() )
+ 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::end()
{
+ if ( m_dc->islocked() )
+ return;
+ gOpcode o;
+ o.opcode = gOpcode::flush;
+ o.dc = m_dc.grabRef();
+ m_rc->submit(o);
}
gDC::gDC()
{
case gOpcode::setBackgroundColor:
m_background_color = o->parm.setColor->color;
+ m_background_color_rgb = getRGB(m_background_color);
delete o->parm.setColor;
break;
case gOpcode::setForegroundColor:
m_foreground_color = o->parm.setColor->color;
+ m_background_color_rgb = getRGB(m_foreground_color);
delete o->parm.setColor;
break;
case gOpcode::setBackgroundColorRGB:
- m_background_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+ if (m_pixmap->needClut())
+ m_background_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+ m_background_color_rgb = o->parm.setColorRGB->color;
delete o->parm.setColorRGB;
break;
case gOpcode::setForegroundColorRGB:
- m_foreground_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+ if (m_pixmap->needClut())
+ m_foreground_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+ m_foreground_color_rgb = o->parm.setColorRGB->color;
delete o->parm.setColorRGB;
break;
case gOpcode::setFont:
if (o->parm.renderText->flags & gPainter::RT_VALIGN_CENTER)
{
eRect bbox = para->getBoundBox();
- offset += ePoint(0, (o->parm.renderText->area.height() - bbox.height()) / 2);
+ int vcentered_top = o->parm.renderText->area.top() + ((o->parm.renderText->area.height() - bbox.height()) / 2);
+ int correction = vcentered_top - bbox.top();
+ offset += ePoint(0, correction);
}
- para->blit(*this, offset, getRGB(m_background_color), getRGB(m_foreground_color));
+
+ para->blit(*this, offset, m_background_color_rgb, m_foreground_color_rgb);
delete o->parm.renderText;
break;
}
case gOpcode::renderPara:
{
- o->parm.renderPara->textpara->blit(*this, o->parm.renderPara->offset + m_current_offset, getRGB(m_background_color), getRGB(m_foreground_color));
+ o->parm.renderPara->textpara->blit(*this, o->parm.renderPara->offset + m_current_offset, m_background_color_rgb, m_foreground_color_rgb);
o->parm.renderPara->textpara->Release();
delete o->parm.renderPara;
break;
eRect area = o->parm.fill->area;
area.moveBy(m_current_offset);
gRegion clip = m_current_clip & area;
- m_pixmap->fill(clip, m_foreground_color);
+ if (m_pixmap->needClut())
+ m_pixmap->fill(clip, m_foreground_color);
+ else
+ m_pixmap->fill(clip, m_foreground_color_rgb);
delete o->parm.fill;
break;
}
{
o->parm.fillRegion->region.moveBy(m_current_offset);
gRegion clip = m_current_clip & o->parm.fillRegion->region;
- m_pixmap->fill(clip, m_foreground_color);
+ if (m_pixmap->needClut())
+ m_pixmap->fill(clip, m_foreground_color);
+ else
+ m_pixmap->fill(clip, m_foreground_color_rgb);
delete o->parm.fillRegion;
break;
}
case gOpcode::clear:
- m_pixmap->fill(m_current_clip, m_background_color);
+ if (m_pixmap->needClut())
+ m_pixmap->fill(m_current_clip, m_background_color);
+ else
+ m_pixmap->fill(m_current_clip, m_background_color_rgb);
delete o->parm.fill;
break;
case gOpcode::blit:
m_current_offset = o->parm.setOffset->value;
delete o->parm.setOffset;
break;
+ case gOpcode::waitVSync:
+ break;
+ case gOpcode::flip:
+ break;
case gOpcode::flush:
break;
default:
DEFINE_REF(gDC);
eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
-
git.cweiske.de / enigma2.git / blobdiff