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

fbsetbg updates from han

Browse source
This commit is contained in:
rathnor 2004-03-11 00:08:34 +00:00
parent bfcc24bac7
commit e7ebe530bc
2 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 0.9.9: Changes for 0.9.9:
*04/03/11:
* fbsetbg: special Esetroot check and message improvements (Han)
*04/03/08: *04/03/08:
* Fix focus passing when grouping (Simon) * Fix focus passing when grouping (Simon)
Window.cc Window.cc

41
util/fbsetbg
View file

@ -23,7 +23,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# #
# $Id: fbsetbg,v 1.29 2004/01/22 05:48:41 fluxgen Exp $ # $Id: fbsetbg,v 1.30 2004/03/11 00:08:34 rathnor Exp $
# Portability notes: # Portability notes:
# To guarantee this script works on all platforms that support fluxbox # To guarantee this script works on all platforms that support fluxbox
@ -33,7 +33,7 @@
# - don't use [ -e file ] use [ -r file ] # - don't use [ -e file ] use [ -r file ]
# - don't use $(), use `` # - don't use $(), use ``
# - don't use ~, use ${HOME} # - don't use ~, use ${HOME}
# - don't use id -u, use whoami # - don't use id -u or $UID, use whoami
# - don't use echo -e # - don't use echo -e
# - getopts won't work on all platforms, but the config-file can # - getopts won't work on all platforms, but the config-file can
# compensate for that. # compensate for that.
@ -154,13 +154,20 @@ case `uname` in
esac esac
message() { message() {
# echo if we have terminal output, otherwise
# pop up a window # This Terminal detection method is inaccurate. Looking for a
if [ -t 1 ]; then # replacement.
echo "$command: $@"
else # echo if we have terminal output, otherwise pop up a window
xmessage -center "$command: $@" # if [ -t 1 ]; then
fi # echo "$command: $@"
# else
if find_it gxmessage; then
gxmessage -center "$command: $@"
else
xmessage -center "$command: $@"
fi
# fi
} }
remembercommand() { remembercommand() {
@ -181,7 +188,7 @@ remembercommand() {
debugfbsetbg() { debugfbsetbg() {
echo echo
echo $debugstory echo $debugstory
echo echo $sad_esetroot_story
exit 0 exit 0
} }
@ -278,6 +285,9 @@ while [ $# -gt 0 ]; do
message "No previous wallpaper recorded for display ${DISPLAY}" message "No previous wallpaper recorded for display ${DISPLAY}"
exit 1 exit 1
fi fi
else
message "No previous wallpaper recorded for display ${DISPLAY}"
exit 1
fi fi
remember=false remember=false
break ;; break ;;
@ -317,8 +327,15 @@ if [ "$setterfromcommandline" != true ]; then
fi fi
for wpsetter in $wpsetters; do for wpsetter in $wpsetters; do
if find_it $wpsetter; then if find_it $wpsetter; then
WPSETTER=$wpsetter if [ ! "$wpsetter" = Esetroot ]; then
break WPSETTER=$wpsetter
break
elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
WPSETTER=$wpsetter
break
else
sad_esetroot_story="I also found Esetroot, but it doesn't have support for setting wallpapers. You need to install libimlib2 and rebuild Eterm to get it working."
fi
fi fi
done done
fi fi