wok-next rev 12475

fluxbox: better SliTaz integration, use XDG xsessions
author Christophe Lincoln <pankso@slitaz.org>
date Mon Apr 23 15:17:56 2012 +0200 (2012-04-23)
parents b3dc4f05cd0f
children aac186c7f28e
files fluxbox-themes/receipt fluxbox-tools/receipt fluxbox/receipt fluxbox/stuff/fluxbox-gcc-4.3.3.diff fluxbox/stuff/fluxbox-session fluxbox/stuff/init fluxbox/stuff/menu fluxbox/stuff/slitaz.menu fluxbox/stuff/startup fluxbox/stuff/styles/SliTaz fluxbox/stuff/xsessions/fluxbox.desktop
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/fluxbox-themes/receipt	Mon Apr 23 15:17:56 2012 +0200
     1.3 @@ -0,0 +1,24 @@
     1.4 +# SliTaz package receipt.
     1.5 +
     1.6 +PACKAGE="fluxbox-themes"
     1.7 +VERSION="1.3.2"
     1.8 +CATEGORY="x-window"
     1.9 +SHORT_DESC="Fluxbox additionnal themes."
    1.10 +MAINTAINER="pankso@slitaz.org"
    1.11 +WEB_SITE="http://www.fluxbox.org/"
    1.12 +WANTED="fluxbox"
    1.13 +
    1.14 +DEPENDS="fluxbox"
    1.15 +
    1.16 +# Rules to gen a SliTaz package suitable for Tazpkg.
    1.17 +genpkg_rules()
    1.18 +{
    1.19 +	mkdir -p $fs/usr/share/fluxbox
    1.20 +	cp -a $install/usr/share/fluxbox/styles $fs/usr/share/fluxbox
    1.21 +	# Rome style provided by fluxbox package
    1.22 +	for s in Shade Flux Results
    1.23 +	do
    1.24 +		rm -rf $fs/usr/share/fluxbox/styles/$s
    1.25 +	done
    1.26 +}
    1.27 +
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/fluxbox-tools/receipt	Mon Apr 23 15:17:56 2012 +0200
     2.3 @@ -0,0 +1,22 @@
     2.4 +# SliTaz package receipt.
     2.5 +
     2.6 +PACKAGE="fluxbox-tools"
     2.7 +VERSION="1.3.2"
     2.8 +CATEGORY="x-window"
     2.9 +SHORT_DESC="Fluxbox additionnal tools (fbsetroot)."
    2.10 +MAINTAINER="pankso@slitaz.org"
    2.11 +WEB_SITE="http://www.fluxbox.org/"
    2.12 +WANTED="fluxbox"
    2.13 +
    2.14 +DEPENDS="fluxbox"
    2.15 +
    2.16 +# Rules to gen a SliTaz package suitable for Tazpkg.
    2.17 +genpkg_rules()
    2.18 +{
    2.19 +	mkdir -p $fs/usr/bin
    2.20 +	for t in fbsetroot fbsetbg fluxbox-generate_menu fluxbox-remote \
    2.21 +		fluxbox-update_configs
    2.22 +	do
    2.23 +		cp -a $install/usr/bin/$t $fs/usr/bin
    2.24 +	done
    2.25 +}
     3.1 --- a/fluxbox/receipt	Mon Apr 23 13:29:57 2012 +0200
     3.2 +++ b/fluxbox/receipt	Mon Apr 23 15:17:56 2012 +0200
     3.3 @@ -10,14 +10,13 @@
     3.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     3.5  TAGS="wm window-manager"
     3.6  
     3.7 -DEPENDS="xorg fontconfig imlib2"
     3.8 -BUILD_DEPENDS="xorg fontconfig imlib2"
     3.9 +DEPENDS="xorg fontconfig imlib2 hsetroot xorg-xcompmgr"
    3.10 +BUILD_DEPENDS="xorg-dev fontconfig-dev imlib2-dev"
    3.11  
    3.12  # Rules to configure and make the package.
    3.13  compile_rules()
    3.14  {
    3.15  	cd $src
    3.16 -	#patch -p1 < $stuff/fluxbox-gcc-4.3.3.diff
    3.17  	./configure $CONFIGURE_ARGS &&
    3.18  	make && make install
    3.19  }
    3.20 @@ -31,20 +30,41 @@
    3.21  	do
    3.22  		cp -a $install/usr/share/fluxbox/$f $fs/usr/share/fluxbox
    3.23  	done
    3.24 -	for s in Shade Flux bloe Results
    3.25 +	
    3.26 +	# 3 Default themes --> fluxbox-themes
    3.27 +	for s in Shade Flux Results
    3.28  	do
    3.29  		cp -a $install/usr/share/fluxbox/styles/$s \
    3.30  			$fs/usr/share/fluxbox/styles
    3.31  	done
    3.32 +	
    3.33 +	# Split tools --> fluxbox-tools
    3.34 +	for t in fbsetroot fbsetbg fluxbox-generate_menu fluxbox-remote \
    3.35 +		fluxbox-update_configs
    3.36 +	do
    3.37 +		rm $fs/usr/bin/$t
    3.38 +	done
    3.39 +	
    3.40 +	# XDG Xsessions
    3.41 +	cp -a $stuff/xsessions $fs/usr/share
    3.42 +	
    3.43 +	# Custom SliTaz integration
    3.44 +	mkdir -p $fs/usr/share/slitaz/fluxbox
    3.45 +	cp -a $stuff/fluxbox-session $fs/usr/bin
    3.46 +	cp $stuff/startup $fs/usr/share/slitaz/fluxbox
    3.47 +	cp $stuff/styles $fs/usr/share/fluxbox
    3.48 +	# Overwrite
    3.49 +	cp $stuff/menu $fs/usr/share/fluxbox
    3.50 +	cp $stuff/init $fs/usr/share/fluxbox
    3.51  }
    3.52  
    3.53  post_install()
    3.54  {
    3.55 -	res=`cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//`
    3.56 +	res=$(cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//)
    3.57  	# Adding WM to SLIM available sessions.
    3.58  	if ! echo "$res" | grep -q $PACKAGE; then
    3.59  		echo -n "Adding $PACKAGE to /etc/slim.conf..."
    3.60 -		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" /etc/slim.conf
    3.61 +		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" $1/etc/slim.conf
    3.62  		status
    3.63  	fi
    3.64  }
     4.1 --- a/fluxbox/stuff/fluxbox-gcc-4.3.3.diff	Mon Apr 23 13:29:57 2012 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,11 +0,0 @@
     4.4 -diff -up fluxbox-1.0.0/src/main.cc.gcc43 fluxbox-1.0.0/src/main.cc
     4.5 ---- fluxbox-1.0.0/src/main.cc.gcc43	2008-03-27 01:19:22.000000000 -0400
     4.6 -+++ fluxbox-1.0.0/src/main.cc	2008-03-27 01:20:15.000000000 -0400
     4.7 -@@ -49,6 +49,7 @@
     4.8 - #include <fstream>
     4.9 - #include <stdexcept>
    4.10 - #include <typeinfo>
    4.11 -+#include <cstring>
    4.12 - 
    4.13 - using std::cout;
    4.14 - using std::cerr;
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/fluxbox/stuff/fluxbox-session	Mon Apr 23 15:17:56 2012 +0200
     5.3 @@ -0,0 +1,25 @@
     5.4 +#!/bin/sh
     5.5 +#
     5.6 +# SliTaz GNU/Linux Fluxbox session script. This script let use Flux
     5.7 +# like Openbox autostart and user dont have to call fluxbox into ther
     5.8 +# startup script. We also set some XDG variables. 
     5.9 +#
    5.10 +
    5.11 +fluxdir="$HOME/.fluxbox"
    5.12 +
    5.13 +# Export XDG standard directories.
    5.14 +export XDG_CONFIG_HOME="$HOME/.config"
    5.15 +export XDG_CACHE_HOME="$HOME/.cache"
    5.16 +export XDG_CURRENT_DESKTOP=fluxbox
    5.17 +
    5.18 +# Make sure we have config files.
    5.19 +if [ ! -x "$fluxdir/startup" ]; then
    5.20 +	cp /usr/share/slitaz/fluxbox/startup $fluxdir
    5.21 +	chmod +x $fluxdir/startup
    5.22 +fi
    5.23 +
    5.24 +# Run the user Fluxbox startup script.
    5.25 +$fluxdir/startup
    5.26 +
    5.27 +# Now we start fluxbox itself.
    5.28 +exec fluxbox
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/fluxbox/stuff/init	Mon Apr 23 15:17:56 2012 +0200
     6.3 @@ -0,0 +1,9 @@
     6.4 +! If you're looking for settings to configure, they won't be saved here until
     6.5 +! you change something in the fluxbox configuration menu.
     6.6 +
     6.7 +session.menuFile:	~/.fluxbox/menu
     6.8 +session.keyFile: ~/.fluxbox/keys
     6.9 +session.styleFile: /usr/share/fluxbox/styles/SliTaz
    6.10 +session.configVersion:	13
    6.11 +session.screen0.window.unfocus.alpha:	132
    6.12 +session.screen0.slit.placement:	RightCenter
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/fluxbox/stuff/menu	Mon Apr 23 15:17:56 2012 +0200
     7.3 @@ -0,0 +1,38 @@
     7.4 +# SliTaz GNU/Linux Fluxbox default menu.
     7.5 +#
     7.6 +[begin] (SliTaz Fluxbox)
     7.7 +[encoding] {UTF-8}
     7.8 +	[exec] (Run application) {fbrun} </usr/share/icons/SliTaz/mimetypes/32/exec.png>
     7.9 +[submenu] (Applications) </usr/share/pixmaps/slitaz-menu.png>
    7.10 +	[exec] (Terminal emulator) {terminal}
    7.11 +	[exec] (File manager) {file-manager}
    7.12 +	[exec] (Web browse) {midori}
    7.13 +	[exec] (Text editor) {editor}
    7.14 +	[exec] (Packages manager) {terminal -e tazpkg shell}
    7.15 +	[exec] (Process viewer) {terminal -e top}
    7.16 +[end]
    7.17 +[submenu] (Desktop effects) </usr/share/icons/SliTaz/apps/22/desktop-effects.png>
    7.18 +	[exec] (Activate composite) {xcompmgr}
    7.19 +	[exec] (Activate shadows) {xcompmgr -c -r 10 -o 0.5}
    7.20 +	[exec] (Stop effects) {killall xcompmgr}
    7.21 +[end]
    7.22 +[workspaces] (Workspace List) </usr/share/icons/SliTaz/places/32/desktop.png>
    7.23 +[submenu] (Wallpaper image) </usr/share/icons/SliTaz/mimetypes/32/image-x-generic.png>
    7.24 +    [wallpapers] (/usr/share/images) {hsetroot -fill}
    7.25 +    [wallpapers] (~/Images/Wallpapers) {hsetroot -fill}
    7.26 +[end]
    7.27 +[config] (Configure Fluxbox) </usr/share/icons/SliTaz/categories/22/preferences-desktop.png>
    7.28 +[submenu] (Fluxbox tools) </usr/share/icons/SliTaz/categories/22/applications-system.png>
    7.29 +[submenu] (System Styles) {Choose a style...}
    7.30 +	[stylesdir] (/usr/share/fluxbox/styles) 
    7.31 +[end]
    7.32 +[submenu] (User Styles) {Choose a style...}
    7.33 +	[stylesdir] (~/.fluxbox/styles) 
    7.34 +[end]
    7.35 +	[commanddialog] (Fluxbox Command) 
    7.36 +	[reconfig] (Reload Fluxbox config) 
    7.37 +	[restart] (Restart Fluxbox)
    7.38 +[end]
    7.39 +[exit] (Exit Session) </usr/share/pixmaps/slitaz-logout.png>
    7.40 +[endencoding]
    7.41 +[end]
     8.1 --- a/fluxbox/stuff/slitaz.menu	Mon Apr 23 13:29:57 2012 +0200
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,32 +0,0 @@
     8.4 -# SliTaz GNU/Linux Fluxbox default menu.
     8.5 -#
     8.6 -[begin] (Fluxbox)
     8.7 -[encoding] {UTF-8}
     8.8 -      [exec] (Xterm) {xterm} 
     8.9 -      [exec] (Midori) {midori} 
    8.10 -      [exec]   (Run) {fbrun} 
    8.11 -[submenu] (Terminals)
    8.12 -      [exec]   (Xterm) {xterm}
    8.13 -      [exec]   (Sakura) {sakura}
    8.14 -[end]
    8.15 -[workspaces] (Workspace List)
    8.16 -[submenu] (Fluxbox menu)
    8.17 -      [config] (Configure) 
    8.18 -[submenu] (System Styles) {Choose a style...}
    8.19 -      [stylesdir] (/usr/share/fluxbox/styles) 
    8.20 -[end]
    8.21 -[submenu] (User Styles) {Choose a style...}
    8.22 -      [stylesdir] (~/.fluxbox/styles) 
    8.23 -[end]
    8.24 -[submenu] (Window Managers)
    8.25 -      [restart] (openbox) {openbox} 
    8.26 -[end]
    8.27 -      [commanddialog] (Fluxbox Command) 
    8.28 -      [reconfig] (Reload config) 
    8.29 -      [restart] (Restart) 
    8.30 -      
    8.31 -[end]
    8.32 -[separator] 
    8.33 -[exit] (Exit) 
    8.34 -[endencoding]
    8.35 -[end]
     9.1 --- a/fluxbox/stuff/startup	Mon Apr 23 13:29:57 2012 +0200
     9.2 +++ b/fluxbox/stuff/startup	Mon Apr 23 15:17:56 2012 +0200
     9.3 @@ -1,14 +1,18 @@
     9.4  #!/bin/sh
     9.5  #
     9.6 -# SliTaz GNU/Linux Fluxbox start up script.
     9.7 +# SliTaz GNU/Linux Fluxbox system wide session script.
     9.8  #
     9.9  
    9.10 -# DBUS message bus (automount removable devices)
    9.11 -dbus-launch --sh-syntax --exit-with-session &
    9.12 +# Start DBUS session.
    9.13 +if [ ! "$DBUS_SESSION_BUS_ADDRESS" ]; then
    9.14 +	dbus-launch --sh-syntax --exit-with-session &
    9.15 +fi
    9.16  
    9.17 -# Start PCmanFM as daemon for Wallpaper and desktop icons.
    9.18 -pcmanfm -d &
    9.19 +# Start PCmanFM as daemon (Can be used for wallpaper and desktop icons).
    9.20 +#pcmanfm -d &
    9.21  
    9.22 -# Now we start fluxbox itself. To keep a log you can use:
    9.23 -# exec fluxbox -log "/home/pankso/.fluxbox/log"
    9.24 -exec fluxbox
    9.25 +# Set a background image using hsetroot.
    9.26 +hsetroot -fill /usr/share/images/slitaz-background.jpg &
    9.27 +
    9.28 +# Start the composite manager th get full Flucbox transparency
    9.29 +xcompmgr &
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/fluxbox/stuff/styles/SliTaz	Mon Apr 23 15:17:56 2012 +0200
    10.3 @@ -0,0 +1,89 @@
    10.4 +
    10.5 +*font:							Sans Condensed-8:bold
    10.6 +
    10.7 +toolbar:						flat solid
    10.8 +toolbar.color:					#443b31
    10.9 +toolbar.justify:				left
   10.10 +toolbar.font:					sans-10:bold
   10.11 +toolbar.height:					20
   10.12 +toolbar.borderWidth:			0
   10.13 +toolbar.clock:					flat
   10.14 +toolbar.clock.font:				Sans Condensed-10:bold
   10.15 +toolbar.clock.color:			#443b31
   10.16 +toolbar.clock.textColor:		#ffffff
   10.17 +toolbar.workspace:				flat
   10.18 +toolbar.workspace.color:		#443b31
   10.19 +toolbar.workspace.textColor:	#cfcfcf
   10.20 +toolbar.iconbar.borderWidth:			0
   10.21 +toolbar.iconbar.focused: 				flat
   10.22 +toolbar.iconbar.focused.color:  		#443b31
   10.23 +toolbar.iconbar.focused.textColor:		#ffffff
   10.24 +toolbar.iconbar.focused.justify:		left
   10.25 +toolbar.iconbar.unfocused: 				flat
   10.26 +toolbar.iconbar.unfocused.color:  		#443b31
   10.27 +toolbar.iconbar.unfocused.textColor:	#b1b1b1
   10.28 +toolbar.iconbar.unfocused.justify:		left
   10.29 +
   10.30 +menu.title:					flat
   10.31 +menu.title.color:			#f1f1f1
   10.32 +menu.title.textColor:		#444444
   10.33 +menu.title.font:			sans-10
   10.34 +menu.title.justify:			center
   10.35 +menu.frame:					flat solid
   10.36 +menu.frame.color:			#443b31
   10.37 +menu.frame.textColor:		#ffffff
   10.38 +menu.frame.disableColor:	#cfcfcf
   10.39 +menu.frame.font:			sans-10
   10.40 +menu.frame.justify:			left
   10.41 +menu.bullet.position:		right
   10.42 +menu.bullet:				triangle
   10.43 +menu.hilite:				flat solid
   10.44 +menu.hilite.color:			#d66018
   10.45 +menu.hilite.textColor:		#ffffff
   10.46 +menu.borderWidth:			0
   10.47 +
   10.48 +window.bevelWidth:				3
   10.49 +window.justify:					left
   10.50 +window.roundCorners: 			TopRight TopLeft BotomRight BottomLeft
   10.51 +window.title.height:			22
   10.52 +#window.title.focus:			flat vertical gradient
   10.53 +window.title.focus:				flat solid
   10.54 +window.title.focus.color:		#443b31
   10.55 +#window.title.focus.colorTo:	#ededed
   10.56 +window.title.unfocus:			flat solid
   10.57 +window.title.unfocus.color:		#443b31
   10.58 +
   10.59 +window.label.focus:				flat solid
   10.60 +window.label.focus.color:		#443b31
   10.61 +window.label.focus.textColor:	#ffffff
   10.62 +window.label.unfocus:			flat solid
   10.63 +window.label.unfocus.color:		#443b31
   10.64 +window.label.unfocus.textColor:	#b1b1b1
   10.65 +
   10.66 +window.button.focus:			flat solid
   10.67 +window.button.focus.color:		#443b31
   10.68 +window.button.focus.picColor:	#cfcfcf
   10.69 +window.button.unfocus:			flat solid
   10.70 +window.button.unfocus.color:	#443b31
   10.71 +window.button.unfocus.picColor:	#b1b1b1
   10.72 +
   10.73 +window.borderColor:				#443b31
   10.74 +
   10.75 +window.handle.focus:			flat
   10.76 +window.handle.focus.color:		#d66018
   10.77 +window.handle.unfocus:			flat solid
   10.78 +window.handle.unfocus.color:	#443b31
   10.79 +
   10.80 +window.grip.focus:			flat solid
   10.81 +window.grip.focus.color:	#443b31
   10.82 +window.grip.unfocus:		flat solid
   10.83 +window.grip.unfocus.color:	#dadada
   10.84 +
   10.85 +*button.pressed:		flat solid
   10.86 +*button.pressed.color:	#cfcfcf
   10.87 +
   10.88 +bevelWidth:			2
   10.89 +borderWidth:		1
   10.90 +handleWidth:		3
   10.91 +
   10.92 +
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/fluxbox/stuff/xsessions/fluxbox.desktop	Mon Apr 23 15:17:56 2012 +0200
    11.3 @@ -0,0 +1,6 @@
    11.4 +[Desktop Entry]
    11.5 +Encoding=UTF-8
    11.6 +Type=XSession
    11.7 +Name=Fluxbox Session
    11.8 +Name[fr]=Session Fluxbox
    11.9 +Exec=fluxbox-session