X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=7e7ccf421af561cc0dd12b42b85424d4c8dcb028;hp=db9d434cb5b222e17cbb5ae06b328ee68bc11f2a;hb=c9ca08bc294eea3dc22474c69ec4bea8c8913907;hpb=1279a667a73e14c961e9f708835cf1a569ee8b81

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index db9d434..7e7ccf4 100644
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -2,42 +2,18 @@ var req;
 
 function init_ajax()
 {
-	req = false;
-
-	if (window.XMLHttpRequest) {
-		// Mozilla/Safari
-		try {
-			req = new XMLHttpRequest();
-		} catch(e) {
-			req = false;
-		}
-	} else if (window.ActiveXObject) {
-		// IE/Windows
-		try {
-			req = new ActiveXObject("Msxml2.XMLHTTP");
-		} catch(e) {
-			try {
-				req = new ActiveXObject("Microsoft.XMLHTTP");
-			} catch(e) {
-				req = false;
-			}
-		}
-	}
+	req = new XMLHttpRequest();
 }
 
 function find_width()
 {
-	if (typeof(window.innerWidth) == 'number') {
-		// non-IE
-		return [window.innerWidth, window.innerHeight];
-	} else if (document.documentElement && (document.documentElement.clientWidth || document.documentElement.clientHeight)) {
-		// IE 6+ in 'standards compliant mode'
-		return [document.documentElement.clientWidth, document.documentElement.clientHeight];
-	} else if (document.body && (document.body.clientWidth || document.body.clientHeight)) {
-		// IE 4-compatible
-		return [document.body.clientWidth, document.body.clientHeight];
-	}
-	return [null,null];
+	var dpr = find_dpr();
+	return [window.innerWidth * dpr, window.innerHeight * dpr];
+}
+
+function find_dpr()
+{
+	return window.devicePixelRatio || 1;
 }
 
 /*
@@ -50,9 +26,13 @@ function find_width()
  * pick_image_size, below.
  */
 var fixed_sizes = [
+	[ 2304, 1728 ],
+	[ 2048, 1536 ],
+	[ 1920, 1440 ],
 	[ 1600, 1200 ],
 	[ 1400, 1050 ],
 	[ 1280, 960 ],
+	[ 1152, 864 ],
 	[ 1024, 768 ],
 	[ 800, 600 ],
 	[ 640, 480 ],
@@ -99,31 +79,80 @@ 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:";
+		if (img.src === url) {
+			return img;
+		}
 		img.parentNode.removeChild(img);
 	}
 
 	img = document.createElement("img");
 	img.id = element_id;
 	img.alt = "";
+	img.src = url;
+	parent_node.appendChild(img);
+	return img;
+}
 
-	if (img.src != url) {
-		img.src = url;
+function rename_element(old_name, new_name)
+{
+	// Remove any element that's in the way.
+	var elem = document.getElementById(new_name);
+	if (elem !== null) {
+		elem.parentNode.removeChild(elem);
 	}
-	
+
+	elem = document.getElementById(old_name);
+	if (elem !== null) {
+		elem.id = new_name;
+	}
+	return elem;
+}
+
+function display_image(width, height, evt, filename, element_id)
+{
+	var url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/nobox/" + filename;
 	var main = document.getElementById("iehack");
-	main.appendChild(img);
+	var preload = document.getElementById("preload");
+	var dpr = find_dpr();
+	var img;
+	// See if we have a preload going on that we can reuse.
+	if (element_id == "image" && preload !== null && preload.src == url) {
+		rename_element("preload_box", "image_box");
+		img = rename_element("preload", "image");
+	} else {
+		img = replace_image_element(url, element_id, main);
+	}
+	img.style.position = "absolute";
+	img.style.left = "0px";
+	img.style.top = "0px";
+	img.style.transformOrigin = "top left";
+	img.style.transform = "scale(" + (1.0 / dpr) + ")";
+
+	// Infobox.
+	var url;
+	if (dpr == 1) {
+		url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/box/" + filename;
+	} else {
+		url = window.location.origin + "/" + evt + "/" + width + "x" + height + "@" + dpr.toFixed(2) + "/box/" + filename;
+	}
+	var boximg = replace_image_element(url, element_id + "_box", main);
+
+	boximg.style.position = "absolute";
+	boximg.style.left = "0px";
+	boximg.style.bottom = "-1px";
+	boximg.style.transformOrigin = "bottom left";
+	boximg.style.transform = "scale(" + (1.0 / dpr) + ")";
 
 	return img;
 }
@@ -141,9 +170,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;
 }
 
