X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fgdi%2Fgrc.h;h=7071425ef6ce7e968b96e239c35b4db5cc365e1f;hb=6bffe6f0ce6b00d792787c91cd609b72748287ae;hp=58371e790353ba3595a319f951473183f6dcc820;hpb=b887d75af86b430552cc28ea5e37bf58bd557d4b;p=vuplus_dvbapp

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 58371e7..7071425 100644
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -1,7 +1,6 @@
 #ifndef __grc_h
 #define __grc_h
 
-// #define SYNC_PAINT
 /*
 	gPainter ist die high-level version. die highlevel daten werden zu low level opcodes ueber
 	die gRC-queue geschickt und landen beim gDC der hardwarespezifisch ist, meist aber auf einen
@@ -59,6 +58,8 @@ struct gOpcode
 		flip,
 		notify,
 		
+		enableSpinner, disableSpinner, incrementSpinner,
+		
 		shutdown
 	} opcode;
 
@@ -78,7 +79,7 @@ struct gOpcode
 		struct prenderText
 		{
 			eRect area;
-			std::string text;
+			char *text;
 			int flags;
 		} *renderText;
 
@@ -139,13 +140,12 @@ struct gOpcode
 	} parm;
 };
 
-#define MAXSIZE 1024
+#define MAXSIZE 2048
 
 		/* gRC is the singleton which controls the fifo and dispatches commands */
 class gRC: public iObject, public Object
 {
-DECLARE_REF(gRC);
-private:
+	DECLARE_REF(gRC);
 	friend class gPainter;
 	static gRC *instance;
 
@@ -162,6 +162,13 @@ private:
 
 	eFixedMessagePump<int> m_notify_pump;
 	void recv_notify(const int &i);
+
+	ePtr<gDC> m_spinner_dc;
+	int m_spinner_enabled;
+	
+	void enableSpinner();
+	void disableSpinner();
+
 public:
 	gRC();
 	virtual ~gRC();
@@ -169,7 +176,9 @@ public:
 	void submit(const gOpcode &o);
 
 	Signal0<void> notify;
-
+	
+	void setSpinnerDC(gDC *dc) { m_spinner_dc = dc; }
+	
 	static gRC *getInstance();
 };
 
@@ -220,7 +229,8 @@ public:
 
 	enum
 	{
-		BT_ALPHATEST = 1
+		BT_ALPHATEST = 1,
+		BT_ALPHABLEND = 2
 	};
 
 	void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
@@ -239,8 +249,6 @@ public:
 	void clip(const gRegion &clip);
 	void clippop();
 
-	void flush();
-	
 	void waitVSync();
 	void flip();
 	void notify();
@@ -248,7 +256,7 @@ public:
 
 class gDC: public iObject
 {
-DECLARE_REF(gDC);
+	DECLARE_REF(gDC);
 protected:
 	ePtr<gPixmap> m_pixmap;
 
@@ -260,6 +268,10 @@ protected:
 	std::stack<gRegion> m_clip_stack;
 	gRegion m_current_clip;
 	
+	ePtr<gPixmap> m_spinner_saved, m_spinner_temp;
+	ePtr<gPixmap> *m_spinner_pic;
+	eRect m_spinner_pos;
+	int m_spinner_num, m_spinner_i;
 public:
 	virtual void exec(gOpcode *opcode);
 	gDC(gPixmap *pixmap);
@@ -270,6 +282,11 @@ public:
 	gRGB getRGB(gColor col);
 	virtual eSize size() { return m_pixmap->size(); }
 	virtual int islocked() { return 0; }
+	
+	void enableSpinner();
+	void disableSpinner();
+	void incrementSpinner();
+	void setSpinner(eRect pos, ePtr<gPixmap> *pic, int len);
 };
 
 #endif