# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1634986542 0
# Node ID db9d9cb3c164ca286879231de4c04799b7fbffa7
# Parent  787a1807d2bba575401cab3ef4b29160b581ea7b
lxsession, lxsession-lxpolkit, lxappearance: misc fixes (thanks Saipul)

diff -r 787a1807d2bb -r db9d9cb3c164 lxappearance/receipt
--- a/lxappearance/receipt	Mon Oct 18 14:47:15 2021 +0000
+++ b/lxappearance/receipt	Sat Oct 23 10:55:42 2021 +0000
@@ -12,8 +12,8 @@
 TAGS="LXDE"
 HOST_ARCH="i486 arm"
 
-DEPENDS="gtk+"
-BUILD_DEPENDS="xorg-libX11-dev gtk+-dev"
+DEPENDS="gtk+ dbus-glib"
+BUILD_DEPENDS="xorg-libX11-dev gtk+-dev dbus-glib-dev"
 
 current_version()
 {
@@ -26,6 +26,7 @@
 {
 	./configure \
 		--sysconfdir=/etc \
+		--enable-dbus \
 		$CONFIGURE_ARGS &&
 	make && make install
 }
diff -r 787a1807d2bb -r db9d9cb3c164 lxsession-lxpolkit/receipt
--- a/lxsession-lxpolkit/receipt	Mon Oct 18 14:47:15 2021 +0000
+++ b/lxsession-lxpolkit/receipt	Sat Oct 23 10:55:42 2021 +0000
@@ -9,7 +9,7 @@
 WEB_SITE="https://wiki.lxde.org/en/LXSession"
 WANTED="lxsession"
 
-DEPENDS="dbus gtk+"
+DEPENDS="dbus gtk+ consolekit2"
 
 HOST_ARCH="i486 arm"
 
@@ -17,6 +17,8 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
+	mkdir -p $fs/usr/share/lxsession/ui
 
 	cp -a $install/usr/bin/lxpolkit		$fs/usr/bin
+	cp -a $install/usr/share/lxsession/ui/lxpolkit*.ui	$fs/usr/share/lxsession/ui
 }
diff -r 787a1807d2bb -r db9d9cb3c164 lxsession/receipt
--- a/lxsession/receipt	Mon Oct 18 14:47:15 2021 +0000
+++ b/lxsession/receipt	Sat Oct 23 10:55:42 2021 +0000
@@ -37,12 +37,15 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share
+	mkdir -p $fs/usr/share/lxsession/ui
 	mkdir -p $fs/etc/xdg/lxsession/LXDE
 
 	cp -a $install/usr/bin		$fs/usr
+	cp -a $install/usr/libexec	$fs/usr
+	cp -a $install/usr/share/lxsession/ui/lxsession*.ui	$fs/usr/share/lxsession/ui
 	rm -f				$fs/usr/bin/lxpolkit
 	# Use SliTaz Icon theme for lxsession-logout
 	cp -a $stuff/desktop.conf	$fs/etc/xdg/lxsession/LXDE
+	touch 				$fs/etc/xdg/lxsession/LXDE/autostart
 	chown -R 0.0			$fs
 }
diff -r 787a1807d2bb -r db9d9cb3c164 slitaz-configs-base/receipt
--- a/slitaz-configs-base/receipt	Mon Oct 18 14:47:15 2021 +0000
+++ b/slitaz-configs-base/receipt	Sat Oct 23 10:55:42 2021 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-configs-base"
-VERSION="317"
+VERSION="320"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz config files for text based systems."
 MAINTAINER="pankso@slitaz.org"
diff -r 787a1807d2bb -r db9d9cb3c164 slitaz-configs/receipt
--- a/slitaz-configs/receipt	Mon Oct 18 14:47:15 2021 +0000
+++ b/slitaz-configs/receipt	Sat Oct 23 10:55:42 2021 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-configs"
-VERSION="318"
+VERSION="320"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz config files and artwork."
 MAINTAINER="pankso@slitaz.org"
