M util/Makefile.am → util/Makefile.am

@@ -3,7 +3,8 @@ SUBDIRS = fbrun
 bin_SCRIPTS = bsetbg fluxbox-generate_menu
 bin_PROGRAMS =		bsetroot
 bsetroot_SOURCES =	bsetroot.cc bsetroot.hh
-bsetroot_LDADD =	../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o
+bsetroot_LDADD =	../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \
+	../src/Color.o ../src/Texture.o ../src/StringUtil.o
 
 MAINTAINERCLEANFILES =	Makefile.in
 EXTRA_DIST=bsetbg
@@ -12,5 +13,5 @@ distclean-local:
 	rm -f *\~
 
 bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/BaseDisplay.hh \
- ../src/Timer.hh ../src/Image.hh ../src/FbAtoms.hh
+ ../src/Timer.hh ../src/Image.hh ../src/FbAtoms.hh ../src/Color.hh ../src/Texture.hh
 

M util/bsetroot.cc → util/bsetroot.cc

@@ -18,7 +18,7 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // 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
 
-// $Id: bsetroot.cc,v 1.8 2002/08/18 09:47:03 fluxgen Exp $
+// $Id: bsetroot.cc,v 1.9 2002/09/15 13:08:05 fluxgen Exp $
 
 #include "bsetroot.hh"
 
@@ -214,7 +214,8 @@ FbTk::Color c;
 		GC gc;
 		XGCValues gcv;
 
-    img_ctrl[screen]->parseColor(&c, fore);
+    c.setFromString(fore, screen);
+
     if (! c.isAllocated())
 				c.setPixel(BlackPixel(getXDisplay(), screen));
 
@@ -284,8 +285,8 @@ r_bitmap = XCreatePixmap(getXDisplay(),
 			getScreenInfo(screen)->getRootWindow(), 16, 16,
 			getScreenInfo(screen)->getDepth());
 
-		img_ctrl[screen]->parseColor(&f, fore);
-		img_ctrl[screen]->parseColor(&b, back);
+		f.setFromString(fore, screen);
+		b.setFromString(back, screen);
 
 		if (! f.isAllocated())
 			f.setPixel(WhitePixel(getXDisplay(), screen));
@@ -342,10 +343,10 @@ FbTk::Texture texture;
 		GC gc;
 		XGCValues gcv;
 
-		img_ctrl[screen]->parseTexture(&texture, grad);
-		img_ctrl[screen]->parseColor(&texture.color(), fore);
-		img_ctrl[screen]->parseColor(&texture.colorTo(), back);
-
+		texture.setFromString(grad);
+		texture.color().setFromString(fore, screen);
+		texture.colorTo().setFromString(back, screen);
+		
 		if (! texture.color().isAllocated())
 			texture.color().setPixel(WhitePixel(getXDisplay(), screen));
 		if (! texture.colorTo().isAllocated())