[Gzz-commits] gzz ./Gzz.py gzz/client/Fallback.java

[Benja Fallenstein]

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

Modified files:
        .              : Gzz.py 
        gzz/client     : Fallback.java 

Log message:
        more

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Gzz.py.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.53&tr2=1.54&r1=text&r2=text

Patches:
Index: gzz/Gzz.py
diff -u gzz/Gzz.py:1.60 gzz/Gzz.py:1.61
--- gzz/Gzz.py:1.60     Sun Jan  5 05:41:27 2003
+++ gzz/Gzz.py  Sun Jan  5 06:13:00 2003
@@ -33,6 +33,7 @@
 
 def call(list, type=gzz.potion.CommandCall):
     if list is None: return None
+    if isinstance(list, gzz.potion.Expression): return list
     head = list[0]
     params = [call(l, gzz.potion.FunctionCall) for l in list[1:]]
     print head, params
@@ -123,7 +124,13 @@
 
             from gzz.potion.potions import NewCell, Connect, PrefixOrOther, \
                                           Hop2, Put, PrefixOrRight, 
PrefixOrLeft, \
-                                          RightWindow, LeftWindow, Go, 
Clone,ToggleMark
+                                          RightWindow, LeftWindow, Go, Clone, \
+                                           ToggleMark, Quit, ChangeView, 
ChangeDim
+
+           def const(i):
+               from gzz.potion.potions import ConstantExpression
+               return ConstantExpression(i, str(i))
+
             bindings = {
                 'Up': arr(1,1,-1), 'i': arr(1,1,-1), 'e': arr(0,1,-1),
                 'Down': arr(1,1,1), ',': arr(1,1,1), 'c': arr(0,1,1),
@@ -141,7 +148,14 @@
                 'T': action([Clone,[PrefixOrLeft], None]),
                'm': action([ToggleMark, [RightWindow]]),
                'M': action([ToggleMark, [LeftWindow]]),
+               'q': call([Quit]),
+               'Q': call([Quit]),
+               'x': call([ChangeDim, const(0), const(1)]),
+               'Alt-X': call([ChangeDim, const(0), const(-1)]),
+               'v': call([ChangeView, const(1)]),
+               'Alt-V': call([ChangeView, const(-1)]),
            }
+
             self.binder = gzz.client.PotionFallbackBinder(map(bindings))
             self.decorators.append(gzz.view.PendingPotionDecorator())
         else:
Index: gzz/gzz/client/Fallback.java
diff -u gzz/gzz/client/Fallback.java:1.53 gzz/gzz/client/Fallback.java:1.54
--- gzz/gzz/client/Fallback.java:1.53   Fri Jan  3 13:05:06 2003
+++ gzz/gzz/client/Fallback.java        Sun Jan  5 06:13:00 2003
@@ -74,7 +74,7 @@
  * It implements a subset of the 0.6.0 bindings.
  */
 public class Fallback {
-public static final String rcsid = "$Id: Fallback.java,v 1.53 2003/01/03 
18:05:06 benja Exp $";
+public static final String rcsid = "$Id: Fallback.java,v 1.54 2003/01/05 
11:13:00 benja Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -200,7 +200,7 @@
                 return -1;
         }
        public boolean isMarked(Cell c) {
-           return DefaultBinder.markedCells.contains(c);
+           return binder.isMarked(c);
        }
         public CellView getCellView() {
             return cellViewList[cellViewIndex];