aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-11-26 17:48:58 (GMT)
committerfluxgen <fluxgen>2002-11-26 17:48:58 (GMT)
commitdcafcfa17d90412e83923d67e95df96dab46d333 (patch)
treec2bf1d2d9fa3c10b9ae6d88235a03f0d28faca33
parentd9525a3efb4e6dc6d955de2316e4dd95541da851 (diff)
downloadfluxbox_pavel-dcafcfa17d90412e83923d67e95df96dab46d333.zip
fluxbox_pavel-dcafcfa17d90412e83923d67e95df96dab46d333.tar.bz2
fixed FbTk issues
-rw-r--r--util/Makefile.am5
-rw-r--r--util/bsetroot.cc20
2 files changed, 11 insertions, 14 deletions
diff --git a/util/Makefile.am b/util/Makefile.am
index c40970f..94f5723 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,10 +1,11 @@
1# util/Makefile.am for Blackbox 0.61.x - an X11 Window manager 1# util/Makefile.am for Blackbox 0.61.x - an X11 Window manager
2SUBDIRS = fbrun 2SUBDIRS = fbrun
3INCLUDES=-I../src/FbTk/
3bin_SCRIPTS = bsetbg fluxbox-generate_menu 4bin_SCRIPTS = bsetbg fluxbox-generate_menu
4bin_PROGRAMS = bsetroot 5bin_PROGRAMS = bsetroot
5bsetroot_SOURCES = bsetroot.cc bsetroot.hh 6bsetroot_SOURCES = bsetroot.cc bsetroot.hh
6bsetroot_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/Image.o ../src/i18n.o ../src/FbAtoms.o \
7 ../src/Color.o ../src/Texture.o ../src/StringUtil.o 8 ../src/StringUtil.o ../src/FbTk/.libs/libFbTk.a
8 9
9MAINTAINERCLEANFILES = Makefile.in 10MAINTAINERCLEANFILES = Makefile.in
10EXTRA_DIST=bsetbg fluxbox-generate_menu 11EXTRA_DIST=bsetbg fluxbox-generate_menu
@@ -13,5 +14,5 @@ distclean-local:
13 rm -f *\~ 14 rm -f *\~
14 15
15bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/BaseDisplay.hh \ 16bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/BaseDisplay.hh \
16 ../src/Timer.hh ../src/Image.hh ../src/FbAtoms.hh ../src/Color.hh ../src/Texture.hh 17 ../src/Timer.hh ../src/Image.hh ../src/FbAtoms.hh ../src/FbTk/Color.hh ../src/FbTk/Texture.hh
17 18
diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index 5c209e0..d38a245 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.10 2002/11/25 22:23:03 fluxgen Exp $ 21// $Id: bsetroot.cc,v 1.11 2002/11/26 17:48:58 fluxgen Exp $
22 22
23#include "bsetroot.hh" 23#include "bsetroot.hh"
24 24
@@ -47,7 +47,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
47 bool mod = false, sol = false, grd = false; 47 bool mod = false, sol = false, grd = false;
48 int mod_x = 0, mod_y = 0, i = 0; 48 int mod_x = 0, mod_y = 0, i = 0;
49 49
50 img_ctrl = new BImageControl*[10]; 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(getScreenInfo(i), true);
53 } 53 }
@@ -138,12 +138,8 @@ bsetroot::~bsetroot() {
138 138
139 delete [] pixmaps; 139 delete [] pixmaps;
140 } 140 }
141 #ifdef DEBUG
142 else
143 cerr<<"~bsetroot: why don't we have any pixmaps?"<<endl;
144 #endif // DEBUG
145 141
146 if (img_ctrl) { 142 if (img_ctrl != 0) {
147 int i = 0; 143 int i = 0;
148 for (; i < num_screens; i++) 144 for (; i < num_screens; i++)
149 delete img_ctrl[i]; 145 delete img_ctrl[i];
@@ -152,11 +148,11 @@ bsetroot::~bsetroot() {
152 } 148 }
153} 149}
154 150
155//------------ setRootAtoms --------------- 151/**
156// set root pixmap atoms so that apps like 152 set root pixmap atoms so that apps like
157// Eterm and xchat will be able to use 153 Eterm and xchat will be able to use
158// transparent background 154 transparent background
159//----------------------------------------- 155*/
160void bsetroot::setRootAtoms(Pixmap pixmap, int screen) { 156void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
161 Atom atom_root, atom_eroot, type; 157 Atom atom_root, atom_eroot, type;
162 unsigned char *data_root, *data_eroot; 158 unsigned char *data_root, *data_eroot;