diff -r 787a1807d2bb -r db9d9cb3c164 slitaz-tools-boxes/receipt
--- a/slitaz-tools-boxes/receipt	Mon Oct 18 14:47:15 2021 +0000
+++ b/slitaz-tools-boxes/receipt	Sat Oct 23 10:55:42 2021 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-tools-boxes"
-VERSION="1036"
+VERSION="1037"
 CATEGORY="system-tools"
 SHORT_DESC="All SliTaz GTK/Yad boxes to command line tools."
 MAINTAINER="pankso@slitaz.org"
diff -r 787a1807d2bb -r db9d9cb3c164 slitaz-tools/receipt
--- a/slitaz-tools/receipt	Mon Oct 18 14:47:15 2021 +0000
+++ b/slitaz-tools/receipt	Sat Oct 23 10:55:42 2021 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-tools"
-VERSION="1036"
+VERSION="1037"
 CATEGORY="system-tools"
 SHORT_DESC="SliTaz tools provide installer and utils usable on terminal."
 MAINTAINER="pankso@slitaz.org"
diff -r 787a1807d2bb -r db9d9cb3c164 sokojs/receipt
--- a/sokojs/receipt	Mon Oct 18 14:47:15 2021 +0000
+++ b/sokojs/receipt	Sat Oct 23 10:55:42 2021 +0000
@@ -17,6 +17,7 @@
 	sed -i '/sokojs.zip/d;/src.htm/d' level.htm
 	sed -i 's|Online.* ) ||' sokojs.htm
 	patch -p0 < $stuff/sokojs.u
+	patch -p0 < $stuff/undo.u
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 787a1807d2bb -r db9d9cb3c164 sokojs/stuff/htm2slc.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sokojs/stuff/htm2slc.sh	Sat Oct 23 10:55:42 2021 +0000
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+case "$0" in
+*2txt*)
+  [ -z "$1" ] && echo "$0 file" && exit 1
+  sed '/^"\|<L>\|<Level/!d;s|.*<Level Id="|; |;s| *<L>||;s|</L>||;s| *"[,)].*||;s|^"||;s|".*||;s|_| |g;/^$/d' "$1" | awk 'BEGIN {n=1000;h=0}
+{ s[h++]=$0
+  if (/^;/) next
+  for (i=1;i<n && substr($0,i,1) == " ";i++);
+  if (i<n) n=i
+} END { for (i=0;i<h;i++) if (substr(s[i],1,1) == ";") print s[i]; else print substr(s[i],n) }'
+  exit;;
+esac
+
+[ -z "$1" ] && echo "$0 set/" && exit 1
+[ ! -s "$1/level0.htm" ] && echo "$1/level0.htm not found" && exit 2
+
+cat <<EOT
+<?xml version="1.0" encoding="utf-8"?>
+<SokobanLevels xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="SokobanLev.xsd">
+EOT
+[ -s $1/description.txt ] && awk 'BEGIN { state=0 }
+{ 
+  if (state == 0) { state++; print "  <Title>" $0 "</Title>"; print "  <Description>" }
+  else {
+    if (/[A-Za-z0-9]@[A-Za-z0-9]/) s="  <Email>" $0 "</Email>"
+    else if (/^http/) s="  <Url>" $0 "</Url>"
+    else if (!/^copyright/) { print; next }
+    else next
+    if (state++ == 1) print "  </Description>"
+    print s
+  }
+} END { if (state == 1) print "  </Description>" }' $1/description.txt
+copyright="$(grep -s ^copyright $1/description.txt | sed 's|^copyright |Copyright="|;s|$|" |')"
+maxwidth="$(sed '/^"/!d;s| *"[,)].*||;s|^" *||' $1/level*.htm | awk 'BEGIN{w=0}{if(w<length($0)) w=length($0)}END{print w}')"
+maxheight="$(for i in $1/level*.htm; do sed '/^"/!d;s| *"[,)].*||;s|^" *||;/^$/d' $i | wc -l; done | awk 'BEGIN{h=0}{if(h<$0) h=$0}END{print h}')"
+echo "  <LevelCollection ${copyright}MaxWidth=\"$maxwidth\" MaxHeight=\"$maxheight\">"
+n=0
+while [ -s "$1/level$n.htm" ]; do
+   i="$1/level$((n++)).htm"
+   id="$(sed '/^\/\/ /!d;/[0-9]x[0-9]*\+[0-9]*\+[0-9]/!d;s|^// ||;s| [0-9]*x[0-9]*.*||' $i)"
+   sed '/^"/!d;s| *"[,)].*||;s|^"||;s|_| |g;/^$/d' $i | awk -vx="${id:-$(basename $i .htm)}" '
+BEGIN {n=1000;w=0;h=0} {
+ s[h]=$0
+ for (i=1;i<n && substr($0,i,1) == " ";i++);
+ if (i<n) n=i
+ if (w<length($0)) w=length($0)
+ h++
+} END { print "    <Level Id=\"" x "\" Width=\"" w-n+1 "\" Height=\"" h "\">"
+ for (i=0;i<h;i++) print "      <L>" substr(s[i],n) "</L>"
+ print "    </Level>" }'
+done
+cat <<EOT
+  </LevelCollection>
+</SokobanLevels>
+EOT
diff -r 787a1807d2bb -r db9d9cb3c164 sokojs/stuff/multiset.sh
--- a/sokojs/stuff/multiset.sh	Mon Oct 18 14:47:15 2021 +0000
+++ b/sokojs/stuff/multiset.sh	Sat Oct 23 10:55:42 2021 +0000
@@ -3,18 +3,20 @@
 [ -s level.htm ] && rm level.htm && patch -p0 <<EOT
 --- main.htm
 +++ main.htm
