Ability to choose game and hopefully offline mode

Author: ecrips

.gitignore

@@ -5,3 +5,4 @@ list.c
 tags
 wingames.lst
 Puzzles.js
+cache.manifest

emscripten.c

@@ -250,9 +250,17 @@ static void pick_preset(void)
 }
 */
 
+void c_callback(const char *name,int id,int sel);
+void populate_game_menu()
+{
+	int i;
+	for(i=0;i<gamecount;i++) {
+		c_callback(gamelist[i]->name, i, 0);
+	}
+}
+
 void populate_type_menu()
 {
-	void c_callback(char *name,int id,int sel);
 	int num = midend_num_presets(fe->me);
 	int i;
 	int sel = midend_which_preset(fe->me);
@@ -319,6 +327,15 @@ void em_puzzle_init(void)
 	em_new_game();
 }
 
+void change_game(int id)
+{
+	midend_free(fe->me);
+	fe->game = gamelist[id];
+	fe->me = midend_new(fe, fe->game, &drapi, fe);
+	snaffle_colours(fe);
+	em_new_game();
+}
+
 void get_random_seed(void **randseed, int *randseedsize)
 {
 	float *r = snew(float);

emscripten.js

@@ -30,7 +30,7 @@ function mouseup(e) {
 	return false;
 }
 
-function choose_type() {
+function do_menu(callback, populate) {
 	var menu = document.createElement("div");
 	menu.className = "ontopmenu";
 	var list = document.createElement("div");
@@ -44,7 +44,48 @@ function choose_type() {
 		}
 	}
 
-	set_callback(function(name, i, sel) {
+	var o = {list: list, hide_menu: hide_menu};
+
+	set_callback(callback.bind(o));
+	populate();
+
+	document.body.appendChild(menu);
+	menu.tabIndex = 100;
+	menu.focus();
+	menu.onblur = function() {
+		/* setTimeout needed so clicking the radio buttons works
+		 * as the click will cause a loss of focus */
+		setTimeout(hide_menu, 100);
+	}
+}
+
+function choose_game() {
+	do_menu(function(name, i) {
+		var hide_menu = this.hide_menu;
+		name = Pointer_stringify(name);
+		var div = document.createElement("div");
+		var radio = document.createElement("input");
+		radio.type = "radio";
+		radio.name = 'game';
+		var label = document.createElement("label");
+		var img = document.createElement("img");
+		img.src = "web-icons/"+name+".png";
+		label.appendChild(img);
+		label.appendChild(radio);
+		label.appendChild(document.createTextNode(name));
+		div.appendChild(label);
+		this.list.appendChild(div);
+		label.onclick = function() {
+			hide_menu();
+			location.hash = name;
+			_change_game(i);
+		};
+	}, _populate_game_menu);
+}
+
+function choose_type() {
+	do_menu(function(name, i, sel) {
+		var hide_menu = this.hide_menu;
 		name = Pointer_stringify(name);
 		var div = document.createElement("div");
 		var radio = document.createElement("input");
@@ -55,29 +96,23 @@ function choose_type() {
 		label.appendChild(radio);
 		label.appendChild(document.createTextNode(name));
 		div.appendChild(label);
-		list.appendChild(div);
+		this.list.appendChild(div);
 		label.onclick = function() {
 			hide_menu();
 			_set_preset(i);
-		}
-	});
-	_populate_type_menu();
-
-	document.body.appendChild(menu);
-	menu.tabIndex = 100;
-	menu.focus();
-	menu.onblur = function() {
-		/* setTimeout needed so clicking the radio buttons works
-		 * as the click will cause a loss of focus */
-		setTimeout(hide_menu, 100);
-	}
+		};
+	}, _populate_type_menu);
 }
 
 function setup_menu() {
 	var menu = document.getElementById("menu");
+	var gamemenu = document.createElement("button");
 	var typemenu = document.createElement("button");
+	gamemenu.appendChild(document.createTextNode("Game"));
 	typemenu.appendChild(document.createTextNode("Type"));
+	menu.appendChild(gamemenu);
 	menu.appendChild(typemenu);
+	gamemenu.onclick = choose_game;
 	typemenu.onclick = choose_type;
 }
 

mkfiles.pl

@@ -1671,8 +1671,8 @@ sub manpages {
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
 	       " \$(CFLAGS)")."\n".
     "\n";
-    print &splitline("all:" . join "", map { " \$(BINPREFIX)$_.js" }
-                     &progrealnames("MX"));
+    print &splitline("all:" . (join "", map { " \$(BINPREFIX)$_.js" }
+                     &progrealnames("MX")) . " cache.manifest");
     print "\n\n";
     foreach $p (&prognames("MX")) {
       ($prog, $type) = split ",", $p;
@@ -1695,6 +1695,10 @@ sub manpages {
 	  " -c \$< -o \$\@\n";
     }
 
+    print "cache.manifest: puzzle.html Puzzles.js web-icons/*.png\n";
+    print "\techo CACHE MANIFEST > cache.new\n";
+    print "\t".'md5sum $+ | sed "s/\(.*\) \(.*\)/\2 # \1/" >> cache.new'."\n";
+    print "\tmv cache.new cache.manifest\n";
     print "\n";
     print $makefile_extra{'emscripten'} || "";
     print "\nclean:\n".

puzzle.html

@@ -1,4 +1,4 @@
-<html>
+<html manifest="cache.manifest">
 <head>
 <style>
 body {margin: 0px;}