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

Updated texture constants

Browse source
This commit is contained in:
fluxgen 2001-12-29 11:39:34 +00:00
parent bc53e48abb
commit a29e46aa9f
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Slit.cc
View file

@ -310,7 +310,7 @@ void Slit::reconfigure(void) {
Pixmap tmp = frame.pixmap; Pixmap tmp = frame.pixmap;
BImageControl *image_ctrl = screen->getImageControl(); BImageControl *image_ctrl = screen->getImageControl();
BTexture *texture = &(screen->getToolbarStyle()->toolbar); BTexture *texture = &(screen->getToolbarStyle()->toolbar);
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
frame.pixmap = None; frame.pixmap = None;
XSetWindowBackground(display, frame.window, XSetWindowBackground(display, frame.window,
texture->getColor()->getPixel()); texture->getColor()->getPixel());

12
src/Tab.cc
View file

@ -165,9 +165,9 @@ void Tab::decorate() {
Pixmap tmp = m_focus_pm; Pixmap tmp = m_focus_pm;
BTexture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus); BTexture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus);
if (texture->getTexture() & BImage_ParentRelative ) { if (texture->getTexture() & BImage::PARENTRELATIVE ) {
BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus); BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus);
if (pt->getTexture() == (BImage_Flat | BImage_Solid)) { if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
m_focus_pm = None; m_focus_pm = None;
m_focus_pixel = pt->getColor()->getPixel(); m_focus_pixel = pt->getColor()->getPixel();
} else } else
@ -176,7 +176,7 @@ void Tab::decorate() {
if (tmp) image_ctrl->removeImage(tmp); if (tmp) image_ctrl->removeImage(tmp);
} else { } else {
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
m_focus_pm = None; m_focus_pm = None;
m_focus_pixel = texture->getColor()->getPixel(); m_focus_pixel = texture->getColor()->getPixel();
} else } else
@ -188,16 +188,16 @@ void Tab::decorate() {
tmp = m_unfocus_pm; tmp = m_unfocus_pm;
texture = &(m_win->getScreen()->getWindowStyle()->tab.l_unfocus); texture = &(m_win->getScreen()->getWindowStyle()->tab.l_unfocus);
if (texture->getTexture() & BImage_ParentRelative ) { if (texture->getTexture() & BImage::PARENTRELATIVE ) {
BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus); BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus);
if (pt->getTexture() == (BImage_Flat | BImage_Solid)) { if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
m_unfocus_pm = None; m_unfocus_pm = None;
m_unfocus_pixel = pt->getColor()->getPixel(); m_unfocus_pixel = pt->getColor()->getPixel();
} else } else
m_unfocus_pm = m_unfocus_pm =
image_ctrl->renderImage(m_size_w, m_size_h, pt); image_ctrl->renderImage(m_size_w, m_size_h, pt);
} else { } else {
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
m_unfocus_pm = None; m_unfocus_pm = None;
m_unfocus_pixel = texture->getColor()->getPixel(); m_unfocus_pixel = texture->getColor()->getPixel();
} else } else

8
src/Theme.cc
View file

@ -766,9 +766,9 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
&value)) &value))
m_imagecontrol->parseTexture(texture, value.addr); m_imagecontrol->parseTexture(texture, value.addr);
else else
texture->setTexture(BImage_Solid | BImage_Flat); texture->setTexture(BImage::SOLID | BImage::FLAT);
if (texture->getTexture() & BImage_Solid) { if (texture->getTexture() & BImage::SOLID) {
int clen = strlen(rclass) + 32, nlen = strlen(rname) + 32; int clen = strlen(rclass) + 32, nlen = strlen(rname) + 32;
char *colorclass = new char[clen], *colorname = new char[nlen]; char *colorclass = new char[clen], *colorname = new char[nlen];
@ -792,7 +792,7 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
delete [] colorname; delete [] colorname;
if ((! texture->getColor()->isAllocated()) || if ((! texture->getColor()->isAllocated()) ||
(texture->getTexture() & BImage_Flat)) (texture->getTexture() & BImage::FLAT))
return retval; return retval;
XColor xcol; XColor xcol;
@ -829,7 +829,7 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
xcol.pixel = 0; xcol.pixel = 0;
texture->getLoColor()->setPixel(xcol.pixel); texture->getLoColor()->setPixel(xcol.pixel);
} else if (texture->getTexture() & BImage_Gradient) { } else if (texture->getTexture() & BImage::GRADIENT) {
int clen = strlen(rclass) + 10, nlen = strlen(rname) + 10; int clen = strlen(rclass) + 10, nlen = strlen(rname) + 10;
char *colorclass = new char[clen], *colorname = new char[nlen], char *colorclass = new char[clen], *colorname = new char[nlen],

12
src/Toolbar.cc
View file

@ -391,7 +391,7 @@ void Toolbar::reconfigure(void) {
Pixmap tmp = frame.base; Pixmap tmp = frame.base;
BTexture *texture = &(screen->getToolbarStyle()->toolbar); BTexture *texture = &(screen->getToolbarStyle()->toolbar);
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
frame.base = None; frame.base = None;
XSetWindowBackground(display, frame.window, XSetWindowBackground(display, frame.window,
texture->getColor()->getPixel()); texture->getColor()->getPixel());
@ -404,7 +404,7 @@ void Toolbar::reconfigure(void) {
tmp = frame.label; tmp = frame.label;
texture = &(screen->getToolbarStyle()->window); texture = &(screen->getToolbarStyle()->window);
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
frame.label = None; frame.label = None;
XSetWindowBackground(display, frame.window_label, XSetWindowBackground(display, frame.window_label,
texture->getColor()->getPixel()); texture->getColor()->getPixel());
@ -417,7 +417,7 @@ void Toolbar::reconfigure(void) {
tmp = frame.wlabel; tmp = frame.wlabel;
texture = &(screen->getToolbarStyle()->label); texture = &(screen->getToolbarStyle()->label);
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
frame.wlabel = None; frame.wlabel = None;
XSetWindowBackground(display, frame.workspace_label, XSetWindowBackground(display, frame.workspace_label,
texture->getColor()->getPixel()); texture->getColor()->getPixel());
@ -430,7 +430,7 @@ void Toolbar::reconfigure(void) {
tmp = frame.clk; tmp = frame.clk;
texture = &(screen->getToolbarStyle()->clock); texture = &(screen->getToolbarStyle()->clock);
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
frame.clk = None; frame.clk = None;
XSetWindowBackground(display, frame.clock, XSetWindowBackground(display, frame.clock,
texture->getColor()->getPixel()); texture->getColor()->getPixel());
@ -443,7 +443,7 @@ void Toolbar::reconfigure(void) {
tmp = frame.button; tmp = frame.button;
texture = &(screen->getToolbarStyle()->button); texture = &(screen->getToolbarStyle()->button);
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
frame.button = None; frame.button = None;
frame.button_pixel = texture->getColor()->getPixel(); frame.button_pixel = texture->getColor()->getPixel();
@ -464,7 +464,7 @@ void Toolbar::reconfigure(void) {
tmp = frame.pbutton; tmp = frame.pbutton;
texture = &(screen->getToolbarStyle()->pressed); texture = &(screen->getToolbarStyle()->pressed);
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
frame.pbutton = None; frame.pbutton = None;
frame.pbutton_pixel = texture->getColor()->getPixel(); frame.pbutton_pixel = texture->getColor()->getPixel();
} else } else