X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2e0270746af934180499931f95ed91c444c8233e..42f5a704c8bd14f9bac30b61a76effaededc74e8:/lib/gdi/grc.h

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 7071425e..38caa107 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;
 
@@ -60,7 +61,9 @@ struct gOpcode
 		
 		enableSpinner, disableSpinner, incrementSpinner,
 		
-		shutdown
+		shutdown,
+		
+		setCompositing,
 	} opcode;
 
 	gDC *dc;
@@ -102,8 +105,8 @@ struct gOpcode
 		struct pblit
 		{
 			gPixmap *pixmap;
-			ePoint position;
 			int flags;
+			eRect position;
 			eRect clip;
 		} *blit;
 
@@ -137,6 +140,8 @@ struct gOpcode
 			ePoint value;
 			int rel;
 		} *setOffset;
+		
+		gCompositingData *setCompositing;
 	} parm;
 };
 
@@ -168,7 +173,10 @@ class gRC: public iObject, public Object
 	
 	void enableSpinner();
 	void disableSpinner();
+	
+	ePtr<gCompositingData> m_compositing;
 
+	int m_prev_idle_count;
 public:
 	gRC();
 	virtual ~gRC();
@@ -230,10 +238,12 @@ public:
 	enum
 	{
 		BT_ALPHATEST = 1,
-		BT_ALPHABLEND = 2
+		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);
@@ -252,6 +262,9 @@ public:
 	void waitVSync();
 	void flip();
 	void notify();
+	void setCompositing(gCompositingData *comp);
+	
+	void flush();
 };
 
 class gDC: public iObject
@@ -273,7 +286,7 @@ protected:
 	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();
@@ -283,10 +296,10 @@ public:
 	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);
+	virtual void enableSpinner();
+	virtual void disableSpinner();
+	virtual void incrementSpinner();
+	virtual void setSpinner(eRect pos, ePtr<gPixmap> *pic, int len);
 };
 
 #endif