Fix a few can_use_qscale-issues.

[pr0n] / files / pr0n-fullscreen.js

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 1ec07e6f917af2dd34b4d736046a9f7c2a55390c..1d82ebc3280e05631a01c4ee62488479cf689e89 100644 (file)
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -40,6 +40,20 @@ function find_width()
        return [null,null];
 }
 
+function parse_image_num(url, default_value) {
+       var url_array = (window.location.toString().split("#"));
+       if (url_array.length != 2) {
+               return default_value;
+       }
+
+       var num = parseInt(url_array[1]);
+       if (num > 1 && num <= global_image_list.length) {  // and then num != NaN
+               return (num - 1);
+       } else {
+               return default_value;
+       }
+}
+
 /*
  * 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,9 +64,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 ],
@@ -100,15 +117,14 @@ function pick_image_size(screen_size, image_size)
 
                if (screen_size[0] >= width && screen_size[1] >= height) {
                        // be sure _not_ to return a reference
-                       return [ fixed_sizes[i][0], fixed_sizes[i][1] ];
+                       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:";
@@ -123,8 +139,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;
 }
@@ -142,9 +174,17 @@ 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
+               var baseurl = (window.location.toString().split("#"))[0];
+               window.location = baseurl + "#" + (num+1);
        }
+
        return img;
 }
 
@@ -156,6 +196,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
@@ -213,32 +259,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] ]);
-       }
-
-       // 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 + "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()
@@ -247,8 +289,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);