[Gzz-commits] fenfire/org/fenfire/view FenPDFContext.java RST...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/05/13 19:17:46

Modified files:
        org/fenfire/view: FenPDFContext.java RSTText.java 

Log message:
        cursor work, I still get the error: 'Error: CallistCoorded with 
non-glperformable.'

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/FenPDFContext.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/RSTText.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/FenPDFContext.java
diff -u fenfire/org/fenfire/view/FenPDFContext.java:1.5 
fenfire/org/fenfire/view/FenPDFContext.java:1.6
--- fenfire/org/fenfire/view/FenPDFContext.java:1.5     Tue May 13 18:08:57 2003
+++ fenfire/org/fenfire/view/FenPDFContext.java Tue May 13 19:17:46 2003
@@ -48,9 +48,13 @@
 
     public void isToBePlaced(Object node, TextHandler text) {
        p("n"+node+" == "+accursed);
-       if (node==accursed)
+       if (node==accursed) {
            text.setColor(java.awt.Color.red);
-       else text.setColor(java.awt.Color.black);
+           text.setCursorOffset(cursorOffset);
+       } else {
+           text.setColor(java.awt.Color.black);
+           text.setCursorOffset(-1);
+       }
     }
 
     
@@ -75,6 +79,7 @@
 
        if (RDFUtil.isNodeType(fen, rstNode, RST.Sentence)) {
            p("rstNode is set to sentence - no other node handlers 
implemented");
+           ((CachedNodeFunction)nodef).makeAllDirty(accursed);
 
            Object sentence = rstNode;
 
Index: fenfire/org/fenfire/view/RSTText.java
diff -u fenfire/org/fenfire/view/RSTText.java:1.2 
fenfire/org/fenfire/view/RSTText.java:1.3
--- fenfire/org/fenfire/view/RSTText.java:1.2   Tue May 13 18:08:57 2003
+++ fenfire/org/fenfire/view/RSTText.java       Tue May 13 19:17:46 2003
@@ -39,9 +39,9 @@
 public class RSTText extends TextHandler implements NodeFunction {
     private void p(String s) { System.out.println("RSTText:: "+s); }
 
+    final LineVob cursorVob = new LineVob(0, 0, 0, 1, java.awt.Color.black);
     final NodeFunction nodeContent;
     final TextStyle style;
-    final float scale;
     private FenPDFContext context = null;
 
     public void setContext(FenPDFContext context) {
@@ -51,33 +51,43 @@
     public RSTText(NodeFunction nodeContent,
                   TextStyle style,
                   float scale) {
+       super();
        this.nodeContent = nodeContent;
        this.style = style;
-       this.scale = scale;
+       super.setScale(scale);
     }
 
     public Object f(ConstGraph g, Object node) {
        if (context == null) throw new Error("No context set");
 
        context.isToBePlaced(node, this);
-       p("placed");
+       p("placed, offs: "+cursorOffset);
 
        Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);
        
        final Object objNode = node;
-       String s = enf.makeString();
-       final TextVob vob = new TextVob(style, s, false, 
-                                       "Color " + 
ColorUtil.colorGLString(color));
+       final String s = enf.makeString();
+       final TextVob vob = new TextVob(style, s, false, color);
        final float width = style.getWidth(s, scale);
        final float height = style.getHeight(scale);
+       final int offs = super.getCursorOffset();
 
        return new org.nongnu.libvob.lava.placeable.Placeable() {
                public void place(VobScene vs, int into) {
                    int scaled = vs.orthoCS(into, objNode, 0,
                                            0, 0, height, height);
                    vs.put(vob, scaled);
-               }
 
+                   // doesn't work, could someone fix this?
+                   // I get "Error: CallistCoorded with non-glperformable."
+                   if(offs >= 0) {
+                       float x = style.getWidth(s.substring(0,offs), scale);
+                       p("offs x: "+x);
+                       int cursor = vs.orthoCS(into, "CURSOR_KEY", -1, 
+                                               x,0, 1, height);
+                       vs.map.put(cursorVob, cursor);
+                   }
+               }
                public float getWidth() { return width; }
                public float getHeight() { return height; }
            };