1 files changed, 146 insertions, 190 deletions

diff --git a/src/Image.hh b/src/Image.hh
index 3811e69..7ae8b36 100644
--- a/src/Image.hh
+++ b/src/Image.hh
@@ -1,3 +1,6 @@
+// Image.hh for Fluxbox Window Manager
+// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxbox@linuxmail.org)
+//
 // Image.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -13,230 +16,183 @@
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   _IMAGE_HH_
-#define   _IMAGE_HH_
+// $Id: Image.hh,v 1.11 2002/08/04 15:55:13 fluxgen Exp $
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+#ifndef  IMAGE_HH
+#define  IMAGE_HH
 
 #include "Timer.hh"
+#include "BaseDisplay.hh"
+#include "Color.hh"
+#include "Texture.hh"
 
-class BImage;
-class BImageControl;
-
-
-class BColor {
-private:
-  int allocated;
-  unsigned char red, green, blue;
-  unsigned long pixel;
-
-public:
-  BColor(char r = 0, char g = 0, char b = 0)
-    { red = r; green = g; blue = b; pixel = 0; allocated = 0; }
-
-  inline const int &isAllocated(void) const { return allocated; }
-
-  inline const unsigned char &getRed(void) const { return red; }
-  inline const unsigned char &getGreen(void) const { return green; }
-  inline const unsigned char &getBlue(void) const { return blue; }
-
-  inline const unsigned long &getPixel(void) const { return pixel; }
-
-  inline void setAllocated(int a) { allocated = a; }
-  inline void setRGB(char r, char g, char b) { red = r; green = g; blue = b; }
-  inline void setPixel(unsigned long p) { pixel = p; }
-};
-
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <list>
 
