diff --git a/Slax/debian/modules/02-xorg/build b/Slax/debian/modules/02-xorg/build index cd973af..39628c9 100755 --- a/Slax/debian/modules/02-xorg/build +++ b/Slax/debian/modules/02-xorg/build @@ -1,6 +1,6 @@ apt-get update -apt-get install --yes --no-install-recommends xserver-xorg xinit xterm blackbox libxcursor1 breeze-cursor-theme +apt-get install --yes --no-install-recommends xserver-xorg xinit xterm blackbox libxcursor1 breeze-cursor-theme compton # use only white cursors. There were some troubles if the other cursors # was left behind, installing gtk apps reverted the cursor from white to gray, diff --git a/Slax/debian/modules/02-xorg/rootcopy/root/.blackbox-menu b/Slax/debian/modules/02-xorg/rootcopy/root/.blackbox-menu index 9e7113e..f7b16bd 100644 --- a/Slax/debian/modules/02-xorg/rootcopy/root/.blackbox-menu +++ b/Slax/debian/modules/02-xorg/rootcopy/root/.blackbox-menu @@ -1,5 +1,5 @@ [begin] ( Menu ) - [exec] (Terminal) { xterm -ls } + [exec] (Terminal) { xterm } [exec] (Web browser) { chromium } [exit] (Exit) [end] diff --git a/Slax/debian/modules/02-xorg/rootcopy/root/.xinitrc b/Slax/debian/modules/02-xorg/rootcopy/root/.xinitrc index f71e472..eb818e3 100644 --- a/Slax/debian/modules/02-xorg/rootcopy/root/.xinitrc +++ b/Slax/debian/modules/02-xorg/rootcopy/root/.xinitrc @@ -1,4 +1,7 @@ xrdb -merge ~/.Xresources +feh --bg-scale /usr/share/wallpapers/wp.jpg +compton -D 5 -c -f -l -2 -t -2 -r 0 -o 1 -z --shadow-exclude 'bounding_shaped' & + if [ -e /usr/bin/startfluxbox ]; then /usr/bin/startfluxbox else diff --git a/Slax/debian/modules/02-xorg/rootcopy/usr/share/wallpapers/wp.jpg b/Slax/debian/modules/02-xorg/rootcopy/usr/share/wallpapers/wp.jpg new file mode 100644 index 0000000..7391484 Binary files /dev/null and b/Slax/debian/modules/02-xorg/rootcopy/usr/share/wallpapers/wp.jpg differ diff --git a/Slax/debian/modules/03-desktop/patches/fluxbox-slax.diff b/Slax/debian/modules/03-desktop/patches/fluxbox-slax.diff index 39d1b78..8675cab 100644 --- a/Slax/debian/modules/03-desktop/patches/fluxbox-slax.diff +++ b/Slax/debian/modules/03-desktop/patches/fluxbox-slax.diff @@ -33,7 +33,7 @@ cmd_str += " (workspace=[current])"; } -+ if (name.find("menu") != std::string::npos) cmd_str = "Exec fbmenu"; ++ if (name.find("menu") != std::string::npos) cmd_str = "Exec fbappselect"; + FbTk::RefCount > cmd(FbTk::CommandParser::instance().parse(cmd_str)); if (cmd == 0) // we need a command diff --git a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/apps b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/apps index bc6cff9..c421845 100644 --- a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/apps +++ b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/apps @@ -5,9 +5,9 @@ [app] (name=xlunch) [DECO] {NONE} + [IconHidden] {yes} [end] [app] (name=xterm) {1} [Position] (WINCENTER) {0 0} [end] - diff --git a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/keys b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/keys index 196cc42..d96119c 100644 --- a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/keys +++ b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/keys @@ -61,7 +61,7 @@ Mod4 9 :Tab 9 Mod1 F1 :Exec xterm # open a dialog to run programs -Mod1 F2 :Exec fbrun +Mod1 F2 :Exec fbappselect # volume settings, using common keycodes # if these don't work, use xev to find out your real keycodes diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect new file mode 100755 index 0000000..801e6d5 --- /dev/null +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbappselect @@ -0,0 +1,3 @@ +#!/bin/bash + +xlunch --background /usr/share/wallpapers/wp.jpg --voidclickterminate --iconpadding 30 --textpadding 15 --paddingswap --leastmargin 20 diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbmenu b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbmenu deleted file mode 100755 index 02297c9..0000000 --- a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbmenu +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -# menu launcher for fluxbox, just call any app you want to be started as menu - -xlunch --voidclickterminate --rootwindowbackground --iconpadding 30 --textpadding 15 --paddingswap --leastmargin 20 diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/theme.cfg b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/theme.cfg index b91bbca..b264f27 100644 --- a/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/theme.cfg +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/theme.cfg @@ -3,8 +3,6 @@ ! common settings *font: Bitstream Vera Sans-9 -background: flat -background.color: #7790aa toolbar.justify: left toolbar.clock.justify: center