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

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 2a43c07..d110171 100644
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -29,7 +29,8 @@ function find_width()
 {
 	if (typeof(window.innerWidth) == 'number') {
 		// non-IE
-		return [window.innerWidth, window.innerHeight];
+		var dpr = find_dpr();
+		return [window.innerWidth * dpr, window.innerHeight * dpr];
 	} else if (document.documentElement && (document.documentElement.clientWidth || document.documentElement.clientHeight)) {
 		// IE 6+ in 'standards compliant mode'
 		return [document.documentElement.clientWidth, document.documentElement.clientHeight];
@@ -40,6 +41,11 @@ function find_width()
 	return [null,null];
 }
 
+function find_dpr()
+{
+	return window.devicePixelRatio || 1;
+}
+
 /*
  * pr0n can resize to any size we'd like, but we're much more likely
  * to have this set of fixed-resolution screens cached, so to increase
@@ -50,6 +56,7 @@ function find_width()
  * pick_image_size, below.
  */
 var fixed_sizes = [
+	[ 2304, 1728 ],
 	[ 2048, 1536 ],
 	[ 1920, 1440 ],
 	[ 1600, 1200 ],
@@ -113,35 +120,69 @@ function replace_image_element(url, element_id, parent_node)
 {
 	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 = "";
-
-	if (img.src != url) {
-		img.src = url;
-	}
-	
+	img.src = url;
 	parent_node.appendChild(img);
 	return img;
 }
 
+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 = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/nobox/" + filename;
+	var url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/nobox/" + filename;
 	var main = document.getElementById("iehack");
-	var img = replace_image_element(url, element_id, main);
+	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) + ")";
 
 	if (global_infobox != 'nobox/') {
-		var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/box/" + filename;
+		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;
@@ -178,13 +219,11 @@ 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.src = "data:";
 		preload_box.parentNode.removeChild(preload_box);
 	}
 
@@ -244,6 +283,7 @@ function set_opacity(id, amount)
 function center_image(num)
 {
 	var screen_size = find_width();
+	var dpr = find_dpr();
 	var width, height;
 	
 	if (global_image_list[num][2] == -1) {
@@ -261,11 +301,11 @@ function center_image(num)
 	// center the image on-screen
 	var main = document.getElementById("main");
 	main.style.position = "absolute";
-	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";
+	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()
@@ -357,17 +397,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);
 }
@@ -404,7 +448,9 @@ 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();
 	}