-class BTexture {
-private:
-  BColor color, colorTo, hiColor, loColor;
-  unsigned long texture;
+class BImageControl;
 
+/**
+        Renders to pixmap
+*/
+class BImage {
 public:
-  BTexture(void) { texture = 0; }
-
-  inline BColor *getColor(void) { return &color; }
-  inline BColor *getColorTo(void) { return &colorTo; }
-  inline BColor *getHiColor(void) { return &hiColor; }
-  inline BColor *getLoColor(void) { return &loColor; }
-
-  inline const unsigned long &getTexture(void) const { return texture; }
-
-  inline void setTexture(unsigned long t) { texture = t; }
-  inline void addTexture(unsigned long t) { texture |= t; }
-};
-
-
-// bevel options
-#define BImage_Flat             (1l<<1)
-#define BImage_Sunken           (1l<<2)
-#define BImage_Raised           (1l<<3)
-
-// textures
-#define BImage_Solid            (1l<<4)
-#define BImage_Gradient         (1l<<5)
-
-// gradients
-#define BImage_Horizontal       (1l<<6)
-#define BImage_Vertical         (1l<<7)
-#define BImage_Diagonal         (1l<<8)
-#define BImage_CrossDiagonal    (1l<<9)
-#define BImage_Rectangle        (1l<<10)
-#define BImage_Pyramid          (1l<<11)
-#define BImage_PipeCross        (1l<<12)
-#define BImage_Elliptic         (1l<<13)
-
-// bevel types
-#define BImage_Bevel1           (1l<<14)
-#define BImage_Bevel2           (1l<<15)
-
-// inverted image
-#define BImage_Invert           (1l<<16)
-
-// parent relative image
-#define BImage_ParentRelative   (1l<<17)
-
-#ifdef    INTERLACE
-// fake interlaced image
-#  define BImage_Interlaced     (1l<<18)
-#endif // INTERLACE
-
-#include "BaseDisplay.hh"
-#include "LinkedList.hh"
+        BImage(BImageControl *ic, unsigned int, unsigned int);
+        ~BImage();
+        /// render to pixmap
+        Pixmap render(const FbTk::Texture *src_texture);
+        /// render solid texture to pixmap
+        Pixmap renderSolid(const FbTk::Texture *src_texture);
+        /// render gradient texture to pixmap
+        Pixmap renderGradient(const FbTk::Texture *src_texture);
 
+protected:
+        /**
+                Render to pixmap
+                @return rendered pixmap
+        */
+        Pixmap renderPixmap();
+        /**
+                Render to XImage
+                @returns allocated and rendered XImage, user is responsible to deallocate
+        */
+        XImage *renderXImage();
+        /**
+                @name render functions
+        */
+        //@{
+        void invert();
+        void bevel1();
+        void bevel2();
+        void dgradient();
+        void egradient();
+        void hgradient();
+        void pgradient();
+        void rgradient();
+        void vgradient();
+        void cdgradient();
+        void pcgradient();
+        //@}
 
-class BImage {
 private:
-  BImageControl *control;
+        BImageControl *control;
 
-#ifdef    INTERLACE
-  Bool interlaced;
+#ifdef          INTERLACE
+        bool interlaced;
 #endif // INTERLACE
 
-  XColor *colors;
-
-  BColor *from, *to;
-  int red_offset, green_offset, blue_offset, red_bits, green_bits, blue_bits,
-    ncolors, cpc, cpccpc;
-  unsigned char *red, *green, *blue, *red_table, *green_table, *blue_table;
-  unsigned int width, height, *xtable, *ytable;
-
-
-protected:
-  Pixmap renderPixmap(void);
-
-  XImage *renderXImage(void);
-
-  void invert(void);
-  void bevel1(void);
-  void bevel2(void);
-  void dgradient(void);
-  void egradient(void);
-  void hgradient(void);
-  void pgradient(void);
-  void rgradient(void);
-  void vgradient(void);
-  void cdgradient(void);
-  void pcgradient(void);
-
-
-public:
-  BImage(BImageControl *, unsigned int, unsigned int);
-  ~BImage(void);
+        XColor *colors; // color table
 
-  Pixmap render(BTexture *);
-  Pixmap render_solid(BTexture *);
-  Pixmap render_gradient(BTexture *);
+        const FbTk::Color *from, *to;
+        int red_offset, green_offset, blue_offset, red_bits, green_bits, blue_bits,
+                ncolors, cpc, cpccpc;
+        unsigned char *red, *green, *blue, *red_table, *green_table, *blue_table;
+        unsigned int width, height, *xtable, *ytable;
 };
 
-
+/**
+        Holds screen info and color tables      
+*/
 class BImageControl : public TimeoutHandler {
-private:
-  Bool dither;
-  BaseDisplay *basedisplay;
-  ScreenInfo *screeninfo;
-#ifdef    TIMEDCACHE
-  BTimer *timer;
-#endif // TIMEDCACHE
-
-  Colormap colormap;
-
-  Window window;
-  XColor *colors;
-  int colors_per_channel, ncolors, screen_number, screen_depth,
-    bits_per_pixel, red_offset, green_offset, blue_offset,
-    red_bits, green_bits, blue_bits;
-  unsigned char red_color_table[256], green_color_table[256],
-    blue_color_table[256];
-  unsigned int *grad_xbuffer, *grad_ybuffer, grad_buffer_width,
-    grad_buffer_height;
-  unsigned long *sqrt_table, cache_max;
-
-  typedef struct Cache {
-    Pixmap pixmap;
-
-    unsigned int count, width, height;
-    unsigned long pixel1, pixel2, texture;
-  } Cache;
-
-  LinkedList<Cache> *cache;
-
+public:
+        BImageControl(BaseDisplay *disp, ScreenInfo *screen, bool = False, int = 4,
+                unsigned long = 300000l, unsigned long = 200l);
+        virtual ~BImageControl();
+
+        inline BaseDisplay *baseDisplay() { return basedisplay; }
+
+        inline bool doDither() { return dither; }
+        inline const Colormap &colormap() const { return m_colormap; }
+        inline const ScreenInfo *getScreenInfo() const { return screeninfo; }
+        inline Window drawable() const { return window; }
+        
+        /// @return visual of screen
+        inline Visual *visual() { return screeninfo->getVisual(); }
+        /// @return Bits per pixel of screen
+        inline int bitsPerPixel() const { return bits_per_pixel; }
+        /// @return depth of screen
+        inline int depth() const { return screen_depth; }
+        inline int colorsPerChannel() const     { return colors_per_channel; }
+
+        unsigned long color(const char *colorname);
+        unsigned long color(const char *, unsigned char *, unsigned char *,
+                                                                                                 unsigned char *);
+        unsigned long getSqrt(unsigned int val);
+        /**
+                Render to pixmap
+                @param width width of pixmap
+                @param height height of pixmap
+                @param src_texture texture type to render
+                @return pixmap of the rendered image, on failure None
+        */
+        Pixmap renderImage(unsigned int width, unsigned int height,
+                const FbTk::Texture *src_texture);
+
+        void installRootColormap();
+        void removeImage(Pixmap thepix);
+        void colorTables(unsigned char **, unsigned char **, unsigned char **,
+                        int *, int *, int *, int *, int *, int *);
+        void getXColorTable(XColor **, int *);
+        void getGradientBuffers(unsigned int, unsigned int,
+                        unsigned int **, unsigned int **);
+        void setDither(bool d) { dither = d; }
+        void setColorsPerChannel(int cpc);
+        void parseTexture(FbTk::Texture *ret_texture, const char *sval);
+        void parseColor(FbTk::Color *ret_color, const char *sval = 0);
+
+        virtual void timeout();
 
 protected:
-  Pixmap searchCache(unsigned int, unsigned int, unsigned long, BColor *,
-                     BColor *);
+        /** 
+                Search cache for a specific pixmap
+                @return None if no cache was found
+        */
+        Pixmap searchCache(unsigned int width, unsigned int height, unsigned long texture_type, 
+                const FbTk::Color &color, const FbTk::Color &color_to);
 
+private:
+        bool dither;
+        BaseDisplay *basedisplay;
+        ScreenInfo *screeninfo;
+#ifdef          TIMEDCACHE
+        BTimer timer;
+#endif // TIMEDCACHE
 
-public:
-  BImageControl(BaseDisplay *, ScreenInfo *, Bool = False, int = 4,
-                unsigned long = 300000l, unsigned long = 200l);
-  virtual ~BImageControl(void);
-
-  inline BaseDisplay *getBaseDisplay(void) { return basedisplay; }
-
-  inline const Bool &doDither(void) { return dither; }
-  inline const Colormap &getColormap(void) const { return colormap; }
-  inline ScreenInfo *getScreenInfo(void) { return screeninfo; }
+        Colormap m_colormap;
 
-  inline const Window &getDrawable(void) const { return window; }
+        Window window;
+        XColor *colors; ///< color table
 
-  inline Visual *getVisual(void) { return screeninfo->getVisual(); }
+        int colors_per_channel, ncolors, screen_number, screen_depth,
+                bits_per_pixel, red_offset, green_offset, blue_offset,
+                red_bits, green_bits, blue_bits;
 
-  inline const int &getBitsPerPixel(void) const { return bits_per_pixel; }
-  inline const int &getDepth(void) const { return screen_depth; }
-  inline const int &getColorsPerChannel(void) const
-    { return colors_per_channel; }
+        unsigned char red_color_table[256], green_color_table[256],
+                blue_color_table[256];
+        unsigned int *grad_xbuffer, *grad_ybuffer, grad_buffer_width,
+                grad_buffer_height;
 
-  unsigned long getColor(const char *);
-  unsigned long getColor(const char *, unsigned char *, unsigned char *,
-                         unsigned char *);
-  unsigned long getSqrt(unsigned int);
+        static unsigned long *sqrt_table; /// sqrt lookup table
 
-  Pixmap renderImage(unsigned int, unsigned int, BTexture *);
+        typedef struct Cache {
+                Pixmap pixmap;
 
-  void installRootColormap(void);
-  void removeImage(Pixmap);
-  void getColorTables(unsigned char **, unsigned char **, unsigned char **,
-                      int *, int *, int *, int *, int *, int *);
-  void getXColorTable(XColor **, int *);
-  void getGradientBuffers(unsigned int, unsigned int,
-                          unsigned int **, unsigned int **);
-  void setDither(Bool d) { dither = d; }
-  void setColorsPerChannel(int);
-  void parseTexture(BTexture *, char *);
-  void parseColor(BColor *, char * = 0);
+                unsigned int count, width, height;
+                unsigned long pixel1, pixel2, texture;
+        } Cache;
+        
+        unsigned long cache_max;
+        typedef std::list<Cache *> CacheList;
 
-  virtual void timeout(void);
+        CacheList cache;
 };
 
 
-#endif // __Image_hh
+#endif // IMAGE_HH