# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1334937926 -7200
# Node ID cb76ed027bffefc7e75099f9806b2ef6856ca75c
# Parent  612c43caa4ec0fc36c0296d04fe394776cb0aa59
karmen: better integration and use XDG standard

diff -r 612c43caa4ec -r cb76ed027bff karmen/receipt
--- a/karmen/receipt	Fri Apr 20 18:04:27 2012 +0200
+++ b/karmen/receipt	Fri Apr 20 18:05:26 2012 +0200
@@ -8,28 +8,30 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://karmen.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-DEPENDS="xorg-libX11 xorg-xsetroot wbar"
+TAGS="wm window-manager"
+
+DEPENDS="xorg-libX11 xorg-xsetroot nano xterm xorg-xclock dialog"
 BUILD_DEPENDS="xorg-libX11-dev"
-TAGS="wm window-manager"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	./configure --prefix=/usr &&
-	make &&
-	make DESTDIR=$PWD/_pkg install
+	./configure --prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
+	mkdir -p $fs/usr/share
 	cp -a $_pkg/usr/bin $fs/usr
 	# Custom configuration and scripts.
-	cp -a stuff/karmen-session $fs/usr/bin
-	cp -a stuff/karmen-conf $fs/usr/bin
-	cp -a stuff/etc $fs
+	install -m 0755 $stuff/karmen-session $fs/usr/bin
+	install -m 0755 $stuff/karmen-conf $fs/usr/bin
+	cp -a $stuff/xsessions $fs/usr/share
+	cp -a $stuff/etc $fs
 	chown 0.0 $fs/usr/bin/*
 }
 
@@ -39,7 +41,7 @@
 	# Adding WM to SLIM available sessions.
 	if ! echo "$res" | grep -q $PACKAGE; then
 		echo -n "Adding $PACKAGE to /etc/slim.conf..."
-		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" /etc/slim.conf
+		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" $1/etc/slim.conf
 		status
 	fi
 }
diff -r 612c43caa4ec -r cb76ed027bff karmen/stuff/etc/xdg/karmen/autostart.sh
--- a/karmen/stuff/etc/xdg/karmen/autostart.sh	Fri Apr 20 18:04:27 2012 +0200
+++ b/karmen/stuff/etc/xdg/karmen/autostart.sh	Fri Apr 20 18:05:26 2012 +0200
@@ -5,9 +5,13 @@
 xsetroot -solid grey4 &
 
 # Cursor setting.
-xsetroot -cursor_name arrow
+xsetroot -cursor_name arrow &
 
-# Wbar icons panel with a custom config file for Karmen providing
-# a settings and logout function.
-(sleep 2 && wbar -config $HOME/.config/karmen/wbar -pos top center \
-	-jumpf 0 -zoomf 1.8 -isize 24 -bpress -balfa 0) &
+# Start an Xterm.
+xterm &
+
+# Start Karmen configurator/menu
+xterm -geometry 50x20 -e karmen-conf &
+
+# Xclock
+xclock &
diff -r 612c43caa4ec -r cb76ed027bff karmen/stuff/etc/xdg/karmen/wbar
--- a/karmen/stuff/etc/xdg/karmen/wbar	Fri Apr 20 18:04:27 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# The Bar && Font
-i: /usr/share/wbar/iconpack/osxbarback.png
-t: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans/12
-c:
-
-i: /usr/share/pixmaps/xterm.png
-c: /usr/bin/xterm
-t: Terminal
-
-i: /usr/share/pixmaps/preferences.png
-c: /usr/bin/xterm -e 'karmen-conf'
-t: Karmen configuration
-
-i: /usr/share/pixmaps/logout.png
-c: /usr/bin/killall karmen
-t: Logout
diff -r 612c43caa4ec -r cb76ed027bff karmen/stuff/karmen-conf
--- a/karmen/stuff/karmen-conf	Fri Apr 20 18:04:27 2012 +0200
+++ b/karmen/stuff/karmen-conf	Fri Apr 20 18:05:26 2012 +0200
@@ -11,35 +11,31 @@
 --title " Karmen settings " \
 --menu "" 15 70 5 \
 "autostart" "Autostarted applications" \
-"wbar" "Wbat icons panel configuration" \
-"quit" "Exit Karmen configuration" \
+"exitwm" "Exit Karmen session" \
+"reboot" "Reboot system" \
+"quit" "Quit Karmen configuration" \
 2>&1 1>&3`
 retval=$?
 exec 3>&-
+
 case $retval in
-	0)
-		continue ;;
-	1)
-		echo "Cancel pressed."
-		exit 0 ;;
+	0) continue ;;
+	1) echo "Cancel pressed." && exit 0 ;;
 	255)
 		if test -n "$value"; then
 			echo "$value"
 		else
-			echo "ESC pressed."
-			exit 0
+			echo "ESC pressed." && exit 0
 		fi ;;
 esac
 
 case $value in
 	autostart)
 		nano $CONFIG_DIR/autostart.sh 
-		exec $PWD/karmen-dialog ;;
-	wbar)
-		nano $CONFIG_DIR/wbar
-		exec $PWD/karmen-dialog ;;
-	quit)
-		continue ;;
+		exec $(basename $0) ;;
+	exitwm) killall karmen ;;
+	reboot) reboot || reboot -f ;;
+	quit) continue ;;
 esac
 
 exit 0
diff -r 612c43caa4ec -r cb76ed027bff karmen/stuff/karmen-session
--- a/karmen/stuff/karmen-session	Fri Apr 20 18:04:27 2012 +0200
+++ b/karmen/stuff/karmen-session	Fri Apr 20 18:05:26 2012 +0200
@@ -3,14 +3,15 @@
 # Start Karmen X session on SliTaz
 #
 
-CONFIG_DIR="$HOME/.config/karmen"
-AUTOSTART_SCRIPT="${CONFIG_DIR}/autostart.sh"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CURRENT_DESKTOP=karmen
+AUTOSTART_SCRIPT="${XDG_CONFIG_HOME}/karmen/autostart.sh"
 
 # These file are provided by SliTaz to provide a better experience
 # with Karmen. Autostart script for applications and Wbar with a logout
 # icon.
-if [ ! -d "$CONFIG_DIR" ]; then
-	cp -a /etc/xdg/karmen $CONFIG_DIR
+if [ ! -d "$XDG_CONFIG_HOME/karmen" ]; then
+	cp -r /etc/xdg/karmen $XDG_CONFIG_HOME
 fi
 
 # Source autostarted applications.
diff -r 612c43caa4ec -r cb76ed027bff karmen/stuff/xsessions/karmen.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/karmen/stuff/xsessions/karmen.desktop	Fri Apr 20 18:05:26 2012 +0200
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Name=Karmen Session
+Exec=karmen