diff --git a/Slax/debian/modules/02-xorg b/Slax/debian/modules/02-xorg/build old mode 100644 new mode 100755 similarity index 88% rename from Slax/debian/modules/02-xorg rename to Slax/debian/modules/02-xorg/build index 2f2a62b..eb2b33b --- a/Slax/debian/modules/02-xorg +++ b/Slax/debian/modules/02-xorg/build @@ -6,7 +6,7 @@ apt-get install --yes --no-install-recommends xserver-xorg xinit xterm blackbox ln -sf /etc/X11/cursors/Breeze_Snow.theme /etc/alternatives/x-cursor-theme -cp cleanup /tmp +cp ../../cleanup /tmp # install x11 server utils, apt-get would add cpp dependency, bullshit! cd /tmp apt-get download x11-xserver-utils @@ -16,4 +16,6 @@ cp -aR * / . /tmp/cleanup +(cd rootcopy && cp --parents -afr * /) + savechanges /02-xorg.sb diff --git a/Slax/debian/rootcopy/root/.Xresources b/Slax/debian/modules/02-xorg/rootcopy/root/.Xresources similarity index 100% rename from Slax/debian/rootcopy/root/.Xresources rename to Slax/debian/modules/02-xorg/rootcopy/root/.Xresources diff --git a/Slax/debian/rootcopy/root/.blackbox-menu b/Slax/debian/modules/02-xorg/rootcopy/root/.blackbox-menu similarity index 66% rename from Slax/debian/rootcopy/root/.blackbox-menu rename to Slax/debian/modules/02-xorg/rootcopy/root/.blackbox-menu index ff1bd2e..9e7113e 100644 --- a/Slax/debian/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] (Web browser) { chromium-guest } + [exec] (Web browser) { chromium } [exit] (Exit) [end] diff --git a/Slax/debian/rootcopy/root/.blackboxrc b/Slax/debian/modules/02-xorg/rootcopy/root/.blackboxrc similarity index 100% rename from Slax/debian/rootcopy/root/.blackboxrc rename to Slax/debian/modules/02-xorg/rootcopy/root/.blackboxrc diff --git a/Slax/debian/rootcopy/root/.xinitrc b/Slax/debian/modules/02-xorg/rootcopy/root/.xinitrc similarity index 99% rename from Slax/debian/rootcopy/root/.xinitrc rename to Slax/debian/modules/02-xorg/rootcopy/root/.xinitrc index 97921c8..f71e472 100644 --- a/Slax/debian/rootcopy/root/.xinitrc +++ b/Slax/debian/modules/02-xorg/rootcopy/root/.xinitrc @@ -8,4 +8,3 @@ else xterm fi fi - diff --git a/Slax/debian/modules/02-xorg/rootcopy/usr/share/blackbox/styles/Slax b/Slax/debian/modules/02-xorg/rootcopy/usr/share/blackbox/styles/Slax new file mode 100644 index 0000000..aefe9ef --- /dev/null +++ b/Slax/debian/modules/02-xorg/rootcopy/usr/share/blackbox/styles/Slax @@ -0,0 +1,79 @@ +*.appearance: flat solid + +*button.pressed.appearance: sunken solid +*button.pressed.backgroundColor: rgb:69/c1/f1 +*button.appearance: parentrelative + +*.focus.backgroundColor: rgb:69/c1/f1 +*.unfocus.backgroundColor: rgb:28/28/28 + +*font: Bitstream Vera Sans-9 + +menu.title.appearance: flat solid +menu.title.backgroundColor: rgb:69/c1/f1 +menu.title.textColor: rgb:28/28/28 +menu.title.alignment: center +menu.title.marginWidth: 6 + +menu.frame.appearance: flat gradient border +menu.frame.textColor: rgb:28/28/28 +menu.frame.foregroundColor: grey40 +menu.frame.borderColor: rgb:69/c1/f1 +menu.frame.borderWidth: 6 +menu.frame.disabledColor: darkgrey +menu.frame.alignment: left +menu.frame.marginWidth: 2 + +menu.active.appearance: flat solid border +menu.active.backgroundColor: rgb:69/c1/f1 +menu.active.borderWidth: 4 +menu.active.borderColor: rgb:69/c1/f1 +menu.active.textColor: rgb:38/38/38 + +rootCommand: bsetroot -solid rgb:77/90/aa + +slit.appearance: raised solid +slit.backgroundColor: rgb:77/90/aa +slit.marginWidth: 3 + +toolbar.appearance: flat gradient border +toolbar.alignment: center +toolbar*textColor: rgb:28/28/28 +toolbar.label.appearance: parentrelative +toolbar.clock.appearance: parentrelative +toolbar.windowLabel.appearance: parentrelative + +window.title.focus.appearance: flat solid +window.title.focus.backgroundColor: rgb:69/c1/f1 +window.title.unfocus.appearance: flat solid +window.title.unfocus.backgroundColor: rgb:d6/d6/d6 +window.title.marginWidth: 5 + +window.label.focus.appearance: parentrelative +window.label.focus.textColor: rgb:28/28/28 +window.label.unfocus.appearance: parentrelative +window.label.unfocus.textColor: rgb:28/28/28 +window.label.marginWidth: 1 + +window.button.focus.appearance: parentrelative +window.button.focus.foregroundColor: white + +window.button.unfocus.appearance: parentrelative +window.button.unfocus.foregroundColor: darkgrey + +window.handle.focus.appearance: flat solid +window.handle.focus.backgroundColor: rgb:69/c1/f1 +window.handle.unfocus.appearance: flat solid +window.handle.unfocus.backgroundColor: rgb:d6/d6/d6 + +window.grip.focus.appearance: flat solid +window.grip.focus.backgroundColor: rgb:69/c1/f1 +window.grip.unfocus.appearance: flat solid +window.grip.unfocus.backgroundColor: rgb:d6/d6/d6 + +window*alignment: center + +window.handleHeight: 7 +window.frame.borderWidth: 7 +window.frame.focus.borderColor: rgb:69/c1/f1 +window.frame.unfocus.borderColor: rgb:d6/d6/d6 diff --git a/Slax/debian/modules/02-xorg/rootcopy/usr/share/icons/locolor/16x16/apps/xterm.xbm b/Slax/debian/modules/02-xorg/rootcopy/usr/share/icons/locolor/16x16/apps/xterm.xbm new file mode 100644 index 0000000..5cf3968 --- /dev/null +++ b/Slax/debian/modules/02-xorg/rootcopy/usr/share/icons/locolor/16x16/apps/xterm.xbm @@ -0,0 +1,6 @@ +#define command2_width 16 +#define command2_height 16 +static unsigned char command2_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xe7, 0xff, 0xcf, 0xff, + 0x9f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x9f, 0xff, 0xcf, 0xff, 0xe7, 0xc1, + 0xf7, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/Slax/debian/modules/03-desktop b/Slax/debian/modules/03-desktop/build old mode 100644 new mode 100755 similarity index 82% rename from Slax/debian/modules/03-desktop rename to Slax/debian/modules/03-desktop/build index 29041c8..4c0e010 --- a/Slax/debian/modules/03-desktop +++ b/Slax/debian/modules/03-desktop/build @@ -9,7 +9,7 @@ VERSION=1.3.5 apt-get update apt-get install --no-install-recommends --yes $NAME feh -. ./cleanup +. ../../cleanup savechanges /$NAME-stock.sb cd / @@ -49,7 +49,7 @@ tar -xf xlunch.tar.gz cd xlunch-master make cp xlunch /squashfs-root/usr/bin -echo -e "#!/bin/bash\nxlunch --voidclickterminate --rootwindowbackground --iconpadding 30 --textpadding 15 --paddingswap --leastmargin 20" >/squashfs-root/usr/bin/fbmenu -chmod ugo+x /squashfs-root/usr/bin/fbmenu + +(cd rootcopy && cp --parents -afr * /) savechanges /03-desktop.sb /squashfs-root diff --git a/Slax/debian/modules/patches/fluxbox-slax.diff b/Slax/debian/modules/03-desktop/patches/fluxbox-slax.diff similarity index 100% rename from Slax/debian/modules/patches/fluxbox-slax.diff rename to Slax/debian/modules/03-desktop/patches/fluxbox-slax.diff diff --git a/Slax/debian/rootcopy/root/.fluxbox/apps b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/apps similarity index 100% rename from Slax/debian/rootcopy/root/.fluxbox/apps rename to Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/apps diff --git a/Slax/debian/rootcopy/root/.fluxbox/fbrun_history b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/fbrun_history similarity index 100% rename from Slax/debian/rootcopy/root/.fluxbox/fbrun_history rename to Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/fbrun_history diff --git a/Slax/debian/rootcopy/root/.fluxbox/init b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/init similarity index 100% rename from Slax/debian/rootcopy/root/.fluxbox/init rename to Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/init diff --git a/Slax/debian/rootcopy/root/.fluxbox/keys b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/keys similarity index 100% rename from Slax/debian/rootcopy/root/.fluxbox/keys rename to Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/keys diff --git a/Slax/debian/rootcopy/root/.fluxbox/lastwallpaper b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/lastwallpaper similarity index 100% rename from Slax/debian/rootcopy/root/.fluxbox/lastwallpaper rename to Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/lastwallpaper diff --git a/Slax/debian/rootcopy/root/.fluxbox/menu b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu similarity index 100% rename from Slax/debian/rootcopy/root/.fluxbox/menu rename to Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu diff --git a/Slax/debian/rootcopy/root/.fluxbox/overlay b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/overlay similarity index 100% rename from Slax/debian/rootcopy/root/.fluxbox/overlay rename to Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/overlay diff --git a/Slax/debian/rootcopy/root/.fluxbox/slitlist b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/slitlist similarity index 100% rename from Slax/debian/rootcopy/root/.fluxbox/slitlist rename to Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/slitlist diff --git a/Slax/debian/rootcopy/root/.fluxbox/startup b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup similarity index 100% rename from Slax/debian/rootcopy/root/.fluxbox/startup rename to Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup diff --git a/Slax/debian/rootcopy/root/.fluxbox/windowmenu b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/windowmenu similarity index 100% rename from Slax/debian/rootcopy/root/.fluxbox/windowmenu rename to Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/windowmenu diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbmenu b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbmenu new file mode 100755 index 0000000..02297c9 --- /dev/null +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbmenu @@ -0,0 +1,4 @@ +#!/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/pixmaps/closefcs.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/closefcs.png new file mode 100644 index 0000000..6843155 Binary files /dev/null and b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/closefcs.png differ diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/closepr.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/closepr.png new file mode 100644 index 0000000..819f59a Binary files /dev/null and b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/closepr.png differ diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/closeunfcs.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/closeunfcs.png new file mode 100644 index 0000000..dabe48c Binary files /dev/null and b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/closeunfcs.png differ diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/maxfcs.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/maxfcs.png new file mode 100644 index 0000000..ae0558e Binary files /dev/null and b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/maxfcs.png differ diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/maxpr.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/maxpr.png new file mode 100644 index 0000000..e87bb1e Binary files /dev/null and b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/maxpr.png differ diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/maxunfcs.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/maxunfcs.png new file mode 100644 index 0000000..f878fe6 Binary files /dev/null and b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/maxunfcs.png differ diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/minfcs.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/minfcs.png new file mode 100644 index 0000000..f67c7ed Binary files /dev/null and b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/minfcs.png differ diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/minpr.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/minpr.png new file mode 100644 index 0000000..100be63 Binary files /dev/null and b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/minpr.png differ diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/minunfcs.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/minunfcs.png new file mode 100644 index 0000000..82b487f Binary files /dev/null and b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/pixmaps/minunfcs.png differ 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 new file mode 100644 index 0000000..b91bbca --- /dev/null +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/share/fluxbox/styles/Slax/theme.cfg @@ -0,0 +1,107 @@ +! Slax fluxbox theme +! (c) Tomas Matejicek + +! common settings +*font: Bitstream Vera Sans-9 +background: flat +background.color: #7790aa + +toolbar.justify: left +toolbar.clock.justify: center +window.justify: center +menu.title.justify: center +menu.frame.justify: left + +! window +window.focus.backgroundColor: #63b4fb +window.unfocus.backgroundColor: #ebebeb +window.focus.borderColor: #63b4fb +window.unfocus.borderColor: #ebebeb +window.borderWidth: 6 +window.handleWidth: 0 + +! title +window.title.height: 18 +window.title.focus: flat solid +window.title.focus.color: #63b4fb +window.label.focus: parentrelative +window.label.focus.textColor: #282828 +window.title.unfocus: flat solid +window.title.unfocus.color: #ebebeb +window.label.unfocus: parentrelative +window.label.unfocus.textColor: #282828 + +! buttons +window.button.focus: flat solid +window.button.focus.color: #63b4fb +window.button.focus.picColor: #282828 +window.button.pressed: sunken solid +window.button.pressed.color: #63b4fb +window.button.pressed.picColor: #000000 +window.button.unfocus: flat solid +window.button.unfocus.color: #ebebeb +window.button.unfocus.picColor: #282828 + +window.close.pixmap: closefcs.png +window.close.unfocus.pixmap: closeunfcs.png +window.close.pressed.pixmap: closepr.png +window.iconify.pixmap: minfcs.png +window.iconify.unfocus.pixmap: minunfcs.png +window.iconify.pressed.pixmap: minpr.png +window.maximize.pixmap: maxfcs.png +window.maximize.unfocus.pixmap: maxunfcs.png +window.maximize.pressed.pixmap: maxpr.png + +! taskbar +toolbar.height: 18 +toolbar.bevelWidth: 0 +toolbar.borderWidth: 3 +toolbar.borderColor: #333333 +toolbar: flat solid + +toolbar.color: #333333 +toolbar.clock: flat solid +toolbar.clock.color: #333333 +toolbar.clock.textColor: white + +toolbar.iconbar.empty: flat +toolbar.iconbar.empty.color: #333333 + +toolbar.iconbar.focused.borderWidth: 0 +toolbar.iconbar.focused: flat +toolbar.iconbar.focused.color: #666666 +toolbar.iconbar.focused.textColor: white +toolbar.iconbar.focused.justify: left + +toolbar.iconbar.unfocused.borderWidth: 0 +toolbar.iconbar.unfocused: flat +toolbar.iconbar.unfocused.color: #333333 +toolbar.iconbar.unfocused.textColor: white +toolbar.iconbar.unfocused.justify: left + +toolbar.button: flat solid +toolbar.button.color: #333333 +toolbar.button.picColor: #61CA00 +toolbar.button.pressed: flat solid + +! menu +menu.title: flat solid +menu.title.color: #555555 +menu.title.textColor: #dddddd +menu.title.justify: center + +menu.bevelWidth: 4 +menu.borderWidth: 6 +menu.borderColor: #555555 + +menu.frame: flat solid +menu.frame.color: #bbbbbb +menu.frame.textColor: #000000 +menu.frame.justify: left + +menu.hilite: flat solid +menu.hilite.textColor: #ffffff +menu.hilite.color: #303030 + +menu.bullet: none +menu.bullet.position: right diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/apps/xterm.xbm b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/apps/xterm.xbm new file mode 100644 index 0000000..5cf3968 --- /dev/null +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/apps/xterm.xbm @@ -0,0 +1,6 @@ +#define command2_width 16 +#define command2_height 16 +static unsigned char command2_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xe7, 0xff, 0xcf, 0xff, + 0x9f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x9f, 0xff, 0xcf, 0xff, 0xe7, 0xc1, + 0xf7, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/Slax/debian/modules/04-chromium b/Slax/debian/modules/04-chromium/build old mode 100644 new mode 100755 similarity index 58% rename from Slax/debian/modules/04-chromium rename to Slax/debian/modules/04-chromium/build index d5fe766..aee397d --- a/Slax/debian/modules/04-chromium +++ b/Slax/debian/modules/04-chromium/build @@ -2,8 +2,12 @@ apt-get update apt-get install --yes --no-install-recommends chromium -. ./cleanup +. ../../cleanup rm -Rf /usr/share/icons/gnome/256x256 +mv /usr/bin/chromium /usr/bin/chromium-bin + +(cd rootcopy && cp --parents -afr * /) + savechanges /04-chromium.sb diff --git a/Slax/debian/modules/04-chromium/rootcopy/usr/bin/chromium b/Slax/debian/modules/04-chromium/rootcopy/usr/bin/chromium new file mode 100755 index 0000000..1a6c379 --- /dev/null +++ b/Slax/debian/modules/04-chromium/rootcopy/usr/bin/chromium @@ -0,0 +1,3 @@ +#!/bin/bash +xhost + +su -c chromium guest diff --git a/Slax/debian/modules/cleanup b/Slax/debian/modules/cleanup deleted file mode 120000 index 89d1336..0000000 --- a/Slax/debian/modules/cleanup +++ /dev/null @@ -1 +0,0 @@ -../cleanup \ No newline at end of file