aboutsummaryrefslogtreecommitdiff
path: root/src/Theme.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
committerfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
commit35c55cdc8dc0771a07c2276d3190782b89d8a715 (patch)
tree4d0ccaaaf6165453bfe46af0bcc20ed82846041b /src/Theme.cc
parent8b560ddf76a0b0256a1c2ffd0cb97d91153e8192 (diff)
downloadfluxbox_pavel-35c55cdc8dc0771a07c2276d3190782b89d8a715.zip
fluxbox_pavel-35c55cdc8dc0771a07c2276d3190782b89d8a715.tar.bz2
moved Texture and Color into new files, fixed some const and pointers
Diffstat (limited to 'src/Theme.cc')
-rw-r--r--src/Theme.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index cff14d8..552cf8c 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -41,7 +41,7 @@
41// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 41// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
42// DEALINGS IN THE SOFTWARE. 42// DEALINGS IN THE SOFTWARE.
43 43
44// $Id: Theme.cc,v 1.22 2002/07/19 21:45:00 fluxgen Exp $ 44// $Id: Theme.cc,v 1.23 2002/07/23 17:11:59 fluxgen Exp $
45 45
46#ifndef _GNU_SOURCE 46#ifndef _GNU_SOURCE
47#define _GNU_SOURCE 47#define _GNU_SOURCE
@@ -577,6 +577,7 @@ void Theme::loadToolbarStyle() {
577 readDatabaseTexture("toolbar.clock", "Toolbar.Clock", 577 readDatabaseTexture("toolbar.clock", "Toolbar.Clock",
578 &m_toolbarstyle.clock, 578 &m_toolbarstyle.clock,
579 BlackPixel(m_display, m_screennum)); 579 BlackPixel(m_display, m_screennum));
580
580 readDatabaseColor("toolbar.label.textColor", "Toolbar.Label.TextColor", 581 readDatabaseColor("toolbar.label.textColor", "Toolbar.Label.TextColor",
581 &m_toolbarstyle.l_text, 582 &m_toolbarstyle.l_text,
582 WhitePixel(m_display, m_screennum)); 583 WhitePixel(m_display, m_screennum));
@@ -625,7 +626,7 @@ void Theme::loadRootCommand() {
625 char *value_type; 626 char *value_type;
626 627
627 if (m_rootcommand.size()) { 628 if (m_rootcommand.size()) {
628 #ifndef __EMX__ 629 #ifndef __EMX__
629 char tmpstring[256]; //to hold m_screennum 630 char tmpstring[256]; //to hold m_screennum
630 tmpstring[0]=0; 631 tmpstring[0]=0;
631 sprintf(tmpstring, "%d", m_screennum); 632 sprintf(tmpstring, "%d", m_screennum);
@@ -708,7 +709,7 @@ void Theme::loadMisc(void) {
708 709
709 710
710bool Theme::readDatabaseTexture(char *rname, char *rclass, 711bool Theme::readDatabaseTexture(char *rname, char *rclass,
711 BTexture *texture, 712 FbTk::Texture *texture,
712 unsigned long default_pixel) 713 unsigned long default_pixel)
713{ 714{
714 XrmValue value; 715 XrmValue value;
@@ -719,9 +720,9 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
719 &value)) 720 &value))
720 m_imagecontrol->parseTexture(texture, value.addr); 721 m_imagecontrol->parseTexture(texture, value.addr);
721 else 722 else
722 texture->setTexture(BImage::SOLID | BImage::FLAT); 723 texture->setType(FbTk::Texture::SOLID | FbTk::Texture::FLAT);
723 724
724 if (texture->getTexture() & BImage::SOLID) { 725 if (texture->type() & FbTk::Texture::SOLID) {
725 int clen = strlen(rclass) + 32, nlen = strlen(rname) + 32; 726 int clen = strlen(rclass) + 32, nlen = strlen(rname) + 32;
726 727
727 char *colorclass = new char[clen], *colorname = new char[nlen]; 728 char *colorclass = new char[clen], *colorname = new char[nlen];
@@ -744,7 +745,7 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
744 delete [] colorname; 745 delete [] colorname;
745 746
746 if ((! texture->color().isAllocated()) || 747 if ((! texture->color().isAllocated()) ||
747 (texture->getTexture() & BImage::FLAT)) 748 (texture->type() & FbTk::Texture::FLAT))
748 return retval; 749 return retval;
749 750
750 XColor xcol; 751 XColor xcol;
@@ -781,7 +782,7 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
781 xcol.pixel = 0; 782 xcol.pixel = 0;
782 783
783 texture->loColor().setPixel(xcol.pixel); 784 texture->loColor().setPixel(xcol.pixel);
784 } else if (texture->getTexture() & BImage::GRADIENT) { 785 } else if (texture->type() & FbTk::Texture::GRADIENT) {
785 int clen = strlen(rclass) + 10, nlen = strlen(rname) + 10; 786 int clen = strlen(rclass) + 10, nlen = strlen(rname) + 10;
786 787
787 char *colorclass = new char[clen], *colorname = new char[nlen], 788 char *colorclass = new char[clen], *colorname = new char[nlen],
@@ -812,7 +813,7 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
812} 813}
813 814
814 815
815bool Theme::readDatabaseColor(char *rname, char *rclass, BColor *color, 816bool Theme::readDatabaseColor(char *rname, char *rclass, FbTk::Color *color,
816 unsigned long default_pixel) 817 unsigned long default_pixel)
817{ 818{
818 XrmValue value; 819 XrmValue value;