X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ab5aa90e1e05a89845c6e802ef1b2366d203aa45..fe407814f6b929a5cb2b396557f0ba0dd0c099d3:/lib/gdi/grc.h

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 8de5dadf..a5974972 100644
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -7,13 +7,17 @@
 	gPixmap aufsetzt (und damit unbeschleunigt ist).
 */
 
+// for debugging use:
+//#define SYNC_PAINT
+#undef SYNC_PAINT
+
 #include <pthread.h>
 #include <stack>
 #include <list>
 
 #include <string>
-#include <lib/base/ringbuffer.h>
 #include <lib/base/elock.h>
+#include <lib/base/message.h>
 #include <lib/gdi/erect.h>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
@@ -41,13 +45,20 @@ struct gOpcode
 		setBackgroundColor,
 		setForegroundColor,
 		
+		setBackgroundColorRGB,
+		setForegroundColorRGB,
+		
 		setOffset,
 		
 		setClip, addClip, popClip,
 		
 		flush,
 		
-		end,shutdown
+		waitVSync,
+		flip,
+		notify,
+		
+		shutdown
 	} opcode;
 
 	gDC *dc;
@@ -114,47 +125,49 @@ struct gOpcode
 			gColor color;
 		} *setColor;
 		
+		struct psetColorRGB
+		{
+			gRGB color;
+		} *setColorRGB;
+		
 		struct psetOffset
 		{
 			ePoint value;
 			int rel;
 		} *setOffset;
 	} parm;
-
-	int flags;
 };
 
+#define MAXSIZE 1024
+
 		/* gRC is the singleton which controls the fifo and dispatches commands */
-class gRC: public iObject
+class gRC: public iObject, public Object
 {
 DECLARE_REF(gRC);
 private:
+	friend class gPainter;
 	static gRC *instance;
-	
+
+#ifndef SYNC_PAINT
 	static void *thread_wrapper(void *ptr);
 	pthread_t the_thread;
+	pthread_mutex_t mutex;
+	pthread_cond_t cond;
+#endif
 	void *thread();
 
-	queueRingBuffer<gOpcode> queue;
+	gOpcode queue[MAXSIZE];
+	int rp, wp;
+
+	eFixedMessagePump<int> m_notify_pump;
+	void recv_notify(const int &i);
 public:
-	eLock queuelock;
 	gRC();
 	virtual ~gRC();
 
-	void submit(const gOpcode &o)
-	{
-		static int collected=0;
-		queue.enqueue(o);
-		collected++;
-//		if (o.opcode==gOpcode::end||o.opcode==gOpcode::shutdown)
-		{
-			queuelock.unlock(collected);
-#ifdef SYNC_PAINT
-			thread();
-#endif
-			collected=0;
-		}
-	}
+	void submit(const gOpcode &o);
+
+	Signal0<void> notify;
 
 	static gRC *getInstance();
 };
@@ -176,6 +189,9 @@ public:
 	void setBackgroundColor(const gColor &color);
 	void setForegroundColor(const gColor &color);
 
+	void setBackgroundColor(const gRGB &color);
+	void setForegroundColor(const gRGB &color);
+
 	void setFont(gFont *font);
 		/* flags only THESE: */
 	enum
@@ -200,10 +216,16 @@ public:
 	void fill(const gRegion &area);
 	
 	void clear();
-	
+
+	enum
+	{
+		BT_ALPHATEST = 1
+	};
+
 	void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
 
 	void setPalette(gRGB *colors, int start=0, int len=256);
+	void setPalette(gPixmap *source);
 	void mergePalette(gPixmap *target);
 	
 	void line(ePoint start, ePoint end);
@@ -217,6 +239,10 @@ public:
 	void clippop();
 
 	void flush();
+	
+	void waitVSync();
+	void flip();
+	void notify();
 };
 
 class gDC: public iObject
@@ -240,7 +266,8 @@ public:
 	gRegion &getClip() { return m_current_clip; }
 	int getPixmap(ePtr<gPixmap> &pm) { pm = m_pixmap; return 0; }
 	gRGB getRGB(gColor col);
-	virtual eSize getSize() { return m_pixmap->getSize(); }
+	virtual eSize size() { return m_pixmap->size(); }
+	virtual int islocked() { return 0; }
 };
 
 #endif