X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ae3bc8673d79edecb8fcb918d83db011535b0955..684910d920f90134ade6dd3b944a749336a47029:/lib/gdi/grc.h

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 11355504..3b8201ad 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
@@ -23,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;
 
@@ -59,7 +59,11 @@ struct gOpcode
 		flip,
 		notify,
 		
-		shutdown
+		enableSpinner, disableSpinner, incrementSpinner,
+		
+		shutdown,
+		
+		setCompositing,
 	} opcode;
 
 	gDC *dc;
@@ -101,8 +105,8 @@ struct gOpcode
 		struct pblit
 		{
 			gPixmap *pixmap;
-			ePoint position;
 			int flags;
+			eRect position;
 			eRect clip;
 		} *blit;
 
@@ -136,16 +140,17 @@ struct gOpcode
 			ePoint value;
 			int rel;
 		} *setOffset;
+		
+		gCompositingData *setCompositing;
 	} 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 +167,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();
@@ -169,7 +184,9 @@ public:
 	void submit(const gOpcode &o);
 
 	Signal0<void> notify;
-
+	
+	void setSpinnerDC(gDC *dc) { m_spinner_dc = dc; }
+	
 	static gRC *getInstance();
 };
 
@@ -220,10 +237,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);
@@ -239,16 +259,17 @@ public:
 	void clip(const gRegion &clip);
 	void clippop();
 
-	void flush();
-	
 	void waitVSync();
 	void flip();
 	void notify();
+	void setCompositing(gCompositingData *comp);
+	
+	void flush();
 };
 
 class gDC: public iObject
 {
-DECLARE_REF(gDC);
+	DECLARE_REF(gDC);
 protected:
 	ePtr<gPixmap> m_pixmap;
 
@@ -260,6 +281,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 +295,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