X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/54b9e2790954b623c99823ab64782d4e39c128bf..aa052184a12e61d01983f8c9047183e6b0d499f3:/lib/gdi/grc.h?ds=sidebyside

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 82243483..fb9e2ea1 100644
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -7,12 +7,15 @@
 	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>
@@ -55,7 +58,7 @@ struct gOpcode
 		flip,
 		notify,
 		
-		end,shutdown
+		shutdown
 	} opcode;
 
 	gDC *dc;
@@ -74,7 +77,7 @@ struct gOpcode
 		struct prenderText
 		{
 			eRect area;
-			std::string text;
+			char *text;
 			int flags;
 		} *renderText;
 
@@ -135,6 +138,8 @@ struct gOpcode
 	} parm;
 };
 
+#define MAXSIZE 2048
+
 		/* gRC is the singleton which controls the fifo and dispatches commands */
 class gRC: public iObject, public Object
 {
@@ -142,34 +147,25 @@ 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;
 
@@ -189,7 +185,7 @@ class gPainter
 public:
 	gPainter(gDC *dc, eRect rect=eRect());
 	virtual ~gPainter();
-
+	
 	void setBackgroundColor(const gColor &color);
 	void setForegroundColor(const gColor &color);
 
@@ -220,7 +216,12 @@ 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);
@@ -251,6 +252,7 @@ protected:
 	ePtr<gPixmap> m_pixmap;
 
 	gColor m_foreground_color, m_background_color;
+	gRGB m_foreground_color_rgb, m_background_color_rgb;
 	ePtr<gFont> m_current_font;
 	ePoint m_current_offset;
 	
@@ -266,6 +268,7 @@ public:
 	int getPixmap(ePtr<gPixmap> &pm) { pm = m_pixmap; return 0; }
 	gRGB getRGB(gColor col);
 	virtual eSize size() { return m_pixmap->size(); }
+	virtual int islocked() { return 0; }
 };
 
 #endif