diff --git a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup index 8fa2a05..9f017ec 100644 --- a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup +++ b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup @@ -13,6 +13,16 @@ xrdb -merge ~/.Xresources # set background color xsetroot -solid '#000000' -cursor_name watch +# this is a bit tricky +SND=/usr/share/sounds/startup.wav +if [ -r $SND ]; then + sleep 1 & + SLEEPID=$! + cat $SND > /dev/null # preload whole file + aplay $SND & + waitpid $SLEEPID +fi + # Applications you want to run with fluxbox. # MAKE SURE THAT APPS THAT KEEP RUNNING HAVE AN ''&'' AT THE END. # diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect index 60e018e..79bc703 100755 --- a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect @@ -1,13 +1,26 @@ #!/bin/bash -exec xlunch --input /etc/xlunch/entries.dsv --background /usr/share/wallpapers/wp.jpg --voidclickterminate --iconpadding 30 --textpadding 10 --paddingswap --leastmargin 10 --hidemissing --iconsize 128 --font DejaVuSans/11 --highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png --outputonly | while read LINE; do +exec xlunch --input /etc/xlunch/entries.dsv \ + --background /usr/share/wallpapers/wp.jpg --font DejaVuSans/11 \ + --voidclickterminate --iconpadding 30 --textpadding 10 \ + --paddingswap --leastmargin 10 --hidemissing --iconsize 128 \ + --highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \ + --outputonly | while read LINE; do + cmd="$(echo $LINE | sed -r "s/\\s.*//")" whi="$(which $cmd | head -n 1)" Xdep=$(ldd $whi | grep libX11) + Ndep=$(ldd $whi | grep libncurses) + + WAIT='echo "--------------------------------------------------"; read -n 1 -s -r -p "Command finished. Press any key to close window..."' + if [ "$Ndep" != "" -o "$cmd" = "man" -o "$cmd" = "mc" ]; then + WAIT="" + fi if [ "$Xdep" = "" -a "$cmd" != "chromium" ]; then - xterm -e bash -c "echo '$LINE'; $LINE; echo; read -n 1 -s -r -p 'Command finished. Press any key to close window...'" + xterm -ls -e bash --login -c -- "echo $USER@$HOSTNAME:$PWD# '$LINE'; $LINE; $WAIT" else $LINE fi + done diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout index b5538b7..4f50577 100755 --- a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout @@ -7,6 +7,14 @@ exec xlunch --input /etc/xlunch/logout.dsv --noprompt \ --highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \ --outputonly | while read LINE; do + SND=/usr/share/sounds/shutdown.wav + + if [ "$LINE" != "" -a -r $SND ]; then + cat $SND > /dev/null # precache + aplay $SND & + sleep 2 + fi + if [ "$LINE" = "logout" ]; then killall Xorg fi