[Gzz-commits] gzz/gzz/modules/pp ImageCell.java PPView2.java ...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/10 04:58:42

Modified files:
        gzz/modules/pp : ImageCell.java PPView2.java demotest.py 

Log message:
        paint accursed cell with red

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/ImageCell.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.56&tr2=1.57&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/ImageCell.java
diff -u gzz/gzz/modules/pp/ImageCell.java:1.5 
gzz/gzz/modules/pp/ImageCell.java:1.6
--- gzz/gzz/modules/pp/ImageCell.java:1.5       Thu Dec  5 20:03:51 2002
+++ gzz/gzz/modules/pp/ImageCell.java   Fri Jan 10 04:58:41 2003
@@ -71,6 +71,9 @@
        return im;
     }
 
+    public void setAccursedCell(Cell c) { accursed = c; }
+    private Cell accursed;
+
     CellView def;
 
     public ImageCell(CellView def) {
@@ -81,7 +84,10 @@
                           ViewContext context) {
        Im r = get(c);
        if(r == null) {
-           def.place(c, vs, box, context);
+           if (c == accursed)
+               ((LinebrokenCellContentView)def).place(c, vs, box, context, 
"Color 1 0 0");
+           else
+               def.place(c, vs, box, context);
            return;
        }
 
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.49 
gzz/gzz/modules/pp/PPView2.java:1.50
--- gzz/gzz/modules/pp/PPView2.java:1.49        Fri Jan 10 01:40:16 2003
+++ gzz/gzz/modules/pp/PPView2.java     Fri Jan 10 04:58:41 2003
@@ -36,7 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.49 2003/01/10 
06:40:16 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.50 2003/01/10 
09:58:41 mudyc Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
@@ -355,7 +355,8 @@
     }
 
     TextStyle style = GraphicsAPI.getInstance().getTextStyle("Sans", 0, 20);
-    CellView cellview = new ImageCell(new TextCellContentView(style));
+    //CellView cellview = new ImageCell(new TextCellContentView(style));
+    CellView cellview = new ImageCell(new LinebrokenCellContentView(style));
 
     // public so can be replaced from jython
     public Vob filletState = GLCache.getCallList(
@@ -379,6 +380,7 @@
        AbstractViewContext main_vc = new AbstractViewContext();
        main_vc.setAccursed(context.getAccursed());
        main_vc.setCursorOffset(context.getCursorOffset(context.getAccursed()));
+       ((ImageCell)cellview).setAccursedCell(context.getAccursed());
 
        if(showLinkbuoys)
            main_vc.setCellView(cellview);
@@ -405,14 +407,12 @@
        int c2fCS = vs.coords.ortho(0, 0, 0, 0, 10, 10);
        vs.matcher.add(frameCS, c2fCS, "C2F");
 
-       MAIN_CS = mainctr;
+       MAIN_CS = frameCS;
 
        ev_handler.onClick(frameCS, "Click MAINVP",
-                          new Object[]{ new Integer(mainctr), new 
Integer(frameCS)}
-                          );
+           new Object[]{ new Integer(mainctr), new Integer(frameCS)});
        ev_handler.onDrag(frameCS, "Drag MAINVP",
-                          new Object[]{ new Integer(mainctr), new 
Integer(frameCS)}
-                         );
+           new Object[]{ new Integer(mainctr), new Integer(frameCS)});
        pp_events.setKingCS(frameCS);
 
        if (interps.get("link") != null) {
@@ -424,8 +424,6 @@
                ((Integer)interps.get("shortcut")).intValue());
        }
        
-
-
 
        int[] coords = getCoords(context.getAccursed());
        if(coords != null) {
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.56 gzz/gzz/modules/pp/demotest.py:1.57
--- gzz/gzz/modules/pp/demotest.py:1.56 Fri Jan 10 04:24:09 2003
+++ gzz/gzz/modules/pp/demotest.py      Fri Jan 10 04:58:41 2003
@@ -182,6 +182,7 @@
        if key == "Ctrl-L":
            self.ppv.showLinkbuoys = not self.ppv.showLinkbuoys
 
+        # Keys to move around
         if key == "Left" or key == "Right" \
            or key == "Up" or key == "Down" \
            or key == "Home" or key == "End": 
@@ -206,7 +207,8 @@
                 self.avc.setCursorOffset(0)
             if key == "Down":
                 self.avc.setCursorOffset(len(c.t()))
-        
+
+        # Keys to edit text
         if len(key) == 1 or key == "Backspace" or \
                key == "Delete" or key == "Return":