[Gzz-commits] gzz gzz/view/DefaultBinder.java lava/gzz/potion...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/01/05 06:02:50

Modified files:
        gzz/view       : DefaultBinder.java 
        lava/gzz/potion/potions: Types.java 
        lava/gzz/zzutil: Connection.java 
        gzz/client     : FallbackBinder.java pythonbinder.py 

Log message:
        Change mark infrastructure to allow different binders to implement marks

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DefaultBinder.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/Types.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/zzutil/Connection.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/FallbackBinder.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/pythonbinder.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/gzz/client/FallbackBinder.java
diff -u gzz/gzz/client/FallbackBinder.java:1.15 
gzz/gzz/client/FallbackBinder.java:1.16
--- gzz/gzz/client/FallbackBinder.java:1.15     Sun Oct 27 19:17:54 2002
+++ gzz/gzz/client/FallbackBinder.java  Sun Jan  5 06:02:50 2003
@@ -32,4 +32,6 @@
     void keystroke(String k, Fallback.Win win);
     void mouse(MouseEvent e, Fallback.Win win);
     void windowClosed(Fallback.Win win);
+
+    boolean isMarked(Cell c);
 }
Index: gzz/gzz/client/pythonbinder.py
diff -u gzz/gzz/client/pythonbinder.py:1.3 gzz/gzz/client/pythonbinder.py:1.4
--- gzz/gzz/client/pythonbinder.py:1.3  Sun Oct 27 19:54:13 2002
+++ gzz/gzz/client/pythonbinder.py      Sun Jan  5 06:02:50 2003
@@ -3,7 +3,7 @@
 
 MODES = ['normal', 'edit 0', 'edit 1', 'search']
 
-class PythonBinder(gzz.client.FallbackBinder):  
+class PythonBinder(gzz.client.FallbackBinder):
     def __init__(self, normal_mode, edit_mode, search_mode):
         self.normal_mode = normal_mode
         self.edit_mode = edit_mode
@@ -11,6 +11,8 @@
 
     def setFallback(self, client):
         self.client = client
+
+    def isMarked(c): return 0
 
     pendingOp = None
     mode = 'normal'
Index: gzz/gzz/view/DefaultBinder.java
diff -u gzz/gzz/view/DefaultBinder.java:1.13 
gzz/gzz/view/DefaultBinder.java:1.14
--- gzz/gzz/view/DefaultBinder.java:1.13        Fri Nov 15 23:38:03 2002
+++ gzz/gzz/view/DefaultBinder.java     Sun Jan  5 06:02:49 2003
@@ -44,7 +44,7 @@
 /** Keybindings for the Fallback client.
  */
 public class DefaultBinder implements FallbackBinder {
-public static final String rcsid = "$Id: DefaultBinder.java,v 1.13 2002/11/16 
04:38:03 benja Exp $";
+public static final String rcsid = "$Id: DefaultBinder.java,v 1.14 2003/01/05 
11:02:49 benja Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -100,6 +100,10 @@
 
     public void setFallback(Fallback fallback) {
         this.fallback = fallback;
+    }
+
+    public boolean isMarked(Cell c) {
+        return markedCells.contains(c);
     }
 
 
Index: gzz/lava/gzz/potion/potions/Types.java
diff -u gzz/lava/gzz/potion/potions/Types.java:1.5 
gzz/lava/gzz/potion/potions/Types.java:1.6
--- gzz/lava/gzz/potion/potions/Types.java:1.5  Sat Jan  4 13:12:57 2003
+++ gzz/lava/gzz/potion/potions/Types.java      Sun Jan  5 06:02:49 2003
@@ -31,6 +31,8 @@
 
 public class Types {
     public static Type CELL = new SimpleType("which cell?");
+    public static Type AXIS = new SimpleType("which axis?");
+    public static Type DIR = new SimpleType("which diretion?");
 
     public static Type PLACE = new SimpleType("where?") {
            public FunctionExpression readDir(int win, int axis, int dir,
Index: gzz/lava/gzz/zzutil/Connection.java
diff -u gzz/lava/gzz/zzutil/Connection.java:1.1 
gzz/lava/gzz/zzutil/Connection.java:1.2
--- gzz/lava/gzz/zzutil/Connection.java:1.1     Mon Nov 25 18:52:50 2002
+++ gzz/lava/gzz/zzutil/Connection.java Sun Jan  5 06:02:50 2003
@@ -3,7 +3,12 @@
 
 public class Connection{
 
-       public Dim dim;
-       public Cell negside, posside;
+    public Dim dim;
+    public Cell negside, posside;
 
+    public Connection(Cell negside, Dim dim, Cell posside) {
+       this.dim = dim;
+       this.negside = negside;
+       this.posside = posside;
+    }
 }