X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1aeefd997cc362c3b37c1587c5f08891b35c3a75..94284f21b07f1756120e8b6f5dd53e485a9ff66d:/lib/gdi/grc.h

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 0f66ef08..53bf7f09 100644
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -11,12 +11,13 @@
 #include <stack>
 #include <list>
 
-#include <lib/base/estring.h>
+#include <string>
 #include <lib/base/ringbuffer.h>
 #include <lib/base/elock.h>
 #include <lib/gdi/erect.h>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
+#include <lib/gdi/gfont.h>
 
 class eTextPara;
 
@@ -29,7 +30,7 @@ struct gOpcode
 		renderPara,
 		setFont,
 		
-		fill, clear,
+		fill, fillRegion, clear,
 		blit,
 
 		setPalette,
@@ -40,10 +41,15 @@ struct gOpcode
 		setBackgroundColor,
 		setForegroundColor,
 		
+		setBackgroundColorRGB,
+		setForegroundColorRGB,
+		
 		setOffset,
 		
 		setClip, addClip, popClip,
 		
+		flush,
+		
 		end,shutdown
 	} opcode;
 
@@ -55,10 +61,15 @@ struct gOpcode
 			eRect area;
 		} *fill;
 
+		struct pfillRegion
+		{
+			gRegion region;
+		} *fillRegion;
+
 		struct prenderText
 		{
 			eRect area;
-			eString text;
+			std::string text;
 			int flags;
 		} *renderText;
 
@@ -106,6 +117,11 @@ struct gOpcode
 			gColor color;
 		} *setColor;
 		
+		struct psetColorRGB
+		{
+			gRGB color;
+		} *setColorRGB;
+		
 		struct psetOffset
 		{
 			ePoint value;
@@ -119,7 +135,7 @@ struct gOpcode
 		/* gRC is the singleton which controls the fifo and dispatches commands */
 class gRC: public iObject
 {
-DECLARE_REF;
+DECLARE_REF(gRC);
 private:
 	static gRC *instance;
 	
@@ -168,17 +184,38 @@ public:
 	void setBackgroundColor(const gColor &color);
 	void setForegroundColor(const gColor &color);
 
+	void setBackgroundColor(const gRGB &color);
+	void setForegroundColor(const gRGB &color);
+
 	void setFont(gFont *font);
+		/* flags only THESE: */
+	enum
+	{
+			// todo, make mask. you cannot align both right AND center AND block ;)
+		RT_HALIGN_LEFT = 0,  /* default */
+		RT_HALIGN_RIGHT = 1,
+		RT_HALIGN_CENTER = 2,
+		RT_HALIGN_BLOCK = 4,
+		
+		RT_VALIGN_TOP = 0,  /* default */
+		RT_VALIGN_CENTER = 8,
+		RT_VALIGN_BOTTOM = 16,
+		
+		RT_WRAP = 32
+	};
 	void renderText(const eRect &position, const std::string &string, int flags=0);
+	
 	void renderPara(eTextPara *para, ePoint offset=ePoint(0, 0));
 
 	void fill(const eRect &area);
+	void fill(const gRegion &area);
 	
 	void clear();
 	
 	void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
 
 	void setPalette(gRGB *colors, int start=0, int len=256);
+	void setPalette(gPixmap *source);
 	void mergePalette(gPixmap *target);
 	
 	void line(ePoint start, ePoint end);
@@ -196,7 +233,7 @@ public:
 
 class gDC: public iObject
 {
-DECLARE_REF;
+DECLARE_REF(gDC);
 protected:
 	ePtr<gPixmap> m_pixmap;
 
@@ -215,7 +252,7 @@ public:
 	gRegion &getClip() { return m_current_clip; }
 	int getPixmap(ePtr<gPixmap> &pm) { pm = m_pixmap; return 0; }
 	gRGB getRGB(gColor col);
-	virtual eSize getSize() { return m_pixmap->getSize(); }
+	virtual eSize size() { return m_pixmap->size(); }
 };
 
 #endif