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

@@ -4,8 +4,8 @@ INCLUDES=-I../src/FbTk/
 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 \
-	../src/StringUtil.o ../src/FbTk/libFbTk.a
+bsetroot_LDADD =	../src/BaseDisplay.o ../src/Timer.o ../src/ImageControl.o ../src/i18n.o ../src/FbAtoms.o \
+	../src/StringUtil.o ../src/TextureRender.o ../src/FbTk/libFbTk.a
 
 MAINTAINERCLEANFILES =	Makefile.in
 EXTRA_DIST=bsetbg fluxbox-generate_menu
@@ -14,5 +14,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/FbTk/Color.hh ../src/FbTk/Texture.hh
+ ../src/Timer.hh ../src/ImageControl.hh ../src/FbAtoms.hh
 

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

@@ -1,4 +1,4 @@ 
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org)
 // Copyright (c) 1997 - 2000 Brad Hughes <bhughes at trolltech.com>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,15 +18,15 @@ // 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.12 2002/11/27 21:52:34 fluxgen Exp $
+// $Id: bsetroot.cc,v 1.13 2002/11/30 21:07:51 fluxgen Exp $
 
 #include "bsetroot.hh"
 
 #include "../src/i18n.hh"
-#include "../src/Image.hh"
+#include "../src/ImageControl.hh"
 
 #ifdef HAVE_CONFIG_H
-#  include "../config.h"
+#include "config.h"
 #endif // HAVE_CONFIG_H
 
 #include <X11/Xatom.h>
@@ -49,7 +49,7 @@ int mod_x = 0, mod_y = 0, i = 0;
 
 	img_ctrl = new BImageControl*[getNumberOfScreens()];
 	for (; i < getNumberOfScreens(); i++) {
-		img_ctrl[i] = new BImageControl(getScreenInfo(i), true);
+		img_ctrl[i] = new BImageControl(i, true);
 	}
 
 	for (i = 1; i < argc; i++) {