summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Image.cc83
-rw-r--r--src/Image.hh1
-rw-r--r--src/Screen.cc2
-rw-r--r--src/Texture.cc13
-rw-r--r--src/Texture.hh35
5 files changed, 94 insertions, 40 deletions
diff --git a/src/Image.cc b/src/Image.cc
index 7aaeefaf..4b27d495 100644
--- a/src/Image.cc
+++ b/src/Image.cc
@@ -107,54 +107,57 @@ Pixmap BImage::render_solid(const BTexture &texture) {
XDrawLine(display, pixmap, peninterlace.gc(), 0, i, width, i);
}
- if (texture.texture() & BTexture::FlatBorder) {
- BPen penborder(texture.colorTo());
- XDrawRectangle(display, pixmap, penborder.gc(), 0, 0, width-1, height-1);
+ int left = 0, top = 0, right = width - 1, bottom = height - 1;
+
+ if (texture.texture() & BTexture::Border) {
+ BPen penborder(texture.borderColor());
+ XDrawRectangle(display, pixmap, penborder.gc(),
+ left, top, right, bottom);
}
if (texture.texture() & BTexture::Bevel1) {
if (texture.texture() & BTexture::Raised) {
XDrawLine(display, pixmap, penshadow.gc(),
- 0, height - 1, width - 1, height - 1);
+ left, bottom, right, bottom);
XDrawLine(display, pixmap, penshadow.gc(),
- width - 1, height - 1, width - 1, 0);
+ right, bottom, right, top);
XDrawLine(display, pixmap, penlight.gc(),
- 0, 0, width - 1, 0);
+ left, top, right, top);
XDrawLine(display, pixmap, penlight.gc(),
- 0, height - 1, 0, 0);
+ left, bottom, left, top);
} else if (texture.texture() & BTexture::Sunken) {
XDrawLine(display, pixmap, penlight.gc(),
- 0, height - 1, width - 1, height - 1);
+ left, bottom, right, bottom);
XDrawLine(display, pixmap, penlight.gc(),
- width - 1, height - 1, width - 1, 0);
+ right, bottom, right, top);
XDrawLine(display, pixmap, penshadow.gc(),
- 0, 0, width - 1, 0);
+ left, top, right, top);
XDrawLine(display, pixmap, penshadow.gc(),
- 0, height - 1, 0, 0);
+ left, bottom, left, top);
}
} else if (texture.texture() & BTexture::Bevel2) {
if (texture.texture() & BTexture::Raised) {
XDrawLine(display, pixmap, penshadow.gc(),
- 1, height - 3, width - 3, height - 3);
+ left + 1, bottom - 2, right - 2, bottom - 2);
XDrawLine(display, pixmap, penshadow.gc(),
- width - 3, height - 3, width - 3, 1);
+ right - 2, bottom - 2, right - 2, top + 1);
XDrawLine(display, pixmap, penlight.gc(),
- 1, 1, width - 3, 1);
+ left + 1, top + 1, right - 2, top + 1);
XDrawLine(display, pixmap, penlight.gc(),
- 1, height - 3, 1, 1);
+ left + 1, bottom - 2, left + 1, top + 1);
} else if (texture.texture() & BTexture::Sunken) {
XDrawLine(display, pixmap, penlight.gc(),
- 1, height - 3, width - 3, height - 3);
+ left + 1, bottom - 2, right - 2, bottom - 2);
XDrawLine(display, pixmap, penlight.gc(),
- width - 3, height - 3, width - 3, 1);
+ right - 2, bottom - 2, right - 2, top + 1);
XDrawLine(display, pixmap, penshadow.gc(),
- 1, 1, width - 3, 1);
+ left + 1, top + 1, right - 2, top + 1);
XDrawLine(display, pixmap, penshadow.gc(),
- 1, height - 3, 1, 1);
+ left + 1, bottom - 2, left + 1, top + 1);
}
}
@@ -193,6 +196,8 @@ Pixmap BImage::render_gradient(const BTexture &texture) {
if (texture.texture() & BTexture::Bevel1) bevel1();
else if (texture.texture() & BTexture::Bevel2) bevel2();
+ if (texture.texture() & BTexture::Border) border(texture);
+
if (inverted) invert();
return renderPixmap();
@@ -816,6 +821,46 @@ void BImage::bevel2(void) {
}
+void BImage::border(const BTexture &texture) {
+ register unsigned int i;
+ int r = texture.borderColor().red(),
+ g = texture.borderColor().green(),
+ b = texture.borderColor().blue();
+
+ unsigned char *pr, *pg, *pb;
+
+ // top line
+ pr = red;
+ pg = green;
+ pb = blue;
+ for (i = 0; i < width; ++i) {
+ *pr++ = r;
+ *pg++ = g;
+ *pb++ = b;
+ }
+
+ // left and right lines (pr,pg,pb are already lined up)
+ for (i = 1; i < height - 1; ++i) {
+ *pr = r;
+ *pg = g;
+ *pb = b;
+ pr += width - 1;
+ pg += width - 1;
+ pb += width - 1;
+ *pr++ = r;
+ *pg++ = g;
+ *pb++ = b;
+ }
+
+ // bottom line (pr,pg,pb are already lined up)
+ for (i = 0; i < width; ++i) {
+ *pr++ = r;
+ *pg++ = g;
+ *pb++ = b;
+ }
+}
+
+
void BImage::invert(void) {
register unsigned int i, j, wh = (width * height) - 1;
unsigned char tmp;
diff --git a/src/Image.hh b/src/Image.hh
index 33d2e5b8..94cb3c60 100644
--- a/src/Image.hh
+++ b/src/Image.hh
@@ -66,6 +66,7 @@ private:
void invert(void);
void bevel1(void);
void bevel2(void);
+ void border(const BTexture &texture);
void dgradient(void);
void egradient(void);
void hgradient(void);
diff --git a/src/Screen.cc b/src/Screen.cc
index 2722fe4b..6288b43f 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -2520,6 +2520,8 @@ BTexture BScreen::readDatabaseTexture(const string &rname,
texture.setColor(readDatabaseColor(rname + ".color", default_color, style));
texture.setColorTo(readDatabaseColor(rname + ".colorTo", default_color,
style));
+ texture.setBorderColor(readDatabaseColor(rname + ".borderColor",
+ default_color, style));
return texture;
}
diff --git a/src/Texture.cc b/src/Texture.cc
index 87825267..60923316 100644
--- a/src/Texture.cc
+++ b/src/Texture.cc
@@ -46,14 +46,14 @@ using std::string;
BTexture::BTexture(const BaseDisplay * const _display,
unsigned int _screen, BImageControl* _ctrl)
: c(_display, _screen), ct(_display, _screen),
- lc(_display, _screen), sc(_display, _screen), t(0),
+ lc(_display, _screen), sc(_display, _screen), bc(_display, _screen), t(0),
dpy(_display), ctrl(_ctrl), scrn(_screen) { }
BTexture::BTexture(const string &d, const BaseDisplay * const _display,
unsigned int _screen, BImageControl* _ctrl)
: c(_display, _screen), ct(_display, _screen),
- lc(_display, _screen), sc(_display, _screen), t(0),
+ lc(_display, _screen), sc(_display, _screen), bc(_display, _screen), t(0),
dpy(_display), ctrl(_ctrl), scrn(_screen) {
setDescription(d);
}
@@ -128,14 +128,15 @@ void BTexture::setDescription(const string &d) {
if (descr.find("sunken") != string::npos)
addTexture(BTexture::Sunken);
- else if (descr.find("flatborder") != string::npos)
- addTexture(BTexture::FlatBorder);
else if (descr.find("flat") != string::npos)
addTexture(BTexture::Flat);
else
addTexture(BTexture::Raised);
- if (! (texture() & (BTexture::Flat | BTexture::FlatBorder))) {
+ if (texture() & BTexture::Flat) {
+ if (descr.find("border") != string::npos)
+ addTexture(BTexture::Border);
+ } else {
if (descr.find("bevel2") != string::npos)
addTexture(BTexture::Bevel2);
else
@@ -160,6 +161,7 @@ void BTexture::setDisplay(const BaseDisplay * const _display,
ct.setDisplay(_display, _screen);
lc.setDisplay(_display, _screen);
sc.setDisplay(_display, _screen);
+ bc.setDisplay(_display, _screen);
}
@@ -168,6 +170,7 @@ BTexture& BTexture::operator=(const BTexture &tt) {
ct = tt.ct;
lc = tt.lc;
sc = tt.sc;
+ bc = tt.bc;
descr = tt.descr;
t = tt.t;
dpy = tt.dpy;
diff --git a/src/Texture.hh b/src/Texture.hh
index b0e2787e..24be5df1 100644
--- a/src/Texture.hh
+++ b/src/Texture.hh
@@ -35,24 +35,25 @@ public:
enum Type {
// bevel options
Flat = (1l<<0),
- FlatBorder = (1l<<1),
- Sunken = (1l<<2),
- Raised = (1l<<3),
+ Sunken = (1l<<1),
+ Raised = (1l<<2),
// textures
- Solid = (1l<<4),
- Gradient = (1l<<5),
+ Solid = (1l<<3),
+ Gradient = (1l<<4),
// gradients
- Horizontal = (1l<<6),
- Vertical = (1l<<7),
- Diagonal = (1l<<8),
- CrossDiagonal = (1l<<9),
- Rectangle = (1l<<10),
- Pyramid = (1l<<11),
- PipeCross = (1l<<12),
- Elliptic = (1l<<13),
+ Horizontal = (1l<<5),
+ Vertical = (1l<<6),
+ Diagonal = (1l<<7),
+ CrossDiagonal = (1l<<8),
+ Rectangle = (1l<<9),
+ Pyramid = (1l<<10),
+ PipeCross = (1l<<11),
+ Elliptic = (1l<<12),
// bevel types
- Bevel1 = (1l<<14),
- Bevel2 = (1l<<15),
+ Bevel1 = (1l<<13),
+ Bevel2 = (1l<<14),
+ // flat border
+ Border = (1l<<15),
// inverted image
Invert = (1l<<16),
// parent relative image
@@ -69,11 +70,13 @@ public:
void setColor(const BColor &_color);
void setColorTo(const BColor &_colorTo) { ct = _colorTo; }
+ void setBorderColor(const BColor &_borderColor) { bc = _borderColor; }
const BColor &color(void) const { return c; }
const BColor &colorTo(void) const { return ct; }
const BColor &lightColor(void) const { return lc; }
const BColor &shadowColor(void) const { return sc; }
+ const BColor &borderColor(void) const { return bc; }
unsigned long texture(void) const { return t; }
void setTexture(const unsigned long _texture) { t = _texture; }
@@ -98,7 +101,7 @@ public:
const Pixmap old = 0);
private:
- BColor c, ct, lc, sc;
+ BColor c, ct, lc, sc, bc;
std::string descr;
unsigned long t;
const BaseDisplay *dpy;
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-17 16:03:46 +0000