# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1334937867 -7200
# Node ID 612c43caa4ec0fc36c0296d04fe394776cb0aa59
# Parent  e666c5086b541440d98575f1afae05cbaa025de0
jwm: better integration and use XDG xsession

diff -r e666c5086b54 -r 612c43caa4ec jwm/receipt
--- a/jwm/receipt	Fri Apr 20 18:02:26 2012 +0200
+++ b/jwm/receipt	Fri Apr 20 18:04:27 2012 +0200
@@ -8,11 +8,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.joewing.net/programs/jwm/"
 WGET_URL="http://www.joewing.net/programs/jwm/releases/$TARBALL"
-CONFIG_FILES="/etc/jwm/system.jwmrc"
 TAGS="wm window-manager"
 
-DEPENDS="xorg slitaz-configs"
-BUILD_DEPENDS="xorg-dev xorg-libXft-dev jpeg-dev"
+DEPENDS="xorg-libX11 xorg-libXft xorg-libXrender xorg-libXpm xorg-libXext \
+xorg-libXmu xorg-libXinerama xorg-libXau xorg-libXdmcp xorg-libXt libjpeg \
+libpng slitaz-configs-base xorg-xload xorg-xclock nano"
+BUILD_DEPENDS="xorg-dev xorg-libXft-dev jpeg-dev libpng-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -23,7 +24,7 @@
 	./configure \
     	--prefix=/usr \
     	--mandir=/usr/share/man \
-		--sysconfdir=/etc/jwm \
+		--sysconfdir=/etc/xdg/jwm \
 		--disable-fribidi \
 		$CONFIGURE_ARGS &&
 	make
@@ -32,15 +33,20 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin $fs/etc/jwm
+	mkdir -p $fs/usr/bin $fs/etc/xdg/jwm $fs/usr/share
 	cp -a $src/src/jwm $fs/usr/bin
 	# Simple and default config file.
