aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-11-30 21:08:07 (GMT)
committerfluxgen <fluxgen>2002-11-30 21:08:07 (GMT)
commitb9134162f9633784d9097df18769a699a62650fe (patch)
tree89166977d55b7b0f6921333003b00f338464a8b4
parent6dbabfb1d8cb13d9127661e1c27761f9f25b455a (diff)
downloadfluxbox-b9134162f9633784d9097df18769a699a62650fe.zip
fluxbox-b9134162f9633784d9097df18769a699a62650fe.tar.bz2
updated for imagecontrol
-rw-r--r--util/Makefile.am6
-rw-r--r--util/bsetroot.cc10
2 files changed, 8 insertions, 8 deletions
diff --git a/util/Makefile.am b/util/Makefile.am
index 0adef2f..d0af97a 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -4,8 +4,8 @@ INCLUDES=-I../src/FbTk/
4bin_SCRIPTS = bsetbg fluxbox-generate_menu 4bin_SCRIPTS = bsetbg fluxbox-generate_menu
5bin_PROGRAMS = bsetroot 5bin_PROGRAMS = bsetroot
6bsetroot_SOURCES = bsetroot.cc bsetroot.hh 6bsetroot_SOURCES = bsetroot.cc bsetroot.hh
7bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \ 7bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/ImageControl.o ../src/i18n.o ../src/FbAtoms.o \
8 ../src/StringUtil.o ../src/FbTk/libFbTk.a 8 ../src/StringUtil.o ../src/TextureRender.o ../src/FbTk/libFbTk.a
9 9
10MAINTAINERCLEANFILES = Makefile.in 10MAINTAINERCLEANFILES = Makefile.in
11EXTRA_DIST=bsetbg fluxbox-generate_menu 11EXTRA_DIST=bsetbg fluxbox-generate_menu
@@ -14,5 +14,5 @@ distclean-local:
14 rm -f *\~ 14 rm -f *\~
15 15
16bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/BaseDisplay.hh \ 16bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/BaseDisplay.hh \
17 ../src/Timer.hh ../src/Image.hh ../src/FbAtoms.hh ../src/FbTk/Color.hh ../src/FbTk/Texture.hh 17 ../src/Timer.hh ../src/ImageControl.hh ../src/FbAtoms.hh
18 18
diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index cb00594..6365689 100644
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -1,4 +1,4 @@
1// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org) 1// Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org)
2// Copyright (c) 1997 - 2000 Brad Hughes <bhughes at trolltech.com> 2// Copyright (c) 1997 - 2000 Brad Hughes <bhughes at trolltech.com>
3// 3//
4// Permission is hereby granted, free of charge, to any person obtaining a 4// Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,15 +18,15 @@
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.12 2002/11/27 21:52:34 fluxgen Exp $ 21// $Id: bsetroot.cc,v 1.13 2002/11/30 21:07:51 fluxgen Exp $
22 22
23#include "bsetroot.hh" 23#include "bsetroot.hh"
24 24
25#include "../src/i18n.hh" 25#include "../src/i18n.hh"
26#include "../src/Image.hh" 26#include "../src/ImageControl.hh"
27 27
28#ifdef HAVE_CONFIG_H 28#ifdef HAVE_CONFIG_H
29# include "../config.h" 29#include "config.h"
30#endif // HAVE_CONFIG_H 30#endif // HAVE_CONFIG_H
31 31
32#include <X11/Xatom.h> 32#include <X11/Xatom.h>
@@ -49,7 +49,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
49 49
50 img_ctrl = new BImageControl*[getNumberOfScreens()]; 50 img_ctrl = new BImageControl*[getNumberOfScreens()];
51 for (; i < getNumberOfScreens(); i++) { 51 for (; i < getNumberOfScreens(); i++) {
52 img_ctrl[i] = new BImageControl(getScreenInfo(i), true); 52 img_ctrl[i] = new BImageControl(i, true);
53 } 53 }
54 54
55 for (i = 1; i < argc; i++) { 55 for (i = 1; i < argc; i++) {