aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-09-15 13:08:05 (GMT)
committerfluxgen <fluxgen>2002-09-15 13:08:05 (GMT)
commit7610563f4ecca0c0a140ec96a60e15d5ee821e55 (patch)
tree50b190eabd52a306003d35cee1498abd409389ed
parentfef994fa14dcbe41c6e94f140e7ab8e6300f4619 (diff)
downloadfluxbox-7610563f4ecca0c0a140ec96a60e15d5ee821e55.zip
fluxbox-7610563f4ecca0c0a140ec96a60e15d5ee821e55.tar.bz2
updated to match new Texture and Color stuff
-rw-r--r--util/Makefile.am5
-rw-r--r--util/bsetroot.cc17
2 files changed, 12 insertions, 10 deletions
diff --git a/util/Makefile.am b/util/Makefile.am
index c5c4442..0997ad2 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS = fbrun
3bin_SCRIPTS = bsetbg fluxbox-generate_menu 3bin_SCRIPTS = bsetbg fluxbox-generate_menu
4bin_PROGRAMS = bsetroot 4bin_PROGRAMS = bsetroot
5bsetroot_SOURCES = bsetroot.cc bsetroot.hh 5bsetroot_SOURCES = bsetroot.cc bsetroot.hh
6bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o 6bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \
7 ../src/Color.o ../src/Texture.o ../src/StringUtil.o
7 8
8MAINTAINERCLEANFILES = Makefile.in 9MAINTAINERCLEANFILES = Makefile.in
9EXTRA_DIST=bsetbg 10EXTRA_DIST=bsetbg
@@ -12,5 +13,5 @@ distclean-local:
12 rm -f *\~ 13 rm -f *\~
13 14
14bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/BaseDisplay.hh \ 15bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/BaseDisplay.hh \
15 ../src/Timer.hh ../src/Image.hh ../src/FbAtoms.hh 16 ../src/Timer.hh ../src/Image.hh ../src/FbAtoms.hh ../src/Color.hh ../src/Texture.hh
16 17
diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index be7b69a..903efec 100644
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -18,7 +18,7 @@
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20 20
21// $Id: bsetroot.cc,v 1.8 2002/08/18 09:47:03 fluxgen Exp $ 21// $Id: bsetroot.cc,v 1.9 2002/09/15 13:08:05 fluxgen Exp $
22 22
23#include "bsetroot.hh" 23#include "bsetroot.hh"
24 24
@@ -214,7 +214,8 @@ void bsetroot::solid() {
214 GC gc; 214 GC gc;
215 XGCValues gcv; 215 XGCValues gcv;
216 216
217 img_ctrl[screen]->parseColor(&c, fore); 217 c.setFromString(fore, screen);
218
218 if (! c.isAllocated()) 219 if (! c.isAllocated())
219 c.setPixel(BlackPixel(getXDisplay(), screen)); 220 c.setPixel(BlackPixel(getXDisplay(), screen));
220 221
@@ -284,8 +285,8 @@ void bsetroot::modula(int x, int y) {
284 getScreenInfo(screen)->getRootWindow(), 16, 16, 285 getScreenInfo(screen)->getRootWindow(), 16, 16,
285 getScreenInfo(screen)->getDepth()); 286 getScreenInfo(screen)->getDepth());
286 287
287 img_ctrl[screen]->parseColor(&f, fore); 288 f.setFromString(fore, screen);
288 img_ctrl[screen]->parseColor(&b, back); 289 b.setFromString(back, screen);
289 290
290 if (! f.isAllocated()) 291 if (! f.isAllocated())
291 f.setPixel(WhitePixel(getXDisplay(), screen)); 292 f.setPixel(WhitePixel(getXDisplay(), screen));
@@ -342,10 +343,10 @@ void bsetroot::gradient(void) {
342 GC gc; 343 GC gc;
343 XGCValues gcv; 344 XGCValues gcv;
344 345
345 img_ctrl[screen]->parseTexture(&texture, grad); 346 texture.setFromString(grad);
346 img_ctrl[screen]->parseColor(&texture.color(), fore); 347 texture.color().setFromString(fore, screen);
347 img_ctrl[screen]->parseColor(&texture.colorTo(), back); 348 texture.colorTo().setFromString(back, screen);
348 349
349 if (! texture.color().isAllocated()) 350 if (! texture.color().isAllocated())
350 texture.color().setPixel(WhitePixel(getXDisplay(), screen)); 351 texture.color().setPixel(WhitePixel(getXDisplay(), screen));
351 if (! texture.colorTo().isAllocated()) 352 if (! texture.colorTo().isAllocated())