From 1a6563b13b308ecf5c28812a19bdf4b86ee13f20 Mon Sep 17 00:00:00 2001
From: malc <av1474@comtv.ru>
Date: Sun, 7 Aug 2011 07:36:52 +0400
Subject: [PATCH] Use consistent (zero-based page numbering inside ML parts)

---
 main.ml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/main.ml b/main.ml
index aaf707b..5c70636 100644
--- a/main.ml
+++ b/main.ml
@@ -496,13 +496,13 @@ let clamp incr =
 
 let getopaque pageno =
   try Some (Hashtbl.find state.pagemap
-               (pageno + 1, state.w, conf.angle, conf.proportional))
+               (pageno, state.w, conf.angle, conf.proportional))
   with Not_found -> None
 ;;
 
 let cache pageno opaque =
   Hashtbl.replace state.pagemap
-    (pageno + 1, state.w, conf.angle, conf.proportional) opaque
+    (pageno, state.w, conf.angle, conf.proportional) opaque
 ;;
 
 let validopaque opaque = String.length opaque > 0;;
@@ -538,7 +538,7 @@ let findpageforopaque opaque =
     state.pagemap None
 ;;
 
-let pagevisible n = List.exists (fun l -> l.pageno + 1 = n) state.layout;;
+let pagevisible n = List.exists (fun l -> l.pageno = n) state.layout;;
 
 let preload () =
   if conf.preload
@@ -786,7 +786,8 @@ let act cmd =
   | 'r' ->
       let n, w, h, r, l, s, p =
         Scanf.sscanf cmd "r %u %u %u %u %d %u %s"
-          (fun n w h r l s p -> (n, w, h, r, l != 0, s, p))
+          (fun n w h r l s p ->
+            (n-1, w, h, r, l != 0, s, p))
       in
 
       Hashtbl.replace state.pagemap (n, w, r, l) (p, s);
-- 
2.11.4.GIT