initial upload to branch 'touchcol'. see file 'HISTORY' for changes

1 files changed, 86 insertions, 21 deletions

diff --git a/glcdgraphics/bitmap.h b/glcdgraphics/bitmap.h
index b6446a0..d87745d 100644
--- a/glcdgraphics/bitmap.h
+++ b/glcdgraphics/bitmap.h
@@ -9,22 +9,70 @@
  * This file is released under the GNU General Public License. Refer
  * to the COPYING file distributed with this package.
  *
- * (c) 2004 Andreas Regel <andreas.regel AT powarman.de>
+ * (c) 2004-2010 Andreas Regel <andreas.regel AT powarman.de>
+ * (c) 2010-2011 Wolfgang Astleitner <mrwastl AT users sourceforge net>
+ *               Andreas 'randy' Weinberger 
  */
 
 #ifndef _GLCDGRAPHICS_BITMAP_H_
 #define _GLCDGRAPHICS_BITMAP_H_
 
 #include <string>
+#include <inttypes.h>
+
+// graphlcd-base uses ARGB bitmaps instead of 1bit ones
+#define GRAPHLCD_CBITMAP_ARGB
 
 namespace GLCD
 {
 
+#if 0
 enum eColor
 {
-    clrBlack,
-    clrWhite
+   clrTransparent,
+   clrGray50,
+   clrBlack,
+   clrRed,
+   clrGreen,
+   clrYellow,
+   clrMagenta,
+   clrBlue,
+   clrCyan,
+   clrWhite                  
 };
+#endif
+
+
+class cColor
+{
+public:
+   uint32_t color;
+
+   cColor(uint32_t col) { color = col; }
+   cColor(const cColor & col) { color = col.color; }
+
+   static const uint32_t Black       = 0xFF000000;
+   static const uint32_t White       = 0xFFFFFFFF;
+   static const uint32_t Red         = 0xFFFF0000;
+   static const uint32_t Green       = 0xFF00FF00;
+   static const uint32_t Blue        = 0xFF0000FF;
+   static const uint32_t Magenta     = 0xFFFF00FF;
+   static const uint32_t Cyan        = 0xFF00FFFF;
+   static const uint32_t Yellow      = 0xFFFFFF00;
+   static const uint32_t Transparent = 0x00FFFFFF;
+   static const uint32_t ERRCOL      = 0x00000000;
+
+   operator uint32_t(void) { return color; }
+
+   uint32_t GetColor (void)         { return color; }
+   void     SetColor (uint32_t col) { color = col; }
+
+   cColor Invert   (void);
+
+   static cColor ParseColor (std::string col);
+   static uint32_t AlignAlpha  (uint32_t col) { return (col & 0xFF000000) ? col : (col | 0xFF000000); }
+};
+
 
 class cFont;
 
@@ -34,37 +82,54 @@ protected:
     int width;
     int height;
     int lineSize;
-    unsigned char * bitmap;
+    uint32_t * bitmap;
+    bool ismonochrome;
+
+    uint32_t backgroundColor;
 
 public:
-    cBitmap(int width, int height, unsigned char * data = NULL);
+    cBitmap(int width, int height, uint32_t * data = NULL);
+    cBitmap(int width, int height, uint32_t initcol);
     cBitmap(const cBitmap & b);
     ~cBitmap();
 
     int Width() const { return width; }
     int Height() const { return height; }
     int LineSize() const { return lineSize; }
-    const unsigned char * Data() const { return bitmap; }
+    const uint32_t * Data() const { return bitmap; }
 
-    void Clear();
+    void Clear(uint32_t initcol = cColor::Transparent);
     void Invert();
-    void DrawPixel(int x, int y, eColor color);
-    void Draw8Pixels(int x, int y, unsigned char pixels, eColor color);
-    void DrawLine(int x1, int y1, int x2, int y2, eColor color);
-    void DrawHLine(int x1, int y, int x2, eColor color);
-    void DrawVLine(int x, int y1, int y2, eColor color);
-    void DrawRectangle(int x1, int y1, int x2, int y2, eColor color, bool filled);
-    void DrawRoundRectangle(int x1, int y1, int x2, int y2, eColor color, bool filled, int size);
-    void DrawEllipse(int x1, int y1, int x2, int y2, eColor color, bool filled, int quadrants);
-    void DrawSlope(int x1, int y1, int x2, int y2, eColor color, int type);
-    void DrawBitmap(int x, int y, const cBitmap & bitmap, eColor color);
+    void DrawPixel(int x, int y, uint32_t color);
+    void DrawLine(int x1, int y1, int x2, int y2, uint32_t color);
+    void DrawHLine(int x1, int y, int x2, uint32_t color);
+    void DrawVLine(int x, int y1, int y2, uint32_t color);
+    void DrawRectangle(int x1, int y1, int x2, int y2, uint32_t color, bool filled);
+    void DrawRoundRectangle(int x1, int y1, int x2, int y2, uint32_t color, bool filled, int size);
+    void DrawEllipse(int x1, int y1, int x2, int y2, uint32_t color, bool filled, int quadrants);
+    void DrawSlope(int x1, int y1, int x2, int y2, uint32_t color, int type);
+    void DrawBitmap(int x, int y, const cBitmap & bitmap, uint32_t color = cColor::White, uint32_t bgcolor = cColor::Black);
     int DrawText(int x, int y, int xmax, const std::string & text, const cFont * font,
-                 eColor color = clrBlack, bool proportional = true, int skipPixels = 0);
-    int DrawCharacter(int x, int y, int xmax, char c, const cFont * font,
-                      eColor color = clrBlack, int skipPixels = 0);
+                 uint32_t color = cColor::White, uint32_t bgcolor = cColor::Black, bool proportional = true, int skipPixels = 0);
+    int DrawCharacter(int x, int y, int xmax, uint32_t c, const cFont * font,
+                      uint32_t color = cColor::White, uint32_t bgcolor = cColor::Black, int skipPixels = 0);
 
     cBitmap * SubBitmap(int x1, int y1, int x2, int y2) const;
-    unsigned char GetPixel(int x, int y) const;
+    uint32_t GetPixel(int x, int y) const;
+
+    void SetMonochrome(bool mono) { ismonochrome = mono; }
+    bool IsMonochrome(void) const { return ismonochrome; }
+
+#if 0
+    int DrawText(int x, int y, int xmax, const std::string & text, const cFont * font,
+                 uint32_t color, bool proportional = true, int skipPixels = 0) {
+        return DrawText(x, y, xmax, text, font, color, cColor::Black, proportional, skipPixels);
+    }
+    int DrawCharacter(int x, int y, int xmax, char c, const cFont * font,
+                      uint32_t color, int skipPixels = 0) {
+        return DrawCharacter(x, y, xmax, c, font, color, cColor::Black, skipPixels);
+    }
+#endif
 
     bool LoadPBM(const std::string & fileName);
     void SavePBM(const std::string & fileName);