From 4462fbc3274db6921a4a54daf41be6757f06d353 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sesse@debian.org>
Date: Wed, 25 Jul 2007 00:47:19 +0200
Subject: [PATCH 1/1] Fix the fullscreen mode for +all. Probably fixes some
 infobox+select bugs while we're at it.

---
 files/pr0n-fullscreen.js            | 20 ++++++++++----------
 perl/Sesse/pr0n/Index.pm            |  4 ++--
 templates/default/fullscreen-footer |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 181a82c..001efc1 100644
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -67,7 +67,7 @@ function reduce_to_fixed_width(size)
 	
 function display_image(width, height, evt, filename, element_id)
 {
-	var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/" + filename;
+	var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/" + global_infobox + filename;
 	var img = document.getElementById(element_id);
 	if (img != null) {
 		img.src = "data:";
@@ -111,9 +111,9 @@ function relayout()
 	var size = find_width();
 	var adjusted_size = reduce_to_fixed_width(size);
 
-	var img = display_image(adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num], "image");
+	var img = display_image(adjusted_size[0], adjusted_size[1], global_image_list[global_image_num][0], global_image_list[global_image_num][1], "image");
 	if (can_go_next()) {
-		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num + 1]);
+		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_image_list[global_image_num + 1][0], global_image_list[global_image_num + 1]);
 	}
 	
 	// center the image on-screen
@@ -178,10 +178,10 @@ function go_previous()
 
 	var adjusted_size = reduce_to_fixed_width(find_width());
 
-	var img = display_image(adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num], "image");
+	var img = display_image(adjusted_size[0], adjusted_size[1], global_image_list[global_image_num][0], global_image_list[global_image_num][1], "image");
 	if (can_go_previous()) {
 		set_opacity("previous", 0.7);
-		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num - 1]);
+		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_image_list[global_image_num - 1][0], global_image_list[global_image_num - 1][1]);
 	} else {
 		set_opacity("previous", 0.1);
 	}
@@ -202,10 +202,10 @@ function go_next()
 
 	var adjusted_size = reduce_to_fixed_width(find_width());
 
-	var img = display_image(adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num], "image");
+	var img = display_image(adjusted_size[0], adjusted_size[1], global_image_list[global_image_num][0], global_image_list[global_image_num][1], "image");
 	if (can_go_next()) {
 		set_opacity("next", 0.7);
-		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num + 1]);
+		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_image_list[global_image_num + 1][0], global_image_list[global_image_num + 1][1]);
 	} else {
 		set_opacity("next", 0.1);
 	}
@@ -242,11 +242,11 @@ 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]);
+		select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1]);
 	}
 }
 
-function select_image(filename)
+function select_image(evt, filename)
 {
 	if (!req)
 		return;
@@ -255,7 +255,7 @@ function select_image(filename)
 	
 	req.open("POST", "http://" + global_vhost + "/select", false);
 	req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-	req.send("mode=single&event=" + global_evt + "&filename=" + filename);
+	req.send("mode=single&event=" + evt + "&filename=" + filename);
 
 	setTimeout("fade_text(0.99)", 30);
 }
diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 005c55d..39a8b21 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -147,7 +147,7 @@ sub handler {
 		$r->content_type("text/html; charset=utf-8");
 		Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" });
 		while (my $ref = $q->fetchrow_hashref()) {
-			$r->print("        \"" . $infobox . $ref->{'filename'} . "\",\n");
+			$r->print("        [ \"" . $ref->{'event'} . "\", \"" . $ref->{'filename'} . "\" ],\n");
 		}
 
 		my %settings_no_fullscreen = %settings;
@@ -161,10 +161,10 @@ sub handler {
 
 		Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", {
 			vhost => $r->get_server_name,
-			event => $event,
 			start => $settings{'start'} - 1,
 			returnurl => $returnurl,
 			sel => $settings{'sel'},
+			infobox => $infobox
 		});
 	} else {
 		Sesse::pr0n::Common::header($r, "$name [$event]");
diff --git a/templates/default/fullscreen-footer b/templates/default/fullscreen-footer
index bd569d8..1f67de3 100644
--- a/templates/default/fullscreen-footer
+++ b/templates/default/fullscreen-footer
@@ -1,6 +1,6 @@
 ];
 var global_vhost = "%VHOST%";
-var global_evt = "%EVENT%";
+var global_infobox = "%INFOBOX%";
 var global_return_url = "%RETURNURL%";
 var global_image_num = %START%;
 var global_select = %SEL%;
-- 
2.39.2