aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2001-12-29 11:39:34 (GMT)
committerfluxgen <fluxgen>2001-12-29 11:39:34 (GMT)
commita29e46aa9fa5f686d5ef8815df29f56ff6c04cca (patch)
treeb5365f6d4d522fcbe56f20564a9f3e4164c0e8e0
parentbc53e48abb2889e8fbaf99c52ca23d1fc354b9f3 (diff)
downloadfluxbox_paul-a29e46aa9fa5f686d5ef8815df29f56ff6c04cca.zip
fluxbox_paul-a29e46aa9fa5f686d5ef8815df29f56ff6c04cca.tar.bz2
Updated texture constants
-rw-r--r--src/Slit.cc2
-rw-r--r--src/Tab.cc12
-rw-r--r--src/Theme.cc8
-rw-r--r--src/Toolbar.cc12
4 files changed, 17 insertions, 17 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index 379fdaa..74eb8a1 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -310,7 +310,7 @@ void Slit::reconfigure(void) {
310 Pixmap tmp = frame.pixmap; 310 Pixmap tmp = frame.pixmap;
311 BImageControl *image_ctrl = screen->getImageControl(); 311 BImageControl *image_ctrl = screen->getImageControl();
312 BTexture *texture = &(screen->getToolbarStyle()->toolbar); 312 BTexture *texture = &(screen->getToolbarStyle()->toolbar);
313 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 313 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
314 frame.pixmap = None; 314 frame.pixmap = None;
315 XSetWindowBackground(display, frame.window, 315 XSetWindowBackground(display, frame.window,
316 texture->getColor()->getPixel()); 316 texture->getColor()->getPixel());
diff --git a/src/Tab.cc b/src/Tab.cc
index 2acc081..f426c0e 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -165,9 +165,9 @@ void Tab::decorate() {
165 Pixmap tmp = m_focus_pm; 165 Pixmap tmp = m_focus_pm;
166 BTexture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus); 166 BTexture *texture = &(m_win->getScreen()->getWindowStyle()->tab.l_focus);
167 167
168 if (texture->getTexture() & BImage_ParentRelative ) { 168 if (texture->getTexture() & BImage::PARENTRELATIVE ) {
169 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus); 169 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus);
170 if (pt->getTexture() == (BImage_Flat | BImage_Solid)) { 170 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
171 m_focus_pm = None; 171 m_focus_pm = None;
172 m_focus_pixel = pt->getColor()->getPixel(); 172 m_focus_pixel = pt->getColor()->getPixel();
173 } else 173 } else
@@ -176,7 +176,7 @@ void Tab::decorate() {
176 if (tmp) image_ctrl->removeImage(tmp); 176 if (tmp) image_ctrl->removeImage(tmp);
177 177
178 } else { 178 } else {
179 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 179 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
180 m_focus_pm = None; 180 m_focus_pm = None;
181 m_focus_pixel = texture->getColor()->getPixel(); 181 m_focus_pixel = texture->getColor()->getPixel();
182 } else 182 } else
@@ -188,16 +188,16 @@ void Tab::decorate() {
188 tmp = m_unfocus_pm; 188 tmp = m_unfocus_pm;
189 texture = &(m_win->getScreen()->getWindowStyle()->tab.l_unfocus); 189 texture = &(m_win->getScreen()->getWindowStyle()->tab.l_unfocus);
190 190
191 if (texture->getTexture() & BImage_ParentRelative ) { 191 if (texture->getTexture() & BImage::PARENTRELATIVE ) {
192 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus); 192 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus);
193 if (pt->getTexture() == (BImage_Flat | BImage_Solid)) { 193 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
194 m_unfocus_pm = None; 194 m_unfocus_pm = None;
195 m_unfocus_pixel = pt->getColor()->getPixel(); 195 m_unfocus_pixel = pt->getColor()->getPixel();
196 } else 196 } else
197 m_unfocus_pm = 197 m_unfocus_pm =
198 image_ctrl->renderImage(m_size_w, m_size_h, pt); 198 image_ctrl->renderImage(m_size_w, m_size_h, pt);
199 } else { 199 } else {
200 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 200 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
201 m_unfocus_pm = None; 201 m_unfocus_pm = None;
202 m_unfocus_pixel = texture->getColor()->getPixel(); 202 m_unfocus_pixel = texture->getColor()->getPixel();
203 } else 203 } else
diff --git a/src/Theme.cc b/src/Theme.cc
index ac9f4dc..765be80 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -766,9 +766,9 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
766 &value)) 766 &value))
767 m_imagecontrol->parseTexture(texture, value.addr); 767 m_imagecontrol->parseTexture(texture, value.addr);
768 else 768 else
769 texture->setTexture(BImage_Solid | BImage_Flat); 769 texture->setTexture(BImage::SOLID | BImage::FLAT);
770 770
771 if (texture->getTexture() & BImage_Solid) { 771 if (texture->getTexture() & BImage::SOLID) {
772 int clen = strlen(rclass) + 32, nlen = strlen(rname) + 32; 772 int clen = strlen(rclass) + 32, nlen = strlen(rname) + 32;
773 773
774 char *colorclass = new char[clen], *colorname = new char[nlen]; 774 char *colorclass = new char[clen], *colorname = new char[nlen];
@@ -792,7 +792,7 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
792 delete [] colorname; 792 delete [] colorname;
793 793
794 if ((! texture->getColor()->isAllocated()) || 794 if ((! texture->getColor()->isAllocated()) ||
795 (texture->getTexture() & BImage_Flat)) 795 (texture->getTexture() & BImage::FLAT))
796 return retval; 796 return retval;
797 797
798 XColor xcol; 798 XColor xcol;
@@ -829,7 +829,7 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
829 xcol.pixel = 0; 829 xcol.pixel = 0;
830 830
831 texture->getLoColor()->setPixel(xcol.pixel); 831 texture->getLoColor()->setPixel(xcol.pixel);
832 } else if (texture->getTexture() & BImage_Gradient) { 832 } else if (texture->getTexture() & BImage::GRADIENT) {
833 int clen = strlen(rclass) + 10, nlen = strlen(rname) + 10; 833 int clen = strlen(rclass) + 10, nlen = strlen(rname) + 10;
834 834
835 char *colorclass = new char[clen], *colorname = new char[nlen], 835 char *colorclass = new char[clen], *colorname = new char[nlen],
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index ce300a7..6a6dcc8 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -391,7 +391,7 @@ void Toolbar::reconfigure(void) {
391 391
392 Pixmap tmp = frame.base; 392 Pixmap tmp = frame.base;
393 BTexture *texture = &(screen->getToolbarStyle()->toolbar); 393 BTexture *texture = &(screen->getToolbarStyle()->toolbar);
394 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 394 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
395 frame.base = None; 395 frame.base = None;
396 XSetWindowBackground(display, frame.window, 396 XSetWindowBackground(display, frame.window,
397 texture->getColor()->getPixel()); 397 texture->getColor()->getPixel());
@@ -404,7 +404,7 @@ void Toolbar::reconfigure(void) {
404 404
405 tmp = frame.label; 405 tmp = frame.label;
406 texture = &(screen->getToolbarStyle()->window); 406 texture = &(screen->getToolbarStyle()->window);
407 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 407 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
408 frame.label = None; 408 frame.label = None;
409 XSetWindowBackground(display, frame.window_label, 409 XSetWindowBackground(display, frame.window_label,
410 texture->getColor()->getPixel()); 410 texture->getColor()->getPixel());
@@ -417,7 +417,7 @@ void Toolbar::reconfigure(void) {
417 417
418 tmp = frame.wlabel; 418 tmp = frame.wlabel;
419 texture = &(screen->getToolbarStyle()->label); 419 texture = &(screen->getToolbarStyle()->label);
420 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 420 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
421 frame.wlabel = None; 421 frame.wlabel = None;
422 XSetWindowBackground(display, frame.workspace_label, 422 XSetWindowBackground(display, frame.workspace_label,
423 texture->getColor()->getPixel()); 423 texture->getColor()->getPixel());
@@ -430,7 +430,7 @@ void Toolbar::reconfigure(void) {
430 430
431 tmp = frame.clk; 431 tmp = frame.clk;
432 texture = &(screen->getToolbarStyle()->clock); 432 texture = &(screen->getToolbarStyle()->clock);
433 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 433 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
434 frame.clk = None; 434 frame.clk = None;
435 XSetWindowBackground(display, frame.clock, 435 XSetWindowBackground(display, frame.clock,
436 texture->getColor()->getPixel()); 436 texture->getColor()->getPixel());
@@ -443,7 +443,7 @@ void Toolbar::reconfigure(void) {
443 443
444 tmp = frame.button; 444 tmp = frame.button;
445 texture = &(screen->getToolbarStyle()->button); 445 texture = &(screen->getToolbarStyle()->button);
446 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 446 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
447 frame.button = None; 447 frame.button = None;
448 448
449 frame.button_pixel = texture->getColor()->getPixel(); 449 frame.button_pixel = texture->getColor()->getPixel();
@@ -464,7 +464,7 @@ void Toolbar::reconfigure(void) {
464 464
465 tmp = frame.pbutton; 465 tmp = frame.pbutton;
466 texture = &(screen->getToolbarStyle()->pressed); 466 texture = &(screen->getToolbarStyle()->pressed);
467 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 467 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
468 frame.pbutton = None; 468 frame.pbutton = None;
469 frame.pbutton_pixel = texture->getColor()->getPixel(); 469 frame.pbutton_pixel = texture->getColor()->getPixel();
470 } else 470 } else