-	cp $stuff/simple.jwmrc $fs/etc/jwm/simple.jwmrc
-	cp $stuff/slitaz.jwmrc $fs/etc/jwm/system.jwmrc
+	cp $stuff/simple.jwmrc $fs/etc/xdg/jwm/simple.jwmrc
+	cp $stuff/slitaz.jwmrc $fs/etc/xdg/jwm/system.jwmrc
+	cp -r $stuff/xsessions $fs/usr/share
 }
 
 post_install()
 {
+	if [ -d "$1/etc/jwm" ]; then
+		echo "Removing old system wide configs: $1/etc/jwm"
+		rm -rf $1/etc/jwm
+	fi
 	res=$(cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//)
 	# Adding WM to SLIM available sessions.
 	if ! echo "$res" | grep -q $PACKAGE; then
diff -r e666c5086b54 -r 612c43caa4ec jwm/stuff/jwmbgconf
--- a/jwm/stuff/jwmbgconf	Fri Apr 20 18:02:26 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-#!/bin/sh
-# 
-# Gtkdialog box to change JWM backgroud.
-# - SliTaz GNU/Linux 2008.
-#
-VERSION=20080305
-
-# Get current image zype and path.
-LINE=`cat ~/.jwmrc | grep -w '^      <Background type='`
-TYPE=${LINE#*=\"}
-TYPE=${TYPE%%\"\>*}
-BG_PATH=${LINE#*\"$TYPE\">}
-export BG_PATH=${BG_PATH%</Background>}
-
-# We need an actions to be executed by another window dialog
-# to get values from the main dialog variables.
-export ACTION='
-  <vbox>
-    <text use-markup="true" width-chars="28">
-      <label>
-"
-<b>Changing JWM background</b>
-"
-      </label>
-    </text>
-    <progressbar>
-      <label>Please wait...</label>
-      <action>sed -i s#$BG_PATH#$NEW_PATH# $HOME/.jwmrc</action>
-      <input>echo 50; jwm -restart; echo 100</input>
-      <action type="closewindow">ACTION</action>
-    </progressbar>
-  </vbox>
-'
-
-# Image type, path and reload button. We use \" to be Ash compatible.
-#
-export BG_DIALOG="
-<window title=\"JWM Background\">
-  <vbox>
-    
-        <text use-markup=\"true\" width-chars=\"50\">
-      <label>
-\"
-<b>Wallpaper - JWM Background image</b>
-\"
-</label>
-    </text>
-      
-      <hbox>
-        <entry>
-          <default>$BG_PATH</default>
-          <variable>NEW_PATH</variable>
-        </entry>
-        <button>
-          <input file icon=\"image\"></input>
-          <action type=\"fileselect\">NEW_PATH</action>
-        </button>
-      </hbox>
-    
-    <hbox>
-      <button>
-        <label>Change Wallpaper</label>
-        <input file icon=\"reload\"></input>
-        <action type=\"launch\">ACTION</action>
-      </button>
-      <button>
-        <input file icon=\"exit\"></input>
-        <action type=\"exit\">Exit</action>
-      </button>
-    </hbox>
-  
-  </vbox>
-</window>
-"
-
-# Execute main dialog.
-gtkdialog --program=BG_DIALOG
-
-exit 0
diff -r e666c5086b54 -r 612c43caa4ec jwm/stuff/slitaz.jwmrc
--- a/jwm/stuff/slitaz.jwmrc	Fri Apr 20 18:02:26 2012 +0200
+++ b/jwm/stuff/slitaz.jwmrc	Fri Apr 20 18:04:27 2012 +0200
@@ -2,41 +2,58 @@
 
 <JWM>
 
-   <!-- The root menu, if this is undefined you will not get a menu. -->
-   <!-- Additional RootMenu attributes: onroot, labeled, label -->
-   <RootMenu height="26" onroot="123">
-      <Program icon="xterm.png" label="Terminal">terminal</Program>
-
-      <Menu icon="" label="Applications">
-         <Program icon="" label="Nano Text editor">terminal -e nano</Program>
-         <Program icon="" label="Retawq Web browser">terminal -e retawq</Program>
-      </Menu>
-      
-      <Separator/>
-      <Restart label="Restart" icon="restart.png"/>
-      <Exit label="Exit" confirm="true" icon="exit.png"/>
-   </RootMenu>
+	<!-- The root menu, if this is undefined you will not get a menu. -->
+	<!-- Additional RootMenu attributes: onroot, labeled, label -->
+	<RootMenu height="24" onroot="12">
+		<Menu icon="applications-system.png" label="System Tools">
+			<Program icon="applications-other.png" label="Xload Monitor">
+				xload -nolabel -bg black -fg grey -hl orange
+			</Program>
+			<Program icon="utilities-system-monitor.png" label="Top Monitor">
+				terminal -e top
+			</Program>
+		</Menu>
+		<Menu icon="applications-internet.png" label="Network">
+			<Program icon="internet-web-browser.png" label="Retawq Web browser">
+				terminal -e retawq
+			</Program>
+			<Program icon="xterm.png" label="Scan loclhost ports">
+				terminal -e "(pscan localhost; read i)"
+			</Program>
+		</Menu>
+		<Program icon="tazpkg.png" label="Packages manager">terminal -e tazpkg shell</Program>
+		<Program icon="text-editor.png" label="Nano Text editor">terminal -e nano</Program>
+		<Program icon="xterm.png" label="Terminal">terminal</Program>
+	</RootMenu>
+	
+	<RootMenu height="24" onroot="3">
+		<Program icon="system-shut-down.png" label="Shut down system">reboot</Program>
+		<Program icon="system-restart.png" label="Reboot system">reboot</Program>
+		<Exit label="Exit JWM" confirm="true" icon="system-suspend.png"/>
+		<Restart label="Restart JWM" icon="system-restart.png"/>
+	</RootMenu>
 
    <!-- Additional tray attributes: autohide, width, border, layer, layout -->
    <Tray  x="0" y="-1" height="26">
 
       <!-- Additional TrayButton attribute: label -->
-      <TrayButton label="SliTaz">root:1</TrayButton>
+      <TrayButton label="Application">root:1</TrayButton>
+      <TrayButton label="System">root:3</TrayButton>
 
-      <TrayButton label="_">showdesktop</TrayButton>
+      <!-- <TrayButton label="_">showdesktop</TrayButton> -->
 
       <!-- Additional Pager attributes; width, height -->
-      <Pager labeled="false"/>
+      <Pager labeled="false" />
 
       <!-- Additional TaskList attribute: maxwidth -->
-      <TaskList maxwidth="256"/>
+      <TaskList maxwidth="250"/>
 
-      <Dock/>
+      <Dock />
 
       <!-- Additional Swallow attribute: height -->
-      <!-- <Swallow name="xload" width="64">
-         xload -nolabel -bg black -fg red -hl white
-      </Swallow> -->
+      <Swallow name="xload" width="40">
+		  xload -nolabel -bg black -fg grey -hl orange
+      </Swallow>
 
       <Clock>xclock</Clock>
 
@@ -48,7 +65,7 @@
 
       <Font>FreeSans-9:bold</Font>
       <Width>4</Width>
-      <Height>24</Height>
+      <Height>26</Height>
 
       <Active>
          <Text>#cfcfcf</Text>
@@ -68,7 +85,7 @@
    </WindowStyle>
 
    <TaskListStyle>
-      <Font>FreeSans-11:bold</Font>
+      <Font>FreeSans-9:bold</Font>
       <ActiveForeground>black</ActiveForeground>
       <ActiveBackground>gray80:gray90</ActiveBackground>
       <Foreground>black</Foreground>
@@ -78,7 +95,7 @@
    <!-- Additional TrayStyle attribute: insert -->
    <TrayStyle>
       <Font>FreeSans-11:bold</Font>
-      <Background>gray90</Background>
+      <Background>#f9f7f3</Background>
       <Foreground>black</Foreground>
       <Opacity>0.75</Opacity>
    </TrayStyle>
@@ -86,33 +103,31 @@
    <PagerStyle>
       <Outline>black</Outline>
       <Foreground>gray90</Foreground>
-      <Background>#808488</Background>
+      <Background>#666666</Background>
       <ActiveForeground>#70849d</ActiveForeground>
       <ActiveBackground>#2e3a67</ActiveBackground>
    </PagerStyle>
 
    <MenuStyle>
-      <Font>FreeSans-12:bold</Font>
+      <Font>FreeSans-10:bold</Font>
       <Foreground>black</Foreground>
-      <Background>gray90</Background>
+      <Background>#f9f7f3</Background>
       <ActiveForeground>white</ActiveForeground>
-      <ActiveBackground>#70849d:#2e3a67</ActiveBackground>
+      <ActiveBackground>#7A6753:#443b31</ActiveBackground>
       <Opacity>0.85</Opacity>
    </MenuStyle>
 
    <PopupStyle>
-      <Font>FreeSans-10</Font>
-      <Outline>black</Outline>
+      <Font>FreeSans-16</Font>
+      <Outline>#dddddd</Outline>
       <Foreground>black</Foreground>
-      <Background>yellow</Background>
+      <Background>#f9f7f3</Background>
    </PopupStyle>
 
-   <IconPath>
-      $HOME/Images/Icons
-   </IconPath>
-   <IconPath>
-      /usr/share/pixmaps
-   </IconPath>
+   <IconPath>$HOME/.icons</IconPath>
+   <IconPath>/usr/share/pixmaps</IconPath>
+   <IconPath>/usr/share/icons/SliTaz/apps/22</IconPath>
+   <IconPath>/usr/share/icons/SliTaz/categories/22</IconPath>
 
    <!-- Virtual Desktops -->
    <!-- Desktop tags can be contained within Desktops for desktop names. -->
@@ -128,9 +143,7 @@
 
    <!-- Startup and shutdown commands. -->
    <StartupCommand></StartupCommand>
-   <ShutdownCommand>
-      killall Xorg; clear; sleep 2; clear; echo "JWM exit OK. Press ENTER to continue... "
-   </ShutdownCommand>
+   <ShutdownCommand></ShutdownCommand>
 
    <!-- Double click speed (in milliseconds) -->
    <DoubleClickSpeed>400</DoubleClickSpeed>
@@ -169,4 +182,3 @@
    <Key mask="A" key="F2">window</Key>
 
 </JWM>
-
diff -r e666c5086b54 -r 612c43caa4ec jwm/stuff/xsessions/jwm.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jwm/stuff/xsessions/jwm.desktop	Fri Apr 20 18:04:27 2012 +0200
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Name=JWM Desktop
+Name[fr]=Bureau JWM
+Exec=jwm
+