@@ -152,9 +188,13 @@ function prepare_preload(img, num)
 	// cancel any pending preload
 	var preload = document.getElementById("preload");
 	if (preload !== null) {
-		preload.src = "data:";
 		preload.parentNode.removeChild(preload);
 	}
+	
+	var preload_box = document.getElementById("preload_box");
+	if (preload_box !== null) {
+		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,32 +252,29 @@ function set_opacity(id, amount)
 function center_image(num)
 {
 	var screen_size = find_width();
-	var adjusted_size;
+	var dpr = find_dpr();
+	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] ]);
-	}
-
-	// crop the div to the screen
-	if (adjusted_size[0] > screen_size[0]) {
-		adjusted_size[0] = screen_size[0];
-	}
-	if (adjusted_size[1] > screen_size[1]) {
-		adjusted_size[1] = screen_size[1];
+		// 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) / dpr) + "px";
+	main.style.top = (((screen_size[1] - height) / 2) / dpr) + "px";
+	main.style.width = (width / dpr) + "px";
+	main.style.height = (height / dpr) + "px";
+	main.style.lineHeight = (height / dpr) + "px";
 }
 
 function relayout()
@@ -246,8 +283,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);
@@ -331,17 +366,21 @@ function fade_text(opacity)
 	}
 }
 
-function select_image(evt, filename)
+function select_image(evt, filename, selected)
 {
 	if (!req) {
 		return;
 	}
 
-	draw_text("Selecting " + filename + "...");
+	if (selected) {
+		draw_text("Selecting " + filename + "...");
+	} else {
+		draw_text("Unselecting " + filename + "...");
+	}
 	
-	req.open("POST", "http://" + global_vhost + "/select", false);
+	req.open("POST", window.location.origin + "/select", false);
 	req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-	req.send("mode=single&event=" + evt + "&filename=" + filename);
+	req.send("event=" + evt + "&filename=" + filename + "&selected=" + selected);
 
 	setTimeout("fade_text(0.99)", 30);
 }
@@ -358,6 +397,8 @@ function key_down(which)
 		}
 	} else if (which == 27) {   // escape
 		set_opacity("close", 0.99);
+	} else {
+		check_for_hash_change();
 	}
 }
 
@@ -376,23 +417,27 @@ function key_up(which) {
 		set_opacity("close", 0.7);
 		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]);
+		select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1], 1);
+	} else if (which == 85 && global_select) {   // u
+		select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1], 0);
+	} else {
+		check_for_hash_change();
 	}
 }
 
-// enable the horrible horrible IE PNG hack
-function ie_png_hack()
-{
-	var vstr = navigator.appVersion.split("MSIE");
-	var v = parseFloat(vstr[1]);
-	if (v >= 5.5 && v < 7.0 && document.body.filters) {
-		var next = document.getElementById("next");
-		next.outerHTML = "<span id=\"next\" style=\"display: inline-block; position: absolute; bottom: 0px; right: 0px; width: 50px; height: 50px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + next.src + "')\" onmousedown=\"if (can_go_next()) set_opacity('next', 1.0)\" onmouseup=\"if (can_go_next()) { set_opacity('next', 0.7); go_next(); }\" onmouseout=\"if (can_go_next()) { set_opacity('next', 0.7); }\" />";
-		
-		var previous = document.getElementById("previous");
-		previous.outerHTML = "<span id=\"previous\" style=\"display: inline-block; position: absolute; bottom: 0px; right: 0px; width: 50px; height: 50px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + previous.src + "')\" onmousedown=\"if (can_go_previous()) set_opacity('previous', 1.0)\" onmouseup=\"if (can_go_previous()) { set_opacity('previous', 0.7); go_previous(); }\" onmouseout=\"if (can_go_previous()) { set_opacity('previous', 0.7); }\" />";
-		
-		var close = document.getElementById("close");
-		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();
 	}
 }