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

Renaming of 'bsetroot' to 'fbsetroot' (Mathias)

Browse source 
blackbox's 'bsetroot' and fluxbox's 'bsetroot' have different syntax
nowadays and collide when you install fluxbox and blackbox. hence
the renaming.
This commit is contained in:
mathias 2005-07-12 04:56:05 +00:00
parent 9531144097
commit 1fe9ef3056
31 changed files with 84 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,6 +1,14 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 0.9.14: Changes for 0.9.14:
*05/07/07: *05/07/12:
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
updated manpage, helper utils (fbgm, startfluxbox, fbsetbg), nls etc
*05/07/06:
Added even more applications to fbgm (Mathias)
fluxbox-generate_menu.in
* Added info about locale path in -info argument (Thanks php-coder) * Added info about locale path in -info argument (Thanks php-coder)
src/main.cc, nls/* src/main.cc, nls/*
*05/07/05: *05/07/05:

4
doc/Makefile.am
View file

@ -4,9 +4,9 @@
SUBDIRS = ru SUBDIRS = ru
CLEANFILES = fluxbox.1 fluxstyle.1 CLEANFILES = fluxbox.1 fluxstyle.1
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
man_MANS = fluxbox.1 bsetroot.1 fbrun.1 fbsetbg.1 \ man_MANS = fluxbox.1 fbsetroot.1 fbrun.1 fbsetbg.1 \
startfluxbox.1 fluxstyle.1 fbrun.1 startfluxbox.1 fluxstyle.1 fbrun.1
EXTRA_DIST=fluxbox.1.in bsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \ EXTRA_DIST=fluxbox.1.in fbsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \
fluxstyle.1.in Coding_style fluxstyle.1.in Coding_style
distclean-local: distclean-local:
rm -f *\~ rm -f *\~

37
doc/bsetroot.1 → doc/fbsetroot.1
View file

@ -1,5 +1,5 @@
.\" .\"
.\" Man page for Bsetroot .\" Man page for fbsetroot
.\" .\"
.\" Copyright (c) 2000 by Wilbert Berendsen <wbsoft@xs4all.nl> .\" Copyright (c) 2000 by Wilbert Berendsen <wbsoft@xs4all.nl>
.\" Copyright (c) 2004 by Curt "Asenchi" Micol <asenchi@asenchi.com> .\" Copyright (c) 2004 by Curt "Asenchi" Micol <asenchi@asenchi.com>
@ -19,36 +19,35 @@
.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS DOCUMENTATION .\" PERFORMANCE OF THIS DOCUMENTATION
.\" .\"
.TH bsetroot 1 "June 25th, 2004" "0.60.3" .TH fbsetroot 1 "July 8th, 2005" "0.9.13"
.SH NAME .SH NAME
bsetroot \- a simple background utility used by the Fluxbox window manager, ori fbsetroot \- a simple background utility used by the Fluxbox window manager, originally
ginally written written for and by the original Blackbox window manager team.
for and by the original Blackbox window manager team.
.SH SYNOPSIS .SH SYNOPSIS
.BR bsetroot " \-help" .BR fbsetroot " \-help"
.br .br
.B bsetroot .B fbsetroot
.RI "[ \-display " display " ] \-solid " color .RI "[ \-display " display " ] \-solid " color
.br .br
.B bsetroot .B fbsetroot
.RI "[ \-display " display " ] \-mod " "x y" " \-fg " color " \-bg " color .RI "[ \-display " display " ] \-mod " "x y" " \-fg " color " \-bg " color
.br .br
.B bsetroot .B fbsetroot
.RI "[ \-display " display " ] \-gradient " texture " \-from " color " \-to " color .RI "[ \-display " display " ] \-gradient " texture " \-from " color " \-to " color
.SH DESCRIPTION .SH DESCRIPTION
Bsetroot is a utility that can control the appearance of the root window in fbsetroot is a utility that can control the appearance of the root window in
three ways: Either give it a solid color, or write a two color modula pattern three ways: Either give it a solid color, or write a two color modula pattern
to it, or render a gradient texture, based on two different colors. to it, or render a gradient texture, based on two different colors.
.PP .PP
Bsetroot resembles fbsetroot resembles
.IR xsetroot (1) .IR xsetroot (1)
in this functionality but it supports multiple screen displays, and gradient in this functionality but it supports multiple screen displays, and gradient
textures the same way as Blackbox or Fluxbox does. textures the same way as Blackbox or Fluxbox does.
It doesn't handle cursors etc. It doesn't handle cursors etc.
Bsetroot was originally part of the Blackbox package and was carried over with fbsetroot was originally part of the Blackbox package and was carried over with
the code that became Fluxbox. the code that became Fluxbox. It was called bsetroot back in those days.
.SH OPTIONS .SH OPTIONS
Bsetroot operates in three ways, you must choose one of the first 3 options: fbsetroot operates in three ways, you must choose one of the first 3 options:
.TP .TP
.BI \-solid " color" .BI \-solid " color"
Sets the root window to specified color. Sets the root window to specified color.
@ -75,7 +74,7 @@ color.
.RE .RE
.TP .TP
.BI \-display " display" .BI \-display " display"
Tells Bsetroot to connect to the specified display. Tells fbsetroot to connect to the specified display.
.TP .TP
.BI "\-bg, \-background " color .BI "\-bg, \-background " color
Background color. Background color.
@ -104,13 +103,7 @@ operation mode.
.B \-help .B \-help
Prints version info and short help text. Prints version info and short help text.
.SH AUTHOR .SH AUTHOR
Bsetroot is written and maintained by Brad Hughes fbsetroot is written and maintained by the Fluxbox Development Team
.nh \" hyphenation off
(blackbox@alug.org)
.hy \" on again
and Jeff Raven
.nh
(jraven@psu.edu).
.PP .PP
This manpage was modified by Curt "Asenchi" Micol <asenchi@asenchi.com> for This manpage was modified by Curt "Asenchi" Micol <asenchi@asenchi.com> for
the Fluxbox window manager. the Fluxbox window manager.

2
nls/C/Translation.m
View file

@ -213,7 +213,7 @@ $set 17 #Workspace
3 New Workspace 3 New Workspace
4 Remove Last 4 Remove Last
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: error: must specify one of: -solid, -mod, -gradient\n 1 %s: error: must specify one of: -solid, -mod, -gradient\n
2 Couldn't create pixmap atoms, giving up! 2 Couldn't create pixmap atoms, giving up!

2
nls/be_BY/Translation.m
View file

@ -211,7 +211,7 @@ $set 17 #Workspace
3 Íîâàå ïðàöî¢íàå ìåñöà 3 Íîâàå ïðàöî¢íàå ìåñöà
4 Âûäàë³öü àïîøíÿå 4 Âûäàë³öü àïîøíÿå
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: ïàìûëêà: ïàâ³ííà áûöü íåøòà ç íàñòóïíàãà: -solid, -mod, -gradient\n 1 %s: ïàìûëêà: ïàâ³ííà áûöü íåøòà ç íàñòóïíàãà: -solid, -mod, -gradient\n
2 Couldn't create pixmap atoms, giving up! 2 Couldn't create pixmap atoms, giving up!

2
nls/bg_BG/Translation.m
View file

@ -104,7 +104,7 @@ $set 17 #Workspace
3 Íîâî Ðàáîòíî Ìÿñòî 3 Íîâî Ðàáîòíî Ìÿñòî
4 Ìàõíè Ïîñëåäíîòî 4 Ìàõíè Ïîñëåäíîòî
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: error: must specify one of: -solid, -mod, -gradient\n 1 %s: error: must specify one of: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/cs_CZ/Translation.m
View file

@ -210,7 +210,7 @@ $set 17 #Workspace
3 Nová plocha 3 Nová plocha
4 Odstranit poslední 4 Odstranit poslední
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: error: must specify one of: -solid, -mod, -gradient\n 1 %s: error: must specify one of: -solid, -mod, -gradient\n
2 Couldn't create pixmap atoms, giving up! 2 Couldn't create pixmap atoms, giving up!

2
nls/da_DK/Translation.m
View file

@ -104,7 +104,7 @@ $set 17 #Workspace
3 Nyt skrivebord 3 Nyt skrivebord
4 Fjern sidste 4 Fjern sidste
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: fejl: specificér en af følgende: -solid, -mod, -gradient\n 1 %s: fejl: specificér en af følgende: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/de_DE/Translation.m
View file

@ -206,7 +206,7 @@ $set 17 #Workspace
3 Neuer Desktop 3 Neuer Desktop
4 Letzten Desktop entfernen 4 Letzten Desktop entfernen
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: error: must specify one of: -solid, -mod, -gradient\n 1 %s: error: must specify one of: -solid, -mod, -gradient\n
2 Couldn't create pixmap atoms, giving up! 2 Couldn't create pixmap atoms, giving up!

2
nls/es_ES/Translation.m
View file

@ -104,7 +104,7 @@ $set 17 #Workspace
3 Escritorio nuevo 3 Escritorio nuevo
4 Quitar el último escritorio 4 Quitar el último escritorio
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: error: es necesario especifiar uno de: -solid, -mod, -gradient\n 1 %s: error: es necesario especifiar uno de: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/et_EE/Translation.m
View file

@ -102,7 +102,7 @@ $set 17 #Workspace
3 Uus töölaud 3 Uus töölaud
4 Eemalda viimane 4 Eemalda viimane
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: viga: pead määratlema ühe järgnevaist: -solid, -mod, -gradient\n 1 %s: viga: pead määratlema ühe järgnevaist: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

8
nls/fluxbox-nls.hh
View file

@ -202,10 +202,10 @@ enum {
WorkspaceNewWorkspace = 3, WorkspaceNewWorkspace = 3,
WorkspaceRemoveLast = 4, WorkspaceRemoveLast = 4,
bsetrootSet = 18, fbsetrootSet = 18,
bsetrootMustSpecify = 1, fbsetrootMustSpecify = 1,
bsetrootNoPixmapAtoms = 2, fbsetrootNoPixmapAtoms = 2,
bsetrootUsage = 3, fbsetrootUsage = 3,
mainSet = 19, mainSet = 19,
mainDISPLAYRequiresArg = 1, mainDISPLAYRequiresArg = 1,

2
nls/fr_FR/Translation.m
View file

@ -104,7 +104,7 @@ $set 17 #Workspace
3 Nouveau bureau 3 Nouveau bureau
4 Supprimer le dernier 4 Supprimer le dernier
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: Erreur: il faut préciser: -solid, -mod, -gradient\n 1 %s: Erreur: il faut préciser: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/it_IT/Translation.m
View file

@ -103,7 +103,7 @@ $set 17 #Workspace
3 Crea una nuova 3 Crea una nuova
4 Elimina l'ultima 4 Elimina l'ultima
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: errore: specicare una delle opzioni : -solid, -mod, -gradient\n 1 %s: errore: specicare una delle opzioni : -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/ja_JP/Translation.m
View file

@ -106,7 +106,7 @@ $set 17 #Workspace
3 新規ワークスペース作成 3 新規ワークスペース作成
4 末尾のワークスペースを削除 4 末尾のワークスペースを削除
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: error: 次の中から一つを選択しなければなりません: -solid, -mod, -gradient\n 1 %s: error: 次の中から一つを選択しなければなりません: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/ko_KR/Translation.m
View file

@ -210,7 +210,7 @@ $set 17 #Workspace
3 새 작업공간 추가 3 새 작업공간 추가
4 마지막 것 제거 4 마지막 것 제거
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: error: must specify one of: -solid, -mod, -gradient\n 1 %s: error: must specify one of: -solid, -mod, -gradient\n
2 Couldn't create pixmap atoms, giving up! 2 Couldn't create pixmap atoms, giving up!

2
nls/lv_LV/Translation.m
View file

@ -103,7 +103,7 @@ $set 17 #Workspace
3 Jauna Darba vieta 3 Jauna Darba vieta
4 Noòemt Pçdçjo 4 Noòemt Pçdçjo
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: kïûda: jânosaka viens no: -solid, -mod, -gradient\n 1 %s: kïûda: jânosaka viens no: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/nl_NL/Translation.m
View file

@ -105,7 +105,7 @@ $set 17 #Workspace
3 Nieuw werkveld 3 Nieuw werkveld
4 Verwijder laatste 4 Verwijder laatste
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: error: must specify one of: -solid, -mod, -gradient\n 1 %s: error: must specify one of: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/pl_PL/Translation.m
View file

@ -217,7 +217,7 @@ $set 17 #Workspace
3 Nowy Pulpit 3 Nowy Pulpit
4 Usuñ Ostatni 4 Usuñ Ostatni
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: b³±d: musisz okreliæ jedno z: -solid, -mod, -gradient\n 1 %s: b³±d: musisz okreliæ jedno z: -solid, -mod, -gradient\n
2 Nie mogê stowrzyæ elementów pixmap - dajê sobie spokój! 2 Nie mogê stowrzyæ elementów pixmap - dajê sobie spokój!

2
nls/pt_BR/Translation.m
View file

@ -104,7 +104,7 @@ $set 17 #Workspace
3 Nova Area de Trabalho 3 Nova Area de Trabalho
4 Remover Ultima 4 Remover Ultima
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: erro: necessario especificar um dos seguintes argumentos: -solid, -mod, -gradient\n 1 %s: erro: necessario especificar um dos seguintes argumentos: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/pt_PT/Translation.m
View file

@ -104,7 +104,7 @@ $set 17 #Workspace
3 Nova Area de Trabalho 3 Nova Area de Trabalho
4 Remover Ultima Area de Trabalho 4 Remover Ultima Area de Trabalho
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: erro: necessario especificar um dos seguintes argumentos: -solid, -mod, -gradient\n 1 %s: erro: necessario especificar um dos seguintes argumentos: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/ru_RU/Translation.m
View file

@ -154,7 +154,7 @@ $set 17 #Workspace
3 Новый рабочий стол 3 Новый рабочий стол
4 Удалить последний 4 Удалить последний
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: ошибка: необходимо задать один из следующих ключей: -solid, -mod, -gradient\n 1 %s: ошибка: необходимо задать один из следующих ключей: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/sl_SI/Translation.m
View file

@ -105,7 +105,7 @@ $set 17 #Workspace
3 Nova delovna povr¹ina 3 Nova delovna povr¹ina
4 Odstrani zadnjo 4 Odstrani zadnjo
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: napaka: doloèiti je treba eno: -solid, -mod, -gradient\n 1 %s: napaka: doloèiti je treba eno: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/sv_SE/Translation.m
View file

@ -105,7 +105,7 @@ $set 17 #Workspace
3 Nytt skrivbord 3 Nytt skrivbord
4 Ta bort sista 4 Ta bort sista
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: fel: måste specifiera en av: -solid, -mod, -gradient\n 1 %s: fel: måste specifiera en av: -solid, -mod, -gradient\n
3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\

2
nls/tr_TR/Translation.m
View file

@ -104,7 +104,7 @@ $set 17 #Workspace
3 Yeni Masaüstü 3 Yeni Masaüstü
4 Son Masaüstünü Kaldır 4 Son Masaüstünü Kaldır
$set 18 #bsetroot $set 18 #fbsetroot
1 %s : hata : -solid, -mod yada -gradient'den en az birisini belirlemek zorundasınız\n 1 %s : hata : -solid, -mod yada -gradient'den en az birisini belirlemek zorundasınız\n
3 %s 2.0 : Telif hakkı (c) 1997-2000 Brad Hughes\n\n\ 3 %s 2.0 : Telif hakkı (c) 1997-2000 Brad Hughes\n\n\

2
nls/vi_VN/Translation.m
View file

@ -185,7 +185,7 @@ $set 17 #Workspace
3 Không gian mới 3 Không gian mới
4 Xóa không gian cuối 4 Xóa không gian cuối
$set 18 #bsetroot $set 18 #fbsetroot
1 %s: lỗi: cần đưa ra một trong các từ khóa sau: -solid, -mod, -gradient\n 1 %s: lỗi: cần đưa ra một trong các từ khóa sau: -solid, -mod, -gradient\n
2 Không thể tạo các pixmap! 2 Không thể tạo các pixmap!

8
util/Makefile.am
View file

@ -2,9 +2,9 @@
SUBDIRS= fbrun SUBDIRS= fbrun
INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox
bin_PROGRAMS= bsetroot bin_PROGRAMS= fbsetroot
bsetroot_SOURCES= bsetroot.cc bsetroot.hh fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh
bsetroot_LDADD= ../src/FbRootWindow.o ../src/FbAtoms.o \ fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
../src/FbTk/libFbTk.a ../src/FbTk/libFbTk.a
MAINTAINERCLEANFILES= Makefile.in MAINTAINERCLEANFILES= Makefile.in
@ -16,7 +16,7 @@ all-local: startfluxbox
clean-local: clean-local:
rm -f startfluxbox fluxbox-generate_menu rm -f startfluxbox fluxbox-generate_menu
bsetroot.o: bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \ fbsetroot.o: fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
$(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
startfluxbox: startfluxbox.in startfluxbox: startfluxbox.in

14
util/fbsetbg
View file

@ -61,7 +61,7 @@ display_usage() {
cat << EOF cat << EOF
Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA /path/to/wallpaper] Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA /path/to/wallpaper]
[-r/-R /path/to/wallpaperdirectory] [-r/-R /path/to/wallpaperdirectory]
[-b/-B bsetrootoptions] [-l] [-h] [-i] [-p] [-b/-B fbsetrootoptions] [-l] [-h] [-i] [-p]
Use \`\`$command -h'' for a complete help message. Use \`\`$command -h'' for a complete help message.
EOF EOF
@ -80,7 +80,7 @@ Options:
( if your bgsetter doesn't support this ( if your bgsetter doesn't support this
we fall back to -f ) we fall back to -f )
-u Use specified wallpapersetter, use no argument to forget. -u Use specified wallpapersetter, use no argument to forget.
-b Forward the options to bsetroot. -b Forward the options to fbsetroot.
-r set random wallpaper from a directory -r set random wallpaper from a directory
-F,-C,-T,-A,-U,-B,-R same as uncapsed but without remembering. -F,-C,-T,-A,-U,-B,-R same as uncapsed but without remembering.
@ -174,7 +174,7 @@ message() {
remembercommand() { remembercommand() {
grep -vs "|${DISPLAY}$" ${lastwallpaper} > ${lastwallpaper}.tmp grep -vs "|${DISPLAY}$" ${lastwallpaper} > ${lastwallpaper}.tmp
mv -f ${lastwallpaper}.tmp ${lastwallpaper} mv -f ${lastwallpaper}.tmp ${lastwallpaper}
if [ "$option" = bsetroot ]; then if [ "$option" = fbsetroot ]; then
echo $option'|'$wallpaper'|'$DISPLAY >> $lastwallpaper echo $option'|'$wallpaper'|'$DISPLAY >> $lastwallpaper
return return
fi fi
@ -262,11 +262,11 @@ while [ $# -gt 0 ]; do
wallpaper=$2 wallpaper=$2
remember=false remember=false
break ;; break ;;
-b) option=bsetroot -b) option=fbsetroot
shift shift
wallpaper=$* wallpaper=$*
break ;; break ;;
-B) option=bsetroot -B) option=fbsetroot
shift shift
wallpaper=$* wallpaper=$*
remember=false remember=false
@ -461,8 +461,8 @@ if [ -z "$DISPLAY" ]; then
fi fi
if [ "$option" = bsetroot ]; then if [ "$option" = fbsetroot ]; then
bsetroot $wallpaper fbsetroot $wallpaper
if [ ! "$remember" = false ]; then if [ ! "$remember" = false ]; then
remembercommand remembercommand
fi fi

28
util/bsetroot.cc → util/fbsetroot.cc
View file

@ -20,7 +20,7 @@
// $Id$ // $Id$
#include "bsetroot.hh" #include "fbsetroot.hh"
#include "../src/FbTk/I18n.hh" #include "../src/FbTk/I18n.hh"
#include "../src/FbTk/ImageControl.hh" #include "../src/FbTk/ImageControl.hh"
@ -52,7 +52,7 @@
using namespace std; using namespace std;
bsetroot::bsetroot(int argc, char **argv, char *dpy_name) fbsetroot::fbsetroot(int argc, char **argv, char *dpy_name)
: FbTk::App(dpy_name), m_app_name(argv[0]) { : FbTk::App(dpy_name), m_app_name(argv[0]) {
pixmaps = (Pixmap *) 0; pixmaps = (Pixmap *) 0;
@ -121,7 +121,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
if ((mod + sol + grd) != true) { if ((mod + sol + grd) != true) {
_FB_USES_NLS; _FB_USES_NLS;
cerr<<m_app_name<< cerr<<m_app_name<<
_FBTEXT(bsetroot, MustSpecify, _FBTEXT(fbsetroot, MustSpecify,
"Error: must specify one of: -solid, -mod, -gradient\n", "Error: must specify one of: -solid, -mod, -gradient\n",
"user didn't give one of the required options")<<endl; "user didn't give one of the required options")<<endl;
@ -142,7 +142,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
} }
bsetroot::~bsetroot() { fbsetroot::~fbsetroot() {
XKillClient(display(), AllTemporary); XKillClient(display(), AllTemporary);
if (pixmaps) { // should always be true if (pixmaps) { // should always be true
@ -164,7 +164,7 @@ bsetroot::~bsetroot() {
Eterm and xchat will be able to use Eterm and xchat will be able to use
transparent background transparent background
*/ */
void bsetroot::setRootAtoms(Pixmap pixmap, int screen) { void fbsetroot::setRootAtoms(Pixmap pixmap, int screen) {
Atom atom_root, atom_eroot, type; Atom atom_root, atom_eroot, type;
unsigned char *data_root, *data_eroot; unsigned char *data_root, *data_eroot;
int format; int format;
@ -196,7 +196,7 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
if (atom_root == None || atom_eroot == None) { if (atom_root == None || atom_eroot == None) {
_FB_USES_NLS; _FB_USES_NLS;
cerr<<_FBTEXT(bsetroot, NoPixmapAtoms, "Couldn't create pixmap atoms, giving up!", "Couldn't create atoms to point at root pixmap")<<endl; cerr<<_FBTEXT(fbsetroot, NoPixmapAtoms, "Couldn't create pixmap atoms, giving up!", "Couldn't create atoms to point at root pixmap")<<endl;
exit(1); exit(1);
} }
@ -209,7 +209,7 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
/** /**
Draws pixmaps with a single color Draws pixmaps with a single color
*/ */
void bsetroot::solid() { void fbsetroot::solid() {
register int screen = 0; register int screen = 0;
pixmaps = new Pixmap[ScreenCount(display())]; pixmaps = new Pixmap[ScreenCount(display())];
@ -244,7 +244,7 @@ void bsetroot::solid() {
Draws pixmaps with an 16x16 pattern with Draws pixmaps with an 16x16 pattern with
fg and bg colors. fg and bg colors.
*/ */
void bsetroot::modula(int x, int y) { void fbsetroot::modula(int x, int y) {
char data[32]; char data[32];
long pattern; long pattern;
@ -322,7 +322,7 @@ void bsetroot::modula(int x, int y) {
/** /**
draws pixmaps with a fluxbox texure draws pixmaps with a fluxbox texure
*/ */
void bsetroot::gradient() { void fbsetroot::gradient() {
// using temporaray pixmap and then copying it to background pixmap, as it'll // using temporaray pixmap and then copying it to background pixmap, as it'll
// get crashed somewhere on the way causing apps like XChat chrashing // get crashed somewhere on the way causing apps like XChat chrashing
// as the pixmap has been destroyed // as the pixmap has been destroyed
@ -378,12 +378,12 @@ void bsetroot::gradient() {
/** /**
Shows information about usage Shows information about usage
*/ */
void bsetroot::usage(int exit_code) { void fbsetroot::usage(int exit_code) {
_FB_USES_NLS; _FB_USES_NLS;
cerr<<m_app_name<<" 2.3 : (c) 2003-2004 Fluxbox Development Team"<<endl; cerr<<m_app_name<<" 2.3 : (c) 2003-2005 Fluxbox Development Team"<<endl;
cerr<<m_app_name<<" 2.1 : (c) 2002 Claes Nasten"<<endl; cerr<<m_app_name<<" 2.1 : (c) 2002 Claes Nasten"<<endl;
cerr<<m_app_name<<" 2.0 : (c) 1997-2000 Brad Hughes\n"<<endl; cerr<<m_app_name<<" 2.0 : (c) 1997-2000 Brad Hughes\n"<<endl;
cerr<<_FBTEXT(bsetroot, Usage, cerr<<_FBTEXT(fbsetroot, Usage,
" -display <string> display connection\n" " -display <string> display connection\n"
" -mod <x> <y> modula pattern\n" " -mod <x> <y> modula pattern\n"
" -foreground, -fg <color> modula foreground color\n" " -foreground, -fg <color> modula foreground color\n"
@ -393,7 +393,7 @@ void bsetroot::usage(int exit_code) {
" -to <color> gradient end color\n\n" " -to <color> gradient end color\n\n"
" -solid <color> solid color\n\n" " -solid <color> solid color\n\n"
" -help print this help text and exit\n", " -help print this help text and exit\n",
"bsetroot usage options")<<endl; "fbsetroot usage options")<<endl;
exit(exit_code); exit(exit_code);
} }
@ -421,7 +421,7 @@ int main(int argc, char **argv) {
} }
} }
bsetroot app(argc, argv, display_name); fbsetroot app(argc, argv, display_name);
return (0); return (0);
} }

12
util/bsetroot.hh → util/fbsetroot.hh
View file

@ -20,8 +20,8 @@
// $Id$ // $Id$
#ifndef BSETROOT_HH #ifndef FBSETROOT_HH
#define BSETROOT_HH #define FBSETROOT_HH
#include "../src/FbTk/App.hh" #include "../src/FbTk/App.hh"
@ -31,10 +31,10 @@ class ImageControl;
}; };
class bsetroot : public FbTk::App { class fbsetroot : public FbTk::App {
public: public:
bsetroot(int argc, char **argv, char * dpy_name= 0); fbsetroot(int argc, char **argv, char * dpy_name= 0);
~bsetroot(); ~fbsetroot();
void gradient(); void gradient();
void modula(int, int); void modula(int, int);
@ -52,4 +52,4 @@ private:
}; };
#endif // BSETROOT_HH #endif // FBSETROOT_HH

2
util/startfluxbox.in
View file

@ -44,7 +44,7 @@ else
# #
# This sets a black background # This sets a black background
@pkgbindir@/bsetroot -solid black @pkgbindir@/fbsetroot -solid black
# This shows the fluxbox-splash-screen # This shows the fluxbox-splash-screen
# fbsetbg -C @pkgdatadir@/splash.jpg # fbsetbg -C @pkgdatadir@/splash.jpg