nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed indentation and timer var

Browse source
This commit is contained in:
fluxgen 2002-03-19 00:04:36 +00:00
parent e6e1db0ad6
commit a29dd8e476
2 changed files with 1684 additions and 1700 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3143
src/Image.cc
View file

File diff suppressed because it is too large Load diff

241
src/Image.hh
View file

@ -16,16 +16,16 @@
// //
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // 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 // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // 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 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Image.hh,v 1.5 2002/02/17 18:57:47 fluxgen Exp $ // $Id: Image.hh,v 1.6 2002/03/19 00:04:36 fluxgen Exp $
#ifndef IMAGE_HH #ifndef IMAGE_HH
#define IMAGE_HH #define IMAGE_HH
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -41,86 +41,86 @@ class BImageControl;
class BColor { class BColor {
private: private:
int allocated; int allocated;
unsigned char red, green, blue; unsigned char red, green, blue;
unsigned long pixel; unsigned long pixel;
public: public:
BColor(char r = 0, char g = 0, char b = 0) BColor(char r = 0, char g = 0, char b = 0)
{ red = r; green = g; blue = b; pixel = 0; allocated = 0; } { red = r; green = g; blue = b; pixel = 0; allocated = 0; }
inline const int &isAllocated(void) const { return allocated; } inline const int &isAllocated(void) const { return allocated; }
inline const unsigned char &getRed(void) const { return red; } inline const unsigned char getRed(void) const { return red; }
inline const unsigned char &getGreen(void) const { return green; } inline const unsigned char getGreen(void) const { return green; }
inline const unsigned char &getBlue(void) const { return blue; } inline const unsigned char getBlue(void) const { return blue; }
inline const unsigned long &getPixel(void) const { return pixel; } inline const unsigned long getPixel(void) const { return pixel; }
inline void setAllocated(int a) { allocated = a; } inline void setAllocated(int a) { allocated = a; }
inline void setRGB(char r, char g, char b) { red = r; green = g; blue = b; } inline void setRGB(char r, char g, char b) { red = r; green = g; blue = b; }
inline void setPixel(unsigned long p) { pixel = p; } inline void setPixel(unsigned long p) { pixel = p; }
}; };
class BTexture { class BTexture {
private: private:
BColor color, colorTo, hiColor, loColor; BColor color, colorTo, hiColor, loColor;
unsigned long texture; unsigned long texture;
public: public:
BTexture(void) { texture = 0; } BTexture(void) { texture = 0; }
inline BColor *getColor(void) { return &color; } inline BColor *getColor(void) { return &color; }
inline BColor *getColorTo(void) { return &colorTo; } inline BColor *getColorTo(void) { return &colorTo; }
inline BColor *getHiColor(void) { return &hiColor; } inline BColor *getHiColor(void) { return &hiColor; }
inline BColor *getLoColor(void) { return &loColor; } inline BColor *getLoColor(void) { return &loColor; }
inline const unsigned long &getTexture(void) const { return texture; } inline const unsigned long getTexture(void) const { return texture; }
inline void setTexture(unsigned long t) { texture = t; } inline void setTexture(unsigned long t) { texture = t; }
inline void addTexture(unsigned long t) { texture |= t; } inline void addTexture(unsigned long t) { texture |= t; }
}; };
class BImage { class BImage {
private: private:
BImageControl *control; BImageControl *control;
#ifdef INTERLACE #ifdef INTERLACE
Bool interlaced; Bool interlaced;
#endif // INTERLACE #endif // INTERLACE
XColor *colors; XColor *colors;
BColor *from, *to; BColor *from, *to;
int red_offset, green_offset, blue_offset, red_bits, green_bits, blue_bits, int red_offset, green_offset, blue_offset, red_bits, green_bits, blue_bits,
ncolors, cpc, cpccpc; ncolors, cpc, cpccpc;
unsigned char *red, *green, *blue, *red_table, *green_table, *blue_table; unsigned char *red, *green, *blue, *red_table, *green_table, *blue_table;
unsigned int width, height, *xtable, *ytable; unsigned int width, height, *xtable, *ytable;
protected: protected:
Pixmap renderPixmap(void); Pixmap renderPixmap(void);
XImage *renderXImage(void); XImage *renderXImage(void);
void invert(void); void invert(void);
void bevel1(void); void bevel1(void);
void bevel2(void); void bevel2(void);
void dgradient(void); void dgradient(void);
void egradient(void); void egradient(void);
void hgradient(void); void hgradient(void);
void pgradient(void); void pgradient(void);
void rgradient(void); void rgradient(void);
void vgradient(void); void vgradient(void);
void cdgradient(void); void cdgradient(void);
void pcgradient(void); void pcgradient(void);
public: public:
enum Bevel{FLAT=0x00002, SUNKEN=0x00004, RAISED=0x00008}; enum Bevel{FLAT=0x00002, SUNKEN=0x00004, RAISED=0x00008};
enum Textures{SOLID=0x00010, GRADIENT=0x00020}; enum Textures{SOLID=0x00010, GRADIENT=0x00020};
enum Gradients{ enum Gradients{
HORIZONTAL=0x00040, HORIZONTAL=0x00040,
@ -141,93 +141,90 @@ public:
}; };
BImage(BImageControl *, unsigned int, unsigned int); BImage(BImageControl *, unsigned int, unsigned int);
~BImage(void); ~BImage(void);
Pixmap render(BTexture *); Pixmap render(BTexture *);
Pixmap render_solid(BTexture *); Pixmap render_solid(BTexture *);
Pixmap render_gradient(BTexture *); Pixmap render_gradient(BTexture *);
}; };
class BImageControl : public TimeoutHandler { class BImageControl : public TimeoutHandler {
public:
BImageControl(BaseDisplay *, ScreenInfo *, Bool = False, int = 4,
unsigned long = 300000l, unsigned long = 200l);
virtual ~BImageControl();
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; }
inline const Window &getDrawable(void) const { return window; }
inline Visual *getVisual(void) { return screeninfo->getVisual(); }
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 long getColor(const char *);
unsigned long getColor(const char *, unsigned char *, unsigned char *,
unsigned char *);
unsigned long getSqrt(unsigned int);
Pixmap renderImage(unsigned int, unsigned int, BTexture *);
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);
virtual void timeout(void);
private: private:
Bool dither; Bool dither;
BaseDisplay *basedisplay; BaseDisplay *basedisplay;
ScreenInfo *screeninfo; ScreenInfo *screeninfo;
#ifdef TIMEDCACHE #ifdef TIMEDCACHE
BTimer *timer; BTimer timer;
#endif // TIMEDCACHE #endif // TIMEDCACHE
Colormap colormap; Colormap colormap;
Window window; Window window;
XColor *colors; XColor *colors;
int colors_per_channel, ncolors, screen_number, screen_depth, int colors_per_channel, ncolors, screen_number, screen_depth,
bits_per_pixel, red_offset, green_offset, blue_offset, bits_per_pixel, red_offset, green_offset, blue_offset,
red_bits, green_bits, blue_bits; red_bits, green_bits, blue_bits;
unsigned char red_color_table[256], green_color_table[256], unsigned char red_color_table[256], green_color_table[256],
blue_color_table[256]; blue_color_table[256];
unsigned int *grad_xbuffer, *grad_ybuffer, grad_buffer_width, unsigned int *grad_xbuffer, *grad_ybuffer, grad_buffer_width,
grad_buffer_height; grad_buffer_height;
unsigned long *sqrt_table, cache_max; unsigned long *sqrt_table, cache_max;
typedef struct Cache { typedef struct Cache {
Pixmap pixmap; Pixmap pixmap;
unsigned int count, width, height; unsigned int count, width, height;
unsigned long pixel1, pixel2, texture; unsigned long pixel1, pixel2, texture;
} Cache; } Cache;
typedef std::list<Cache *> CacheList; typedef std::list<Cache *> CacheList;
CacheList cache;
CacheList cache;
protected: protected:
Pixmap searchCache(unsigned int, unsigned int, unsigned long, BColor *, Pixmap searchCache(unsigned int, unsigned int, unsigned long, BColor *, BColor *);
BColor *);
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; }
inline const Window &getDrawable(void) const { return window; }
inline Visual *getVisual(void) { return screeninfo->getVisual(); }
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 long getColor(const char *);
unsigned long getColor(const char *, unsigned char *, unsigned char *,
unsigned char *);
unsigned long getSqrt(unsigned int);
Pixmap renderImage(unsigned int, unsigned int, BTexture *);
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);
virtual void timeout(void);
}; };