[Gzz-commits] gzz ./TODO gfx/libcoords/Coords.cxx gzz/modules...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/11/04 08:45:47

Modified files:
        .              : TODO 
        gfx/libcoords  : Coords.cxx 
        gzz/modules/pp : PPView2.java 
        gzz/vob/impl   : DefaultVobMatcher.java 

Log message:
        CS fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.363&tr2=1.364&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcoords/Coords.cxx.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/DefaultVobMatcher.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.363 gzz/TODO:1.364
--- gzz/TODO:1.363      Mon Nov  4 07:52:48 2002
+++ gzz/TODO    Mon Nov  4 08:45:47 2002
@@ -118,6 +118,7 @@
            - fix directory geometry
            - HOME button
        - PEG getCS(parent, key), affineCoordsys -> affine, +affineCS in 
VobScene
+       - PEG getCS hierarchy from either coordsys or matcher
        - better graphics for xupdf and pp
            - fillets without the original object
                - normal direction as data
Index: gzz/gfx/libcoords/Coords.cxx
diff -u gzz/gfx/libcoords/Coords.cxx:1.49 gzz/gfx/libcoords/Coords.cxx:1.50
--- gzz/gfx/libcoords/Coords.cxx:1.49   Mon Nov  4 02:53:15 2002
+++ gzz/gfx/libcoords/Coords.cxx        Mon Nov  4 08:45:47 2002
@@ -1215,6 +1215,9 @@
                    }
                    CoordSys *cs1_non = cs1_tmp->get(i);
                    CoordSys *cs2_non = cs2_tmp->get(csind2);
+
+                   if(!cs1_non || !cs2_non) goto nextInd;
+
                    // Next, the conversion.
                    // For now, insist on one converting directly
                    // to the other. Later need to search
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.9 gzz/gzz/modules/pp/PPView2.java:1.10
--- gzz/gzz/modules/pp/PPView2.java:1.9 Mon Nov  4 06:18:42 2002
+++ gzz/gzz/modules/pp/PPView2.java     Mon Nov  4 08:45:47 2002
@@ -282,6 +282,7 @@
 
        for(Iterator i = buoyqueue.iterator(); i.hasNext(); ) 
            ((Runnable)i.next()).run();
+       buoyqueue = new ArrayList();
     }
 
     /** Cause the changes to the zooming and panning variables
@@ -300,7 +301,7 @@
      * @return A map, to be used for the next generated vobscene's
      *                 DefaultVobMatcher.setKeyMap() method.
      */
-    public Map setCursorTo(VobScene vs, float x, float y, ViewContext context) 
{
+    public Map setCursorTo(VobScene vs, float x, float y, AbstractViewContext 
context) {
        // First, get the frame that was hit.
        // This gives the "frame" coordsys.
        int cs = vs.coords.getCSAt(0, x, y, null);
@@ -316,7 +317,16 @@
        int vp = ((GLVobCoorder)vs.coords).getParent(cs);
        Object key = vs.matcher.getKey(vp);
        if("MAINVP".equals(key)) {
-           pa("Main viewport - no reaction yet");
+           pa("Main viewport");
+           cs = vs.coords.getCSAt(cs, x, y, null);
+           Object k = vs.matcher.getKey(cs);
+           pa("Hit: "+cs+" "+k);
+           if(!(k instanceof Cell)) {
+               pa("Not a cell?!");
+               return null;
+           }
+           context.setAccursed((Cell)k);
+           context.setCursorOffset(1);
            return null;
        }
        if(! (key instanceof Pair)) {
Index: gzz/gzz/vob/impl/DefaultVobMatcher.java
diff -u gzz/gzz/vob/impl/DefaultVobMatcher.java:1.2 
gzz/gzz/vob/impl/DefaultVobMatcher.java:1.3
--- gzz/gzz/vob/impl/DefaultVobMatcher.java:1.2 Sun Nov  3 23:35:39 2002
+++ gzz/gzz/vob/impl/DefaultVobMatcher.java     Mon Nov  4 08:45:47 2002
@@ -146,7 +146,13 @@
                // XXX assumes that parent is set already
                int other_parent = interpList[k.parent];
 
-               Key other_key = new Key(mapkey(k.key), other_parent);
+               // KLUDGE!
+               Object mappedKey ; 
+               if(other == this)
+                   mappedKey = k.key;
+               else
+                   mappedKey = mapkey(k.key);
+               Key other_key = new Key(mappedKey, other_parent);
                interpList[i] = other.getCSByKeyObject(other_key);
 
                if(dbg) pa(i+" "+k.parent+" "+other_parent+" "+