aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authormathias <mathias>2005-07-12 04:56:05 (GMT)
committermathias <mathias>2005-07-12 04:56:05 (GMT)
commit1fe9ef3056e80dfed05bbb1b00443c11a64223c1 (patch)
tree3fbae0cada70fe79e939d6c32c7dcb2786b6a816 /util
parent9531144097b7fdae1051933fd2aa89c8928b72b2 (diff)
downloadfluxbox_paul-1fe9ef3056e80dfed05bbb1b00443c11a64223c1.zip
fluxbox_paul-1fe9ef3056e80dfed05bbb1b00443c11a64223c1.tar.bz2
Renaming of 'bsetroot' to 'fbsetroot' (Mathias)
blackbox's 'bsetroot' and fluxbox's 'bsetroot' have different syntax nowadays and collide when you install fluxbox and blackbox. hence the renaming.
Diffstat (limited to 'util')
-rw-r--r--util/Makefile.am8
-rw-r--r--util/fbsetbg14
-rw-r--r--util/fbsetroot.cc (renamed from util/bsetroot.cc)28
-rw-r--r--util/fbsetroot.hh (renamed from util/bsetroot.hh)12
-rwxr-xr-xutil/startfluxbox.in2
5 files changed, 32 insertions, 32 deletions
diff --git a/util/Makefile.am b/util/Makefile.am
index 3e45aa6..58a232f 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -2,9 +2,9 @@
2SUBDIRS= fbrun 2SUBDIRS= fbrun
3INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk 3INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox 4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox
5bin_PROGRAMS= bsetroot 5bin_PROGRAMS= fbsetroot
6bsetroot_SOURCES= bsetroot.cc bsetroot.hh 6fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh
7bsetroot_LDADD= ../src/FbRootWindow.o ../src/FbAtoms.o \ 7fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
8 ../src/FbTk/libFbTk.a 8 ../src/FbTk/libFbTk.a
9 9
10MAINTAINERCLEANFILES= Makefile.in 10MAINTAINERCLEANFILES= Makefile.in
@@ -16,7 +16,7 @@ all-local: startfluxbox
16clean-local: 16clean-local:
17 rm -f startfluxbox fluxbox-generate_menu 17 rm -f startfluxbox fluxbox-generate_menu
18 18
19bsetroot.o: bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \ 19fbsetroot.o: fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
20 $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh 20 $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
21 21
22startfluxbox: startfluxbox.in 22startfluxbox: startfluxbox.in
diff --git a/util/fbsetbg b/util/fbsetbg
index a75f461..eaa1f9d 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -61,7 +61,7 @@ display_usage() {
61 cat << EOF 61 cat << EOF
62Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA /path/to/wallpaper] 62Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA /path/to/wallpaper]
63 [-r/-R /path/to/wallpaperdirectory] 63 [-r/-R /path/to/wallpaperdirectory]
64 [-b/-B bsetrootoptions] [-l] [-h] [-i] [-p] 64 [-b/-B fbsetrootoptions] [-l] [-h] [-i] [-p]
65Use \`\`$command -h'' for a complete help message. 65Use \`\`$command -h'' for a complete help message.
66 66
67EOF 67EOF
@@ -80,7 +80,7 @@ Options:
80 ( if your bgsetter doesn't support this 80 ( if your bgsetter doesn't support this
81 we fall back to -f ) 81 we fall back to -f )
82 -u Use specified wallpapersetter, use no argument to forget. 82 -u Use specified wallpapersetter, use no argument to forget.
83 -b Forward the options to bsetroot. 83 -b Forward the options to fbsetroot.
84 -r set random wallpaper from a directory 84 -r set random wallpaper from a directory
85 85
86 -F,-C,-T,-A,-U,-B,-R same as uncapsed but without remembering. 86 -F,-C,-T,-A,-U,-B,-R same as uncapsed but without remembering.
@@ -174,7 +174,7 @@ message() {
174remembercommand() { 174remembercommand() {
175 grep -vs "|${DISPLAY}$" ${lastwallpaper} > ${lastwallpaper}.tmp 175 grep -vs "|${DISPLAY}$" ${lastwallpaper} > ${lastwallpaper}.tmp
176 mv -f ${lastwallpaper}.tmp ${lastwallpaper} 176 mv -f ${lastwallpaper}.tmp ${lastwallpaper}
177 if [ "$option" = bsetroot ]; then 177 if [ "$option" = fbsetroot ]; then
178 echo $option'|'$wallpaper'|'$DISPLAY >> $lastwallpaper 178 echo $option'|'$wallpaper'|'$DISPLAY >> $lastwallpaper
179 return 179 return
180 fi 180 fi
@@ -262,11 +262,11 @@ while [ $# -gt 0 ]; do
262 wallpaper=$2 262 wallpaper=$2
263 remember=false 263 remember=false
264 break ;; 264 break ;;
265 -b) option=bsetroot 265 -b) option=fbsetroot
266 shift 266 shift
267 wallpaper=$* 267 wallpaper=$*
268 break ;; 268 break ;;
269 -B) option=bsetroot 269 -B) option=fbsetroot
270 shift 270 shift
271 wallpaper=$* 271 wallpaper=$*
272 remember=false 272 remember=false
@@ -461,8 +461,8 @@ if [ -z "$DISPLAY" ]; then
461fi 461fi
462 462
463 463
464if [ "$option" = bsetroot ]; then 464if [ "$option" = fbsetroot ]; then
465 bsetroot $wallpaper 465 fbsetroot $wallpaper
466 if [ ! "$remember" = false ]; then 466 if [ ! "$remember" = false ]; then
467 remembercommand 467 remembercommand
468 fi 468 fi
diff --git a/util/bsetroot.cc b/util/fbsetroot.cc
index 56cec1a..434f150 100644
--- a/util/bsetroot.cc
+++ b/util/fbsetroot.cc
@@ -20,7 +20,7 @@
20 20
21// $Id$ 21// $Id$
22 22
23#include "bsetroot.hh" 23#include "fbsetroot.hh"
24 24
25#include "../src/FbTk/I18n.hh" 25#include "../src/FbTk/I18n.hh"
26#include "../src/FbTk/ImageControl.hh" 26#include "../src/FbTk/ImageControl.hh"
@@ -52,7 +52,7 @@
52 52
53using namespace std; 53using namespace std;
54 54
55bsetroot::bsetroot(int argc, char **argv, char *dpy_name) 55fbsetroot::fbsetroot(int argc, char **argv, char *dpy_name)
56 : FbTk::App(dpy_name), m_app_name(argv[0]) { 56 : FbTk::App(dpy_name), m_app_name(argv[0]) {
57 57
58 pixmaps = (Pixmap *) 0; 58 pixmaps = (Pixmap *) 0;
@@ -121,7 +121,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
121 if ((mod + sol + grd) != true) { 121 if ((mod + sol + grd) != true) {
122 _FB_USES_NLS; 122 _FB_USES_NLS;
123 cerr<<m_app_name<< 123 cerr<<m_app_name<<
124 _FBTEXT(bsetroot, MustSpecify, 124 _FBTEXT(fbsetroot, MustSpecify,
125 "Error: must specify one of: -solid, -mod, -gradient\n", 125 "Error: must specify one of: -solid, -mod, -gradient\n",
126 "user didn't give one of the required options")<<endl; 126 "user didn't give one of the required options")<<endl;
127 127
@@ -142,7 +142,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
142} 142}
143 143
144 144
145bsetroot::~bsetroot() { 145fbsetroot::~fbsetroot() {
146 XKillClient(display(), AllTemporary); 146 XKillClient(display(), AllTemporary);
147 147
148 if (pixmaps) { // should always be true 148 if (pixmaps) { // should always be true
@@ -164,7 +164,7 @@ bsetroot::~bsetroot() {
164 Eterm and xchat will be able to use 164 Eterm and xchat will be able to use
165 transparent background 165 transparent background
166*/ 166*/
167void bsetroot::setRootAtoms(Pixmap pixmap, int screen) { 167void fbsetroot::setRootAtoms(Pixmap pixmap, int screen) {
168 Atom atom_root, atom_eroot, type; 168 Atom atom_root, atom_eroot, type;
169 unsigned char *data_root, *data_eroot; 169 unsigned char *data_root, *data_eroot;
170 int format; 170 int format;
@@ -196,7 +196,7 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
196 196
197 if (atom_root == None || atom_eroot == None) { 197 if (atom_root == None || atom_eroot == None) {
198 _FB_USES_NLS; 198 _FB_USES_NLS;
199 cerr<<_FBTEXT(bsetroot, NoPixmapAtoms, "Couldn't create pixmap atoms, giving up!", "Couldn't create atoms to point at root pixmap")<<endl; 199 cerr<<_FBTEXT(fbsetroot, NoPixmapAtoms, "Couldn't create pixmap atoms, giving up!", "Couldn't create atoms to point at root pixmap")<<endl;
200 exit(1); 200 exit(1);
201 } 201 }
202 202
@@ -209,7 +209,7 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
209/** 209/**
210 Draws pixmaps with a single color 210 Draws pixmaps with a single color
211*/ 211*/
212void bsetroot::solid() { 212void fbsetroot::solid() {
213 register int screen = 0; 213 register int screen = 0;
214 214
215 pixmaps = new Pixmap[ScreenCount(display())]; 215 pixmaps = new Pixmap[ScreenCount(display())];
@@ -244,7 +244,7 @@ void bsetroot::solid() {
244 Draws pixmaps with an 16x16 pattern with 244 Draws pixmaps with an 16x16 pattern with
245 fg and bg colors. 245 fg and bg colors.
246*/ 246*/
247void bsetroot::modula(int x, int y) { 247void fbsetroot::modula(int x, int y) {
248 char data[32]; 248 char data[32];
249 long pattern; 249 long pattern;
250 250
@@ -322,7 +322,7 @@ void bsetroot::modula(int x, int y) {
322/** 322/**
323 draws pixmaps with a fluxbox texure 323 draws pixmaps with a fluxbox texure
324*/ 324*/
325void bsetroot::gradient() { 325void fbsetroot::gradient() {
326 // using temporaray pixmap and then copying it to background pixmap, as it'll 326 // using temporaray pixmap and then copying it to background pixmap, as it'll
327 // get crashed somewhere on the way causing apps like XChat chrashing 327 // get crashed somewhere on the way causing apps like XChat chrashing
328 // as the pixmap has been destroyed 328 // as the pixmap has been destroyed
@@ -378,12 +378,12 @@ void bsetroot::gradient() {
378/** 378/**
379 Shows information about usage 379 Shows information about usage
380*/ 380*/
381void bsetroot::usage(int exit_code) { 381void fbsetroot::usage(int exit_code) {
382 _FB_USES_NLS; 382 _FB_USES_NLS;
383 cerr<<m_app_name<<" 2.3 : (c) 2003-2004 Fluxbox Development Team"<<endl; 383 cerr<<m_app_name<<" 2.3 : (c) 2003-2005 Fluxbox Development Team"<<endl;
384 cerr<<m_app_name<<" 2.1 : (c) 2002 Claes Nasten"<<endl; 384 cerr<<m_app_name<<" 2.1 : (c) 2002 Claes Nasten"<<endl;
385 cerr<<m_app_name<<" 2.0 : (c) 1997-2000 Brad Hughes\n"<<endl; 385 cerr<<m_app_name<<" 2.0 : (c) 1997-2000 Brad Hughes\n"<<endl;
386 cerr<<_FBTEXT(bsetroot, Usage, 386 cerr<<_FBTEXT(fbsetroot, Usage,
387 " -display <string> display connection\n" 387 " -display <string> display connection\n"
388 " -mod <x> <y> modula pattern\n" 388 " -mod <x> <y> modula pattern\n"
389 " -foreground, -fg <color> modula foreground color\n" 389 " -foreground, -fg <color> modula foreground color\n"
@@ -393,7 +393,7 @@ void bsetroot::usage(int exit_code) {
393 " -to <color> gradient end color\n\n" 393 " -to <color> gradient end color\n\n"
394 " -solid <color> solid color\n\n" 394 " -solid <color> solid color\n\n"
395 " -help print this help text and exit\n", 395 " -help print this help text and exit\n",
396 "bsetroot usage options")<<endl; 396 "fbsetroot usage options")<<endl;
397 exit(exit_code); 397 exit(exit_code);
398} 398}
399 399
@@ -421,7 +421,7 @@ int main(int argc, char **argv) {
421 } 421 }
422 } 422 }
423 423
424 bsetroot app(argc, argv, display_name); 424 fbsetroot app(argc, argv, display_name);
425 425
426 return (0); 426 return (0);
427} 427}
diff --git a/util/bsetroot.hh b/util/fbsetroot.hh
index c4ad614..a66b716 100644
--- a/util/bsetroot.hh
+++ b/util/fbsetroot.hh
@@ -20,8 +20,8 @@
20 20
21// $Id$ 21// $Id$
22 22
23#ifndef BSETROOT_HH 23#ifndef FBSETROOT_HH
24#define BSETROOT_HH 24#define FBSETROOT_HH
25 25
26#include "../src/FbTk/App.hh" 26#include "../src/FbTk/App.hh"
27 27
@@ -31,10 +31,10 @@ class ImageControl;
31 31
32}; 32};
33 33
34class bsetroot : public FbTk::App { 34class fbsetroot : public FbTk::App {
35public: 35public:
36 bsetroot(int argc, char **argv, char * dpy_name= 0); 36 fbsetroot(int argc, char **argv, char * dpy_name= 0);
37 ~bsetroot(); 37 ~fbsetroot();
38 38
39 void gradient(); 39 void gradient();
40 void modula(int, int); 40 void modula(int, int);
@@ -52,4 +52,4 @@ private:
52}; 52};
53 53
54 54
55#endif // BSETROOT_HH 55#endif // FBSETROOT_HH
diff --git a/util/startfluxbox.in b/util/startfluxbox.in
index 74f9a96..154ccdb 100755
--- a/util/startfluxbox.in
+++ b/util/startfluxbox.in
@@ -44,7 +44,7 @@ else
44# 44#
45# This sets a black background 45# This sets a black background
46 46
47@pkgbindir@/bsetroot -solid black 47@pkgbindir@/fbsetroot -solid black
48 48
49# This shows the fluxbox-splash-screen 49# This shows the fluxbox-splash-screen
50# fbsetbg -C @pkgdatadir@/splash.jpg 50# fbsetbg -C @pkgdatadir@/splash.jpg