[Gzz-commits] gzz/gzz gfx/gl/GLSpanner.java mem/MemoryPartiti...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/20 12:53:01

Modified files:
        gzz/gfx/gl     : GLSpanner.java 
        gzz/mem        : MemoryPartitioner.java 
        gzz/view       : pagespanview.py xubuoy.py 

Log message:
        Mmmmmm... xupdf seems to be finally working pretty nicely w.r.t. 
display memory. Needs still a lot of adjustment but now the lazy loading of 
mipzips works.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLSpanner.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/mem/MemoryPartitioner.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/pagespanview.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/xubuoy.py.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: gzz/gzz/gfx/gl/GLSpanner.java
diff -u gzz/gzz/gfx/gl/GLSpanner.java:1.2 gzz/gzz/gfx/gl/GLSpanner.java:1.3
--- gzz/gzz/gfx/gl/GLSpanner.java:1.2   Mon Jan 20 09:22:57 2003
+++ gzz/gzz/gfx/gl/GLSpanner.java       Mon Jan 20 12:53:01 2003
@@ -16,7 +16,7 @@
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
-    static MemoryPartitioner pool = new MemoryPartitioner(40 * 1024 * 1024);
+    static MemoryPartitioner pool = new MemoryPartitioner(80 * 1024 * 1024);
 
     private static class SpanSB {
        PageImageScroll sb;
Index: gzz/gzz/mem/MemoryPartitioner.java
diff -u gzz/gzz/mem/MemoryPartitioner.java:1.12 
gzz/gzz/mem/MemoryPartitioner.java:1.13
--- gzz/gzz/mem/MemoryPartitioner.java:1.12     Mon Jan 20 09:22:57 2003
+++ gzz/gzz/mem/MemoryPartitioner.java  Mon Jan 20 12:53:01 2003
@@ -211,7 +211,7 @@
        }
        if(maximportance <= 0) return;
        // Else, find a good exponent
-       for(int round = 0; ; round++) {
+       for(float round = 0; ; round+= .1) {
            float mulf = (round > 5 ? .999f : 1);
            // Sum of maxbytes multiplied with priority^round
            int sumReduced = 0;
Index: gzz/gzz/view/pagespanview.py
diff -u gzz/gzz/view/pagespanview.py:1.24 gzz/gzz/view/pagespanview.py:1.25
--- gzz/gzz/view/pagespanview.py:1.24   Mon Jan 20 09:22:57 2003
+++ gzz/gzz/view/pagespanview.py        Mon Jan 20 12:53:01 2003
@@ -364,7 +364,7 @@
        if all:
            for i in range(0, len(self.pap)):
                if i == page: continue
-               imp = importance * 1.0 / (1 + abs(i - page))
+               imp = importance * 1.0 / (1 + 2 * abs(i - page))
                self.pap[i].rect.getTexture(imp, 4000)
         
     def hitClip(self, coords, point3, cliprect):
Index: gzz/gzz/view/xubuoy.py
diff -u gzz/gzz/view/xubuoy.py:1.42 gzz/gzz/view/xubuoy.py:1.43
--- gzz/gzz/view/xubuoy.py:1.42 Mon Jan 20 09:22:57 2003
+++ gzz/gzz/view/xubuoy.py      Mon Jan 20 12:53:01 2003
@@ -152,6 +152,7 @@
            self.view = getCellPDFView(self.cell)
 
            p = self.linkspan.getLocation()
+           self.page = p
            d = self.linkspan.getSize()
            o = self.linkspan.offset()
            # print "page, loc, size: ", linkspan.offset(), p, d
@@ -171,7 +172,9 @@
                        globalusefancypaper = 0,
                        globalshowtessel = 0,
                        globalspan = None,
-                       nadircs = None):
+                       nadircs = None,
+                       importants = .4):
+       self.view.reqTextures(self.p0[0], self.p0[1], importance = importants, 
all = 0)
        if not self.cell:
            return
        cell = self.cell