-@@ -11,8 +11,9 @@ Voir : http://www.gnu.org/licenses/gpl.h
- -->
- <html>
- <head>
-+<META HTTP-EQUIV="Content Type" CONTENT="text/html;charset=utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
--<style>
-+<style type="text/css">
- <!--
+@@ -19,7 +19,11 @@
+ width:30px;
+ height:30px;
+ }
+-
++a{
++color:red;
++text-decoration:none;
++display:block;
++}
+ @media screen and (max-width: 450px) {
  img.r{
- width:30px;
-@@ -76,19 +77,19 @@ if (parent.frames[0] == null) { document
+ width:29px;
+@@ -77,8 +81,11 @@
  var ie4= (navigator.appName == "Microsoft Internet Explorer")?1:0;
  var ns4= (navigator.appName=="Netscape")?1:0;
  
@@ -22,93 +24,115 @@
 -Col    = 16
 +Row = eval(parent.frames[0].document.forms[1].elements[0].value)
 +Col = eval(parent.frames[0].document.forms[1].elements[1].value)
++CurSet = parent.frames[0].document.forms[1].elements[2].value
++maxLevel = eval(parent.frames[0].document.forms[1].elements[3].value)
++nbLevel = eval(parent.frames[0].document.forms[0].elements[(Row*Col)+1].value)
  
  function Nmajevent(evenement)
  {
-            if (evenement.which == 52 || evenement.which == 37) {
-         Move(eval(manpos) - 1)
-     } else if (evenement.which == 56 || evenement.which == 38) {
--        Move(eval(manpos) - Row)
-+        Move(eval(manpos) - Col)
-     } else if (evenement.which == 54 || evenement.which == 39) {
-         Move(eval(manpos) + 1)
-     } else if (evenement.which == 50 || evenement.which == 40) {
--        Move(eval(manpos) + Row)
-+        Move(eval(manpos) + Col)
-     }
- }
+@@ -124,6 +131,10 @@
  
-@@ -108,7 +109,7 @@ function Imajevent(){
-          if (window.event.keyCode == 37) {
-      Move(eval(manpos) - 1)
-   } else if (window.event.keyCode == 38) {
--     Move(eval(manpos) - Row)
-+     Move(eval(manpos) - Col)
-   } else if (window.event.keyCode == 39) {
-      Move(eval(manpos) + 1)
-   } else if (window.event.keyCode == 40) {
-@@ -150,7 +151,7 @@ manU  = new Image(30, 30); manU.src = "8
+ <script type="text/javascript">
+ <!--
++if (parent.window.location.search.length > 1 && parent.frames[0].location.hash.length == 0 &&
++    parent.frames[0].location.href.indexOf(parent.window.location.search.substring(1)) < 0)
++    parent.frames[0].location = parent.window.location.search.substring(1)
++
+ if (document.all) {
+   top.window.resizeTo(800, 600);
+ } else if (document.layers || document.getElementById) {
+@@ -151,13 +162,26 @@
  manD  = new Image(30, 30); manD.src = "9.gif"; // down
  
  level = new Array()
 -maxLevel = 97
-+maxLevel = eval(parent.frames[0].document.forms[1].elements[3].value)
  moves = 0
+ saved = ""
  
++function urlself()
++{
++  var l = parent.window.location
++  return l.href.substring(0, l.href.length - l.search.length - l.hash.length)+
++         "?"+CurSet+"/level"+nbLevel+".htm#"+saved
++}
++
++function seturl()
++{
++  var e = document.getElementById("urlsave")
++  e.setAttribute("href", urlself());
++}
++
  function ReloadLevel() {
-@@ -168,14 +169,18 @@ function ReloadLevel() {
+   manpos = parent.frames[0].document.forms[0].elements[Row*Col].value
+   moves = 0
++  saved = ""
+   window.status = ""
+   nbBoxin = 0
+   for (i = 0 ; i < Row * Col; i++) {
+@@ -168,9 +192,18 @@
+   document.images[manpos].src = eval("manD.src")
+ }
  
++function Go(d,n) {
++  parent.frames[0].document.location = d + "/level" + n + ".htm#" + d
++  seturl()
++}
++
  function GoLevel(n) {
    if (n == nbLevel) ReloadLevel()
 -  parent.frames[0].document.location = "level" + n + ".htm"
-+  parent.frames[0].document.location = parent.frames[0].document.forms[1].elements[2].value + "/level" + n + ".htm"
++  Go(CurSet, n)
 +}
 +
 +function GoSet() {
-+  parent.frames[0].document.location = document.getElementById('set').value + "/level0.htm"
++  Go(document.getElementById('set').value, 0)
  }
  
  function dir(d) {
-   if (d ==   -1) return "L";
-   if (d ==    1) return "R";  
--  if (d ==  Row) return "D";    
--  if (d == -Row) return "U";      
-+  if (d ==  Col) return "D";    
-+  if (d == -Col) return "U";      
+@@ -214,6 +247,7 @@
+       m = eval("man"+c.toUpperCase()+".src")
+     } while (c == c.toLowerCase())
+     document.images[manpos].src = m
++    seturl()
+   }
  }
  
- function print_moves(m) {
-@@ -226,7 +231,7 @@ function Move(a) {
+@@ -224,9 +258,9 @@
+     var m = dir(d).toLowerCase()
+     if (level[a] == boxin || level[a] == boxout)  {
+       b = a + d  
+-      ++moves
+       m = dir(d)
+       if (level[b] == floor || level[b] == dest)  {
++        ++moves
+         level[a] == boxin ? (level[a] = dest,  nbBoxin++) : level[a] = floor
+         level[b] == dest  ? (level[b] = boxin, nbBoxin--) : level[b] = boxout
+         document.images[b].src = eval("img" + level[b] + ".src")
+@@ -243,7 +277,7 @@
      if (nbBoxin == 0) {
        if (nbLevel < maxLevel) {
          alert("You have done a good job !")
 -        parent.frames[0].location = "level" + (++nbLevel) + ".htm"
-+        parent.frames[0].document.location = parent.frames[0].document.forms[1].elements[2].value + "/level" + (++nbLevel) + ".htm"
++        parent.frames[0].document.location = CurSet + "/level" + (++nbLevel) + ".htm"
          GoLevel(nbLevel)
        } else {
          alert("Congratulations !")
-@@ -246,14 +251,14 @@ function Move(a) {
-   for (y = 0 ; y < Row; y++) {
-     document.write ("<TR>")
-     for (x = 0; x < Col; x++) {
--      level[x + Row * y] = parent.frames[0].document.forms[0].elements[x + Row * y].value
--      if (level[x + Row * y] == dest) nbBoxin++
--      if (level[x + Row * y] == land || level[x + Row * y] == wall)
-+      level[x + Col * y] = parent.frames[0].document.forms[0].elements[x + Col * y].value
-+      if (level[x + Col * y] == dest) nbBoxin++
-+      if (level[x + Col * y] == land || level[x + Col * y] == wall)
-         document.write("<TD VALIGN=TOP>",
--          "<IMG align=middle class=r border=0 src=\"", level[x + Row * y], ".gif\"<\/TD>")
-+          "<IMG align=middle class=r border=0 src=\"", level[x + Col * y], ".gif\"<\/TD>")
-       else
--        document.write("<TD VALIGN=TOP><A HREF=\"JavaScript:Move(", x + Row * y, ")\">",
--          "<IMG align=middle class=r border=0 src=\"", level[x + Row * y], ".gif\"</A><\/TD>")      
-+        document.write("<TD VALIGN=TOP><A HREF=\"JavaScript:Move(", x + Col * y, ")\">",
-+          "<IMG align=middle class=r border=0 src=\"", level[x + Col * y], ".gif\"</A><\/TD>")      
+@@ -251,6 +285,7 @@
+       }
      }
-     document.write("<\/TR>")
    }
-@@ -266,8 +271,16 @@ function Move(a) {
++  seturl()
+ }
+   window.focus()
+   window.status = ""
+@@ -277,21 +312,32 @@
+   }
+   document.write("<\/TABLE>")
+   manpos = parent.frames[0].document.forms[0].elements[Row*Col].value
+-  nbLevel = parent.frames[0].document.forms[0].elements[(Row*Col)+1].value
+ 
+   document.write("</table><TABLE cellspacing=0 cellpadding=0 style='max-width:300px'><TD>")
+ 
   document.write("<FORM>",
    "<INPUT TYPE=button onClick=\"Javascript:ReloadLevel();\" value=\"Restart\">",
    "<INPUT TYPE=button onClick=\"Javascript:UndoMove();\" value=\"Undo\"><p id=\"moves\" style=\"color:white\">0 moves</p></center>")
@@ -118,14 +142,26 @@
 +  document.write("<option>sokojs</option>");
 +  document.write("</select><br />")
 +  document.write("<body style=\"margin:0\" bgcolor=\"black\">&nbsp;<b><FONT FACE=\"Comic Sans MS\" SIZE=4 COLOR=\"red\">",
-+    parent.frames[0].document.forms[1].elements[2].value," LEVEL ",
-+  eval(parent.frames[0].document.forms[0].elements[(Row*Col)+1].value) + 1,"<br/>")
++    "<a id=\"urlsave\" href=\"",urlself(),"\">",CurSet," LEVEL ",nbLevel + 1,"</a><br/>")
    for (i = 0; i <= maxLevel; i++) {
 -    document.write("<INPUT style='font-family:Courier New;font-size:14px;font-weight:bold;border:1;border-color:0;padding:0;margin:0px;background-color:#c0c0c0;color:#404040ù' TYPE=\"button\" onClick=\"Javascript:GoLevel(", i, ");\" value=\"", (i<9?"&nbsp;":"")+(i+1), "\">")
 +    document.write("<INPUT "+style+" TYPE=\"button\" onClick=\"Javascript:GoLevel(", i, ");\" value=\"", (i<9?"&nbsp;":"")+(i+1), "\">")
    }
    document.write("<\/FORM></table>")
  
+   document.images[manpos].src = eval("manD.src")
++
++  if (parent.window.location.hash.length > 1 && parent.frames[0].location.hash.length == 0) {
++    for (i = 2; i <= parent.window.location.hash.length; i++)
++      Move(manpos-undoDir(parent.window.location.hash.substring(i-1,i)))
++  }
+ //-->
+ </script>
+ 
+ </body>
+-</html>
+\ No newline at end of file
++</html>
 --- sokojs.htm
 +++ sokojs.htm
 @@ -22,14 +22,13 @@ Foundation, Inc., 59 Temple Place - Suit
@@ -161,4 +197,10 @@
                "<INPUT TYPE=\\"button\\" value=\\"97\\"><\\/FORM>")' > sokojs/$l
 	rm -f $l
 done
-
+[ -s sokojs/description.txt ] || cat > sokojs/description.txt <<EOT
+SokoJS
+Sokoban Game for Javascript
+michel.buze@gmail.com
+http://buze.michel.chez.com
+copyright Michel BUZE
+EOT
diff -r 787a1807d2bb -r db9d9cb3c164 sokojs/stuff/slc2htm.sh
--- a/sokojs/stuff/slc2htm.sh	Mon Oct 18 14:47:15 2021 +0000
+++ b/sokojs/stuff/slc2htm.sh	Sat Oct 23 10:55:42 2021 +0000
@@ -31,6 +31,7 @@
 	while read line; do
 		case "$line" in
 		*\<Url\>*) echo "$line" | sed 's|.*<Url>||;s|</Url>.*||' >> "$set/description.txt" ;;
+		*\<Email\>*) echo "$line" | sed 's|.*<Email>||;s|</Email>.*||' >> "$set/description.txt" ;;
 		*\<Title\>*) echo "$line" | sed 's|.*<Title>||;s|</Title>.*||' >> "$set/description.txt" ;;
 		*\<Description\>) state="Description"; continue ;;
 		*\</Description\>) state="" ;;
diff -r 787a1807d2bb -r db9d9cb3c164 sokojs/stuff/undo.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sokojs/stuff/undo.u	Sat Oct 23 10:55:42 2021 +0000
@@ -0,0 +1,157 @@
+--- main.htm
++++ main.htm
+@@ -11,8 +11,9 @@
+ -->
+ <html>
+ <head>
++<meta http-equiv="Content Type" content="text/html;charset=utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+-<style>
++<style type="text/css">
+ <!--
+ img.r{
+ width:30px;
+@@ -84,11 +85,11 @@
+            if (evenement.which == 52 || evenement.which == 37) {
+         Move(eval(manpos) - 1)
+     } else if (evenement.which == 56 || evenement.which == 38) {
+-        Move(eval(manpos) - Row)
++        Move(eval(manpos) - Col)
+     } else if (evenement.which == 54 || evenement.which == 39) {
+         Move(eval(manpos) + 1)
+     } else if (evenement.which == 50 || evenement.which == 40) {
+-        Move(eval(manpos) + Row)
++        Move(eval(manpos) + Col)
+     }
+ }
+ 
+@@ -108,7 +109,7 @@
+          if (window.event.keyCode == 37) {
+      Move(eval(manpos) - 1)
+   } else if (window.event.keyCode == 38) {
+-     Move(eval(manpos) - Row)
++     Move(eval(manpos) - Col)
+   } else if (window.event.keyCode == 39) {
+      Move(eval(manpos) + 1)
+   } else if (window.event.keyCode == 40) {
+@@ -152,6 +153,7 @@
+ level = new Array()
+ maxLevel = 97
+ moves = 0
++saved = ""
+ 
+ function ReloadLevel() {
+   manpos = parent.frames[0].document.forms[0].elements[Row*Col].value
+@@ -174,44 +176,57 @@
+ function dir(d) {
+   if (d ==   -1) return "L";
+   if (d ==    1) return "R";  
+-  if (d ==  Row) return "D";    
+-  if (d == -Row) return "U";      
++  if (d ==  Col) return "D";    
++  if (d == -Col) return "U";      
++}
++
++function undoDir(c) {
++  if (c.toLowerCase() == 'u') return  Col;
++  if (c.toLowerCase() == 'd') return -Col;
++  if (c.toLowerCase() == 'r') return -1;
++  if (c.toLowerCase() == 'l') return  1;
+ }
+ 
+ function print_moves(m) {
+  document.getElementById('moves').firstChild.nodeValue=m + " moves"
+ }
++
+ function UndoMove() {
+-  if (ua != -1) {
+-    document.images[manpos].src = eval("img" + level[manpos] + ".src")  
+-    document.images[ua].src = eval("img" + lua + ".src")  
+-    document.images[ub].src = eval("img" + lub + ".src")    
+-    level[ua] = lua
+-    level[ub] = lub  
+-    level[um] = lum  
+-    document.images[manpos = um].src = usrc        
+-    nbBoxin = unb
+-    print_moves(--moves)
+-    ua = -1
+-  }  
++  if (saved.length > 0) {
++    var c = saved.charAt(saved.length-1)
++    var m = eval("manD.src")
++    do {
++      saved = saved.substring(0,saved.length-1)
++      d = undoDir(c)
++      a = manpos - d
++      if (c != c.toLowerCase()) {
++        if (level[a] == boxin && level[manpos] != boxin) nbBoxin++
++        if (level[a] != boxin && level[manpos] == boxin) nbBoxin--
++        print_moves(--moves)
++        level[a] = (level[a] == boxin) ? dest : floor
++        level[manpos] = (level[manpos] == dest) ? boxin : boxout
++        document.images[a].src = eval("img" + level[a] + ".src")  
++      }
++      document.images[manpos].src = eval("img" + level[manpos] + ".src")  
++      manpos += d
++      if (saved.length == 0) break
++      c = saved.charAt(saved.length-1)
++      m = eval("man"+c.toUpperCase()+".src")
++    } while (c == c.toLowerCase())
++    document.images[manpos].src = m
++  }
+ }
+ 
+ function Move(a) {
+   d = a - manpos
+   
+   if (d == 1 || d == -1 || d == Col || d == -Col) {       
++    var m = dir(d).toLowerCase()
+     if (level[a] == boxin || level[a] == boxout)  {
+       b = a + d  
+-      um = manpos
+-      ua = a
+-      ub = b
+-      lum = level[manpos]    
+-      lua = level[a]
+-      lub = level[b]
+-      usrc = document.images[manpos].src
+-      unb = nbBoxin
+-      print_moves(++moves)
++      m = dir(d)
+       if (level[b] == floor || level[b] == dest)  {
++        ++moves
+         level[a] == boxin ? (level[a] = dest,  nbBoxin++) : level[a] = floor
+         level[b] == dest  ? (level[b] = boxin, nbBoxin--) : level[b] = boxout
+         document.images[b].src = eval("img" + level[b] + ".src")
+@@ -221,7 +236,9 @@
+     if (level[a] == floor || level[a] == dest) {
+       document.images[manpos].src = eval("img" + level[manpos] + ".src")
+       document.images[manpos = a].src = eval("man" + dir(d) + ".src")      
++      saved+=m
+     }
++    print_moves(moves)
+ 
+     if (nbBoxin == 0) {
+       if (nbLevel < maxLevel) {
+@@ -246,14 +263,15 @@
+   for (y = 0 ; y < Row; y++) {
+     document.write ("<TR>")
+     for (x = 0; x < Col; x++) {
+-      level[x + Row * y] = parent.frames[0].document.forms[0].elements[x + Row * y].value
+-      if (level[x + Row * y] == dest) nbBoxin++
+-      if (level[x + Row * y] == land || level[x + Row * y] == wall)
++      var i = x + Col * y
++      level[i] = parent.frames[0].document.forms[0].elements[i].value
++      if (level[i] == dest) nbBoxin++
++      if (level[i] == land || level[i] == wall)
+         document.write("<TD VALIGN=TOP>",
+-          "<IMG align=middle class=r border=0 src=\"", level[x + Row * y], ".gif\"<\/TD>")
++          "<IMG align=middle class=r border=0 src=\"", level[i], ".gif\"<\/TD>")
+       else
+-        document.write("<TD VALIGN=TOP><A HREF=\"JavaScript:Move(", x + Row * y, ")\">",
+-          "<IMG align=middle class=r border=0 src=\"", level[x + Row * y], ".gif\"</A><\/TD>")      
++        document.write("<TD VALIGN=TOP><A HREF=\"JavaScript:Move(", i, ")\">",
++          "<IMG align=middle class=r border=0 src=\"", level[i], ".gif\"</A><\/TD>")      
+     }
+     document.write("<\/TR>")
+   }