puzzles: refactor and resync with upstream

This brings puzzles up-to-date with upstream revision
2d333750272c3967cfd5cd3677572cddeaad5932, though certain changes made
by me, including cursor-only Untangle and some compilation fixes
remain. Upstream code has been moved to its separate subdirectory and
future syncs can be done by simply copying over the new sources.

Change-Id: Ia6506ca5f78c3627165ea6791d38db414ace0804

42 files changed, 242 insertions, 0 deletions

diff --git a/apps/plugins/puzzles/html/blackbox.html b/apps/plugins/puzzles/src/html/blackbox.html
index f98604f..f98604f 100644
--- a/apps/plugins/puzzles/html/blackbox.html
+++ b/apps/plugins/puzzles/src/html/blackbox.html
diff --git a/apps/plugins/puzzles/html/bridges.html b/apps/plugins/puzzles/src/html/bridges.html
index 06ec2d4..06ec2d4 100644
--- a/apps/plugins/puzzles/html/bridges.html
+++ b/apps/plugins/puzzles/src/html/bridges.html
diff --git a/apps/plugins/puzzles/html/cube.html b/apps/plugins/puzzles/src/html/cube.html
index f08e16c..f08e16c 100644
--- a/apps/plugins/puzzles/html/cube.html
+++ b/apps/plugins/puzzles/src/html/cube.html
diff --git a/apps/plugins/puzzles/html/dominosa.html b/apps/plugins/puzzles/src/html/dominosa.html
index d2f6728..d2f6728 100644
--- a/apps/plugins/puzzles/html/dominosa.html
+++ b/apps/plugins/puzzles/src/html/dominosa.html
diff --git a/apps/plugins/puzzles/html/fifteen.html b/apps/plugins/puzzles/src/html/fifteen.html
index 53053b4..53053b4 100644
--- a/apps/plugins/puzzles/html/fifteen.html
+++ b/apps/plugins/puzzles/src/html/fifteen.html
diff --git a/apps/plugins/puzzles/html/filling.html b/apps/plugins/puzzles/src/html/filling.html
index 70ce16d..70ce16d 100644
--- a/apps/plugins/puzzles/html/filling.html
+++ b/apps/plugins/puzzles/src/html/filling.html
diff --git a/apps/plugins/puzzles/html/flip.html b/apps/plugins/puzzles/src/html/flip.html
index 404aae6..404aae6 100644
--- a/apps/plugins/puzzles/html/flip.html
+++ b/apps/plugins/puzzles/src/html/flip.html
diff --git a/apps/plugins/puzzles/html/flood.html b/apps/plugins/puzzles/src/html/flood.html
index cf09eac..cf09eac 100644
--- a/apps/plugins/puzzles/html/flood.html
+++ b/apps/plugins/puzzles/src/html/flood.html
diff --git a/apps/plugins/puzzles/html/galaxies.html b/apps/plugins/puzzles/src/html/galaxies.html
index 8041a95..8041a95 100644
--- a/apps/plugins/puzzles/html/galaxies.html
+++ b/apps/plugins/puzzles/src/html/galaxies.html
diff --git a/apps/plugins/puzzles/html/group.html b/apps/plugins/puzzles/src/html/group.html
index c0f52de..c0f52de 100644
--- a/apps/plugins/puzzles/html/group.html
+++ b/apps/plugins/puzzles/src/html/group.html
diff --git a/apps/plugins/puzzles/html/guess.html b/apps/plugins/puzzles/src/html/guess.html
index 1e4fc1e..1e4fc1e 100644
--- a/apps/plugins/puzzles/html/guess.html
+++ b/apps/plugins/puzzles/src/html/guess.html
diff --git a/apps/plugins/puzzles/html/inertia.html b/apps/plugins/puzzles/src/html/inertia.html
index 20077c0..20077c0 100644
--- a/apps/plugins/puzzles/html/inertia.html
+++ b/apps/plugins/puzzles/src/html/inertia.html
diff --git a/apps/plugins/puzzles/html/javapage.pl b/apps/plugins/puzzles/src/html/javapage.pl
index cd5e6a1..cd5e6a1 100755
--- a/apps/plugins/puzzles/html/javapage.pl
+++ b/apps/plugins/puzzles/src/html/javapage.pl
diff --git a/apps/plugins/puzzles/src/html/jspage.pl b/apps/plugins/puzzles/src/html/jspage.pl
new file mode 100755
index 0000000..a21f977
--- /dev/null
+++ b/apps/plugins/puzzles/src/html/jspage.pl
@@ -0,0 +1,242 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+open my $footerfile, "<", shift @ARGV or die "footer: open: $!\n";
+my $footer = "";
+$footer .= $_ while <$footerfile>;
+close $footerfile;
+
+for my $arg (@ARGV) {
+    $arg =~ /(.*\/)?([^\/]+)\.html$/ or die;
+    my $filename = $2;
+    open my $gamefile, "<", $arg or die "$arg: open: $!\n";
+    my $unfinished = 0;
+    my $docname = $filename;
+    chomp(my $puzzlename = <$gamefile>);
+    while ($puzzlename =~ s/^([^:=]+)(=([^:]+))?://) {
+        if ($1 eq "unfinished") {
+            $unfinished = 1;
+        } elsif ($1 eq "docname") {
+            $docname = $3;
+        } else {
+            die "$arg: unknown keyword '$1'\n";
+        }
+    }
+    my $instructions = "";
+    $instructions .= $_ while <$gamefile>;
+    close $gamefile;
+
+    open my $outpage, ">", "${filename}.html";
+
+    my $unfinishedtitlefragment = $unfinished ? "an unfinished puzzle " : "";
+    my $unfinishedheading = $unfinished ? "<h2 align=center>an unfinished puzzle</h2>\n" : "";
+    my $unfinishedpara;
+    my $links;
+    if ($unfinished) {
+        $unfinishedpara = <<EOF;
+<p>
+You have found your way to a page containing an <em>unfinished</em>
+puzzle in my collection, not linked from the <a href="../">main
+puzzles page</a>. Don't be surprised if things are hard to understand
+or don't work as you expect.
+EOF
+        $links = <<EOF;
+<p align="center">
+<a href="../">Back to main puzzles page</a> (which does not link to this)
+EOF
+    } else {
+        $unfinishedpara = "";
+        $links = <<EOF;
+<p align="center">
+<a href="../doc/${docname}.html#${docname}">Full instructions</a>
+|
+<a href="../">Back to main puzzles page</a>
+EOF
+    }
+
+    print $outpage <<EOF;
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ASCII" />
+<title>${puzzlename}, ${unfinishedtitlefragment}from Simon Tatham's Portable Puzzle Collection</title>
+<script type="text/javascript" src="${filename}.js"></script>
+<style class="text/css">
+/* Margins and centring on the top-level div for the game menu */
+#gamemenu { margin-top: 0; margin-bottom: 0.5em; text-align: center }
+
+/* Inside that div, the main menu bar and every submenu inside it is a <ul> */
+#gamemenu ul {
+    list-style: none;  /* get rid of the normal unordered-list bullets */
+    display: inline;   /* make top-level menu bar items appear side by side */
+    position: relative; /* allow submenus to position themselves near parent */
+    margin: 0;
+    margin-bottom: 0.5em;
+    padding: 0;
+}
+
+/* Individual menu items are <li> elements within such a <ul> */
+#gamemenu ul li {
+    /* Add a little mild text formatting */
+    font-weight: bold; font-size: 0.8em;
+    /* Line height and padding appropriate to top-level menu items */
+    padding-left: 0.75em; padding-right: 0.75em;
+    padding-top: 0.2em; padding-bottom: 0.2em;
+    margin: 0;
+    /* Make top-level menu items appear side by side, not vertically stacked */
+    display: inline;
+    /* Suppress the text-selection I-beam pointer */
+    cursor: default;
+    /* Surround each menu item with a border. The left border is removed
+     * because it will abut the right border of the previous item. (A rule
+     * below will reinstate the left border for the leftmost menu item.) */
+    border-left: 0;
+    border-right: 1px solid rgba(0,0,0,0.3);
+    border-top: 1px solid rgba(0,0,0,0.3);
+    border-bottom: 1px solid rgba(0,0,0,0.3);
+}
+
+#gamemenu ul li.disabled {
+    /* Grey out menu items with the "disabled" class */
+    color: rgba(0,0,0,0.5);
+}
+
+#gamemenu ul li:first-of-type {
+    /* Reinstate the left border for the leftmost top-level menu item */
+    border-left: 1px solid rgba(0,0,0,0.3);
+}
+
+#gamemenu ul li:hover {
+    /* When the mouse is over a menu item, highlight it */
+    background: rgba(0,0,0,0.3);
+    /* Set position:relative, so that if this item has a submenu it can
+     * position itself relative to the parent item. */
+    position: relative;
+}
+
+#gamemenu ul li.disabled:hover {
+    /* Disabled menu items don't get a highlight on mouse hover */
+    background: inherit;
+}
+
+#gamemenu ul ul {
+    /* Second-level menus and below are not displayed by default */
+    display: none;
+    /* When they are displayed, they are positioned immediately below
+     * their parent <li>, and with the left edge aligning */
+    position: absolute;
+    top: 100%;
+    left: 0;
+    /* We must specify an explicit background colour for submenus, because
+     * they must be opaque (don't want other page contents showing through
+     * them). */
+    background: white;
+    /* And make sure they appear in front. */
+    z-index: 1;
+}
+
+#gamemenu ul ul.left {
+    /* A second-level menu with class "left" aligns its right edge with
+     * its parent, rather than its left edge */
+    left: inherit; right: 0;
+}
+
+/* Menu items in second-level menus and below */
+#gamemenu ul ul li {
+    /* Go back to vertical stacking, for drop-down submenus */
+    display: block;
+    /* Inhibit wrapping, so the submenu will expand its width as needed. */
+    white-space: nowrap;
+    /* Override the text-align:center from above */
+    text-align: left;
+    /* Don't make the text any smaller than the previous level of menu */
+    font-size: 100%;
+    /* This time it's the top border that we omit on all but the first
+     * element in the submenu, since now they're vertically stacked */
+    border-left: 1px solid rgba(0,0,0,0.3);
+    border-right: 1px solid rgba(0,0,0,0.3);
+    border-top: 0;
+    border-bottom: 1px solid rgba(0,0,0,0.3);
+}
+
+#gamemenu ul ul li:first-of-type {
+    /* Reinstate top border for first item in a submenu */
+    border-top: 1px solid rgba(0,0,0,0.3);
+}
+
+#gamemenu ul ul ul {
+    /* Third-level submenus are drawn to the side of their parent menu
+     * item, not below it */
+    top: 0; left: 100%;
+}
+
+#gamemenu ul ul ul.left {
+    /* A submenu with class "left" goes to the left of its parent,
+     * not the right */
+    left: inherit; right: 100%;
+}
+
+#gamemenu ul li:hover > ul {
+    /* Last but by no means least, the all-important line that makes
+     * submenus be displayed! Any <ul> whose parent <li> is being
+     * hovered over gets display:block overriding the display:none
+     * from above. */
+    display: block;
+}
+</style>
+</head>
+<body onLoad="initPuzzle();">
+<h1 align=center>${puzzlename}</h1>
+${unfinishedheading}
+<h2 align=center>from Simon Tatham's Portable Puzzle Collection</h2>
+
+${unfinishedpara}
+
+<hr>
+<div id="puzzle" style="display: none">
+<div id="gamemenu"><ul><li id="new">New game</li
+><li id="restart">Restart game</li
+><li id="undo">Undo move</li
+><li id="redo">Redo move</li
+><li id="solve">Solve game</li
+><li id="specific">Enter game ID</li
+><li id="random">Enter random seed</li
+><li>Select game type<ul id="gametype" class="left"></ul></li
+></ul></div>
+<div align=center>
+  <div id="resizable" style="position:relative; left:0; top:0">
+  <canvas style="display: block" id="puzzlecanvas" width="1px" height="1px" tabindex="1">
+  </canvas>
+  <div id="statusbarholder" style="display: block">
+  </div>
+  </div>
+  <p>
+    Link to this puzzle:
+    <a id="permalink-desc">by game ID</a>
+    <a id="permalink-seed">by random seed</a>
+  </p>
+</div>
+</div>
+<div id="apology">
+Sorry, this Javascript puzzle doesn't seem to work in your web
+browser. Perhaps you have Javascript disabled, or perhaps your browser
+doesn't provide a feature that the puzzle code requires (such as
+<a href="https://developer.mozilla.org/en-US/docs/JavaScript/Typed_arrays">typed arrays</a>).
+These puzzles have been successfully run in Firefox 19, Chrome 26,
+Internet Explorer 10 and Safari 6.
+</div>
+<hr>
+
+${instructions}
+
+${links}
+
+${footer}
+</body>
+</html>
+EOF
+
+    close $outpage;
+}
diff --git a/apps/plugins/puzzles/html/keen.html b/apps/plugins/puzzles/src/html/keen.html
index bd0eb36..bd0eb36 100644
--- a/apps/plugins/puzzles/html/keen.html
+++ b/apps/plugins/puzzles/src/html/keen.html
diff --git a/apps/plugins/puzzles/html/lightup.html b/apps/plugins/puzzles/src/html/lightup.html
index 2de2f91..2de2f91 100644
--- a/apps/plugins/puzzles/html/lightup.html
+++ b/apps/plugins/puzzles/src/html/lightup.html
diff --git a/apps/plugins/puzzles/html/loopy.html b/apps/plugins/puzzles/src/html/loopy.html
index 96f3a9d..96f3a9d 100644
--- a/apps/plugins/puzzles/html/loopy.html
+++ b/apps/plugins/puzzles/src/html/loopy.html
diff --git a/apps/plugins/puzzles/html/magnets.html b/apps/plugins/puzzles/src/html/magnets.html
index 2807569..2807569 100644
--- a/apps/plugins/puzzles/html/magnets.html
+++ b/apps/plugins/puzzles/src/html/magnets.html
diff --git a/apps/plugins/puzzles/html/map.html b/apps/plugins/puzzles/src/html/map.html
index 5f81793..5f81793 100644
--- a/apps/plugins/puzzles/html/map.html
+++ b/apps/plugins/puzzles/src/html/map.html
diff --git a/apps/plugins/puzzles/html/mines.html b/apps/plugins/puzzles/src/html/mines.html
index d17d6ff..d17d6ff 100644
--- a/apps/plugins/puzzles/html/mines.html
+++ b/apps/plugins/puzzles/src/html/mines.html
diff --git a/apps/plugins/puzzles/html/net.html b/apps/plugins/puzzles/src/html/net.html
index 08bffba..08bffba 100644
--- a/apps/plugins/puzzles/html/net.html
+++ b/apps/plugins/puzzles/src/html/net.html
diff --git a/apps/plugins/puzzles/html/netslide.html b/apps/plugins/puzzles/src/html/netslide.html
index f187741..f187741 100644
--- a/apps/plugins/puzzles/html/netslide.html
+++ b/apps/plugins/puzzles/src/html/netslide.html
diff --git a/apps/plugins/puzzles/html/palisade.html b/apps/plugins/puzzles/src/html/palisade.html
index 5b6b933..5b6b933 100644
--- a/apps/plugins/puzzles/html/palisade.html
+++ b/apps/plugins/puzzles/src/html/palisade.html
diff --git a/apps/plugins/puzzles/html/pattern.html b/apps/plugins/puzzles/src/html/pattern.html
index 54e05d6..54e05d6 100644
--- a/apps/plugins/puzzles/html/pattern.html
+++ b/apps/plugins/puzzles/src/html/pattern.html
diff --git a/apps/plugins/puzzles/html/pearl.html b/apps/plugins/puzzles/src/html/pearl.html
index 2ca25a5..2ca25a5 100644
--- a/apps/plugins/puzzles/html/pearl.html
+++ b/apps/plugins/puzzles/src/html/pearl.html
diff --git a/apps/plugins/puzzles/html/pegs.html b/apps/plugins/puzzles/src/html/pegs.html
index 4a23788..4a23788 100644
--- a/apps/plugins/puzzles/html/pegs.html
+++ b/apps/plugins/puzzles/src/html/pegs.html
diff --git a/apps/plugins/puzzles/html/range.html b/apps/plugins/puzzles/src/html/range.html
index bb5b59c..bb5b59c 100644
--- a/apps/plugins/puzzles/html/range.html
+++ b/apps/plugins/puzzles/src/html/range.html
diff --git a/apps/plugins/puzzles/html/rect.html b/apps/plugins/puzzles/src/html/rect.html
index d23d827..d23d827 100644
--- a/apps/plugins/puzzles/html/rect.html
+++ b/apps/plugins/puzzles/src/html/rect.html
diff --git a/apps/plugins/puzzles/html/samegame.html b/apps/plugins/puzzles/src/html/samegame.html
index e6de095..e6de095 100644
--- a/apps/plugins/puzzles/html/samegame.html
+++ b/apps/plugins/puzzles/src/html/samegame.html
diff --git a/apps/plugins/puzzles/html/signpost.html b/apps/plugins/puzzles/src/html/signpost.html
index fa23e99..fa23e99 100644
--- a/apps/plugins/puzzles/html/signpost.html
+++ b/apps/plugins/puzzles/src/html/signpost.html
diff --git a/apps/plugins/puzzles/html/singles.html b/apps/plugins/puzzles/src/html/singles.html
index 252bffb..252bffb 100644
--- a/apps/plugins/puzzles/html/singles.html
+++ b/apps/plugins/puzzles/src/html/singles.html
diff --git a/apps/plugins/puzzles/html/sixteen.html b/apps/plugins/puzzles/src/html/sixteen.html
index 4530469..4530469 100644
--- a/apps/plugins/puzzles/html/sixteen.html
+++ b/apps/plugins/puzzles/src/html/sixteen.html
diff --git a/apps/plugins/puzzles/html/slant.html b/apps/plugins/puzzles/src/html/slant.html
index d6d31aa..d6d31aa 100644
--- a/apps/plugins/puzzles/html/slant.html
+++ b/apps/plugins/puzzles/src/html/slant.html
diff --git a/apps/plugins/puzzles/html/solo.html b/apps/plugins/puzzles/src/html/solo.html
index 88ebd5c..88ebd5c 100644
--- a/apps/plugins/puzzles/html/solo.html
+++ b/apps/plugins/puzzles/src/html/solo.html
diff --git a/apps/plugins/puzzles/html/tents.html b/apps/plugins/puzzles/src/html/tents.html
index e3f6d5f..e3f6d5f 100644
--- a/apps/plugins/puzzles/html/tents.html
+++ b/apps/plugins/puzzles/src/html/tents.html
diff --git a/apps/plugins/puzzles/html/towers.html b/apps/plugins/puzzles/src/html/towers.html
index a710e0a..a710e0a 100644
--- a/apps/plugins/puzzles/html/towers.html
+++ b/apps/plugins/puzzles/src/html/towers.html
diff --git a/apps/plugins/puzzles/html/tracks.html b/apps/plugins/puzzles/src/html/tracks.html
index afabed3..afabed3 100644
--- a/apps/plugins/puzzles/html/tracks.html
+++ b/apps/plugins/puzzles/src/html/tracks.html
diff --git a/apps/plugins/puzzles/html/twiddle.html b/apps/plugins/puzzles/src/html/twiddle.html
index 5f94e4e..5f94e4e 100644
--- a/apps/plugins/puzzles/html/twiddle.html
+++ b/apps/plugins/puzzles/src/html/twiddle.html
diff --git a/apps/plugins/puzzles/html/undead.html b/apps/plugins/puzzles/src/html/undead.html
index c21374f..c21374f 100644
--- a/apps/plugins/puzzles/html/undead.html
+++ b/apps/plugins/puzzles/src/html/undead.html
diff --git a/apps/plugins/puzzles/html/unequal.html b/apps/plugins/puzzles/src/html/unequal.html
index 085f82e..085f82e 100644
--- a/apps/plugins/puzzles/html/unequal.html
+++ b/apps/plugins/puzzles/src/html/unequal.html
diff --git a/apps/plugins/puzzles/html/unruly.html b/apps/plugins/puzzles/src/html/unruly.html
index 2cd3fb2..2cd3fb2 100644
--- a/apps/plugins/puzzles/html/unruly.html
+++ b/apps/plugins/puzzles/src/html/unruly.html
diff --git a/apps/plugins/puzzles/html/untangle.html b/apps/plugins/puzzles/src/html/untangle.html
index 7171a3d..7171a3d 100644
--- a/apps/plugins/puzzles/html/untangle.html
+++ b/apps/plugins/puzzles/src/html/untangle.html