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

updated to match new Texture and Color stuff

Browse source
This commit is contained in:
fluxgen 2002-09-15 13:08:05 +00:00
parent fef994fa14
commit 7610563f4e
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
util/Makefile.am
View file

@ -3,7 +3,8 @@ SUBDIRS = fbrun
bin_SCRIPTS = bsetbg fluxbox-generate_menu bin_SCRIPTS = bsetbg fluxbox-generate_menu
bin_PROGRAMS = bsetroot bin_PROGRAMS = bsetroot
bsetroot_SOURCES = bsetroot.cc bsetroot.hh 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 MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST=bsetbg EXTRA_DIST=bsetbg
@ -12,5 +13,5 @@ distclean-local:
rm -f *\~ rm -f *\~
bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/BaseDisplay.hh \ 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

17
util/bsetroot.cc
View file

@ -18,7 +18,7 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // 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 // 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" #include "bsetroot.hh"
@ -214,7 +214,8 @@ void bsetroot::solid() {
GC gc; GC gc;
XGCValues gcv; XGCValues gcv;
img_ctrl[screen]->parseColor(&c, fore); c.setFromString(fore, screen);
if (! c.isAllocated()) if (! c.isAllocated())
c.setPixel(BlackPixel(getXDisplay(), screen)); c.setPixel(BlackPixel(getXDisplay(), screen));
@ -284,8 +285,8 @@ void bsetroot::modula(int x, int y) {
getScreenInfo(screen)->getRootWindow(), 16, 16, getScreenInfo(screen)->getRootWindow(), 16, 16,
getScreenInfo(screen)->getDepth()); getScreenInfo(screen)->getDepth());
img_ctrl[screen]->parseColor(&f, fore); f.setFromString(fore, screen);
img_ctrl[screen]->parseColor(&b, back); b.setFromString(back, screen);
if (! f.isAllocated()) if (! f.isAllocated())
f.setPixel(WhitePixel(getXDisplay(), screen)); f.setPixel(WhitePixel(getXDisplay(), screen));
@ -342,10 +343,10 @@ void bsetroot::gradient(void) {
GC gc; GC gc;
XGCValues gcv; XGCValues gcv;
img_ctrl[screen]->parseTexture(&texture, grad); texture.setFromString(grad);
img_ctrl[screen]->parseColor(&texture.color(), fore); texture.color().setFromString(fore, screen);
img_ctrl[screen]->parseColor(&texture.colorTo(), back); texture.colorTo().setFromString(back, screen);
if (! texture.color().isAllocated()) if (! texture.color().isAllocated())
texture.color().setPixel(WhitePixel(getXDisplay(), screen)); texture.color().setPixel(WhitePixel(getXDisplay(), screen));
if (! texture.colorTo().isAllocated()) if (! texture.colorTo().isAllocated())