X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgdi%2Fgrc.h;h=e91e7e8dd3212b36380b5faa69de0653d1f731bd;hp=f931046a88016f1a79d96aaea1dcc953645aa1a1;hb=74f5884fdc5a23465cf40c27b5c069ff7d882746;hpb=7aa8a533ef0657eaa8e786384b3a3821a04c179f

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index f931046..e91e7e8 100644
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -22,6 +22,7 @@
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
 #include <lib/gdi/gfont.h>
+#include <lib/gdi/compositing.h>
 
 class eTextPara;
 
@@ -58,7 +59,18 @@ struct gOpcode
 		flip,
 		notify,
 		
-		shutdown
+		enableSpinner, disableSpinner, incrementSpinner,
+		
+		shutdown,
+		
+		setCompositing,
+		sendShow,
+		sendHide,
+#ifdef USE_LIBVUGLES2
+		sendShowItem,
+		setFlush,
+		setView,
+#endif
 	} opcode;
 
 	gDC *dc;
@@ -79,6 +91,8 @@ struct gOpcode
 			eRect area;
 			char *text;
 			int flags;
+			int border;
+			gRGB bordercolor;
 		} *renderText;
 
 		struct prenderPara
@@ -100,8 +114,8 @@ struct gOpcode
 		struct pblit
 		{
 			gPixmap *pixmap;
-			ePoint position;
 			int flags;
+			eRect position;
 			eRect clip;
 		} *blit;
 
@@ -135,16 +149,42 @@ struct gOpcode
 			ePoint value;
 			int rel;
 		} *setOffset;
+		
+		gCompositingData *setCompositing;
+
+		struct psetShowHideInfo
+		{
+			ePoint point;
+			eSize size;
+		} *setShowHideInfo;
+
+#ifdef USE_LIBVUGLES2
+		struct psetShowItemInfo
+		{
+			long dir;
+			ePoint point;
+			eSize size;
+		} *setShowItemInfo;
+
+		struct psetFlush
+		{
+			bool enable;
+		} *setFlush;
+
+		struct psetViewInfo
+		{
+			eSize size;
+		} *setViewInfo;
+#endif
 	} 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;
 
@@ -161,6 +201,16 @@ 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();
+	
+	ePtr<gCompositingData> m_compositing;
+
+	int m_prev_idle_count;
 public:
 	gRC();
 	virtual ~gRC();
@@ -168,7 +218,9 @@ public:
 	void submit(const gOpcode &o);
 
 	Signal0<void> notify;
-
+	
+	void setSpinnerDC(gDC *dc) { m_spinner_dc = dc; }
+	
 	static gRC *getInstance();
 };
 
@@ -208,7 +260,7 @@ public:
 		
 		RT_WRAP = 32
 	};
-	void renderText(const eRect &position, const std::string &string, int flags=0);
+	void renderText(const eRect &position, const std::string &string, int flags=0, gRGB bordercolor=gRGB(), int border=0);
 	
 	void renderPara(eTextPara *para, ePoint offset=ePoint(0, 0));
 
@@ -219,10 +271,13 @@ public:
 
 	enum
 	{
-		BT_ALPHATEST = 1
+		BT_ALPHATEST = 1,
+		BT_ALPHABLEND = 2,
+		BT_SCALE = 4 /* will be automatically set by blitScale */
 	};
 
-	void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
+	void blit(gPixmap *pixmap, ePoint pos, const eRect &clip=eRect(), int flags=0);
+	void blitScale(gPixmap *pixmap, const eRect &pos, const eRect &clip=eRect(), int flags=0, int aflags = BT_SCALE);
 
 	void setPalette(gRGB *colors, int start=0, int len=256);
 	void setPalette(gPixmap *source);
@@ -238,16 +293,24 @@ public:
 	void clip(const gRegion &clip);
 	void clippop();
 
-	void flush();
-	
 	void waitVSync();
 	void flip();
 	void notify();
+	void setCompositing(gCompositingData *comp);
+	
+	void flush();
+	void sendShow(ePoint point, eSize size);
+	void sendHide(ePoint point, eSize size);
+#ifdef USE_LIBVUGLES2
+	void sendShowItem(long dir, ePoint point, eSize size);
+	void setFlush(bool val);
+	void setView(eSize size);
+#endif
 };
 
 class gDC: public iObject
 {
-DECLARE_REF(gDC);
+	DECLARE_REF(gDC);
 protected:
 	ePtr<gPixmap> m_pixmap;
 
@@ -259,8 +322,12 @@ 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);
+	virtual void exec(const gOpcode *opcode);
 	gDC(gPixmap *pixmap);
 	gDC();
 	virtual ~gDC();
@@ -269,6 +336,11 @@ public:
 	gRGB getRGB(gColor col);
 	virtual eSize size() { return m_pixmap->size(); }
 	virtual int islocked() { return 0; }
+	
+	virtual void enableSpinner();
+	virtual void disableSpinner();
+	virtual void incrementSpinner();
+	virtual void setSpinner(eRect pos, ePtr<gPixmap> *pic, int len);
 };
 
 #endif