X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=2a43c07ee0d2332922e776e08a0aa1c6dd0eb7d8;hp=37fd67367cf1034c53ca9b58519745b0594b06c2;hb=e4a4d0b99d822b49a6273e95dfc49cd7cd125404;hpb=a58f1ab4dd5b224b12ed78096b6867f47c316231

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 37fd673..2a43c07 100644
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -50,9 +50,12 @@ function find_width()
  * pick_image_size, below.
  */
 var fixed_sizes = [
+	[ 2048, 1536 ],
+	[ 1920, 1440 ],
 	[ 1600, 1200 ],
 	[ 1400, 1050 ],
 	[ 1280, 960 ],
+	[ 1152, 864 ],
 	[ 1024, 768 ],
 	[ 800, 600 ],
 	[ 640, 480 ],
@@ -99,15 +102,15 @@ function pick_image_size(screen_size, image_size)
 		}
 
 		if (screen_size[0] >= width && screen_size[1] >= height) {
-			return fixed_sizes[i];
+			// be sure _not_ to return a reference
+			return [ fixed_sizes[i][0], fixed_sizes[i][1], width, height ];
 		}
 	}
 	return [ 80, 64 ];
 }
-	
-function display_image(width, height, evt, filename, element_id)
+
+function replace_image_element(url, element_id, parent_node)
 {
-	var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/" + global_infobox + filename;
 	var img = document.getElementById(element_id);
 	if (img !== null) {
 		img.src = "data:";
@@ -122,8 +125,24 @@ function display_image(width, height, evt, filename, element_id)
 		img.src = url;
 	}
 	
+	parent_node.appendChild(img);
+	return img;
+}
+
+function display_image(width, height, evt, filename, element_id)
+{
+	var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/nobox/" + filename;
 	var main = document.getElementById("iehack");
-	main.appendChild(img);
+	var img = replace_image_element(url, element_id, main);
+
+	if (global_infobox != 'nobox/') {
+		var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/box/" + filename;
+		var boximg = replace_image_element(url, element_id + "_box", main);
+
+		boximg.style.position = "absolute";
+		boximg.style.left = "0px";
+		boximg.style.bottom = "-1px";
+	}
 
 	return img;
 }
@@ -141,9 +160,16 @@ function display_image_num(num, element_id)
 	}
 
 	var img = display_image(adjusted_size[0], adjusted_size[1], global_image_list[num][0], global_image_list[num][1], element_id);
+	
 	if (element_id == "image") {
+		// we want to shrink the box as much as possible if we know the true
+		// size of the image
 		center_image(num);
+		
+		// replace the anchor part (if any) with the image number
+		window.location.hash = "#" + (num+1);
 	}
+
 	return img;
 }
 
@@ -155,6 +181,12 @@ function prepare_preload(img, num)
 		preload.src = "data:";
 		preload.parentNode.removeChild(preload);
 	}
+	
+	var preload_box = document.getElementById("preload_box");
+	if (preload_box !== null) {
+		preload_box.src = "data:";
+		preload_box.parentNode.removeChild(preload_box);
+	}
 
 	// grmf -- IE doesn't fire onload if the image was loaded from cache, so check for
 	// completeness first; should at least be _somewhat_ better
@@ -212,24 +244,28 @@ function set_opacity(id, amount)
 function center_image(num)
 {
 	var screen_size = find_width();
-	var adjusted_size;
+	var width, height;
 	
 	if (global_image_list[num][2] == -1) {
 		// no size information, use our pessimal guess
-		adjusted_size = max_image_size(screen_size);
+		var adjusted_size = max_image_size(screen_size);
+		width = adjusted_size[0];
+		height = adjusted_size[1];
 	} else {
-		adjusted_size = pick_image_size(screen_size, [ global_image_list[num][2], global_image_list[num][3] ]);
+		// use the exact information
+		var adjusted_size = pick_image_size(screen_size, [ global_image_list[num][2], global_image_list[num][3] ]);
+		width = adjusted_size[2];
+		height = adjusted_size[3];
 	}
 
 	// center the image on-screen
 	var main = document.getElementById("main");
 	main.style.position = "absolute";
-	main.style.left = (screen_size[0] - adjusted_size[0]) / 2 + "px";
-	main.style.top = (screen_size[1] - adjusted_size[1]) / 2 + "px"; 
-	main.style.width = adjusted_size[0] + "px";
-	main.style.height = adjusted_size[1] + "px";
-	main.style.lineHeight = adjusted_size[1] + "px"; 
-
+	main.style.left = (screen_size[0] - width) / 2 + "px";
+	main.style.top = (screen_size[1] - height) / 2 + "px"; 
+	main.style.width = width + "px";
+	main.style.height = height + "px";
+	main.style.lineHeight = height + "px";
 }
 
 function relayout()
@@ -238,8 +274,6 @@ function relayout()
 	if (can_go_next()) {
 		prepare_preload(img, global_image_num + 1);
 	}
-	
-	center_image(global_image_num);
 
 	set_opacity("previous", can_go_previous() ? 0.7 : 0.1);
 	set_opacity("next", can_go_next() ? 0.7 : 0.1);
@@ -350,6 +384,8 @@ function key_down(which)
 		}
 	} else if (which == 27) {   // escape
 		set_opacity("close", 0.99);
+	} else {
+		check_for_hash_change();
 	}
 }
 
@@ -369,6 +405,8 @@ function key_up(which) {
 		do_close();
 	} else if (which == 32 && global_select) {   // space
 		select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1]);
+	} else {
+		check_for_hash_change();
 	}
 }
 
@@ -388,3 +426,20 @@ function ie_png_hack()
 		close.outerHTML = "<span id=\"close\" style=\"display: inline-block; position: absolute; top: 0px; right: 0px; width: 50px; height: 50px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + close.src + "')\" onmousedown=\"set_opacity('close', 1.0)\" onmouseup=\"set_opacity('close', 0.7); do_close();\" onmouseout=\"set_opacity('close', 0.7);\" />";
 	}
 }
+
+function parse_image_num(default_value) {
+	var num = parseInt(window.location.hash.substr(1));
+	if (num >= 1 && num <= global_image_list.length) {  // and then num != NaN
+		return (num - 1);
+	} else {
+		return default_value;
+	}
+}
+
+function check_for_hash_change() {
+	var num = parse_image_num(-1);
+	if (num != -1 && num != global_image_num) {
+		global_image_num = num;
+		relayout();
+	}
+}