[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/12 04:12:06

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/demo: fenpdfcontext.py 
        org/fenfire/view: doublegeometer.py 

Log message:
        fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/doublegeometer.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.18 
fenfire/org/fenfire/bin/fenpdf10.py:1.19
--- fenfire/org/fenfire/bin/fenpdf10.py:1.18    Tue Aug 12 03:53:17 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Tue Aug 12 04:12:06 2003
@@ -318,10 +318,8 @@
 # connectors = [ppconnector, tconnector]
 
 class EventHandler:
-    def __init__(self, buoymgr, context):
-        self.buoyManager = buoymgr
+    def __init__(self, context):
         self.context = context
-        self.context.setMngr(mgr)
     def mouse(self, ev, oldvs):
         if dbg: p(ev)
 
@@ -358,9 +356,10 @@
 
             # There is a bug in AbstractUpdateManager code(?) and that's why 
now is must to return.
             #return 1
-            return 0
         self.context.states.lastEvent = ev
+        return 0
 
+    def contextMouse(self, ev):
         # ...then see context
         if ev.getType() != ev.MOUSE_CLICKED:
             return 0
@@ -373,16 +372,17 @@
         return 0
 
 
+
     def buoyMouse(self, mgr, ev, single, link):
         if buoyMouse.deliverEvent(ev):
             vob.AbstractUpdateManager.chg()
             return 1
 
         if ev.getType() != ev.MOUSE_CLICKED:
-            return 1
+            return 0
 
         if not (ev.getButton() in [1, 3]):
-            return 1
+            return 0
 
         if isinstance(link[0].getView2D(), ff.view.PageScrollView2D):
             mgr.singles[0].followLinkFromManager(link, single)
@@ -397,33 +397,66 @@
         vob.AbstractUpdateManager.chg()
         return 1
 
+
+    def key(self, key):
+        self.context.key(key)
+
+        if key == "+":
+            self.split += .03
+        elif key == "-":
+            self.split -= .03
+        elif key == "Home":
+            self.mgr.singles[1].mainNode = ff.view.buoy.MainNode2D(planeHome, 
irregu, ctrl)
+        elif key == "Ctrl-Q":
+            p("going to save");
+
+            m = ff.swamp.Graphs.toModel(fen.graph);
+            m.write(java.io.FileWriter(FILE));
+
+            java.lang.System.exit(43)
+        elif key == "Ctrl-R":
+            vob.putil.demo.loadScenes()
+        #elif key == "?":
+        #    vob.putil.demo.showHelp = 1-showHelp
+        #    vob.AbstractUpdateManager.setNoAnimation()
+        else:
+            return globalkey(key)
+
+        vob.AbstractUpdateManager.chg()
+        return 1
+
+
+
+
        
 
 class Scene:
     def __init__(self, context, single = 0):
         self.single = single
-
+        self.eventHandler = EventHandler(context)
         self.buoyManager = None
         if single:
             self.buoyManager = 
vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
-                [mainNode], connectors,
+                [mainNode], connectors, self.eventHandler,
                vob.buoy.buoymanager.SingleGeometer(self, context, nodeview),
                ff.view.fenpdfgeometry.FenPDFGeometryConfiguration())
         else:
             self.buoyManager = 
vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
-               [mainNode, mainNode2], connectors,
+               [mainNode, mainNode2], connectors, self.eventHandler,
                ff.view.doublegeometer.DoubleGeometer(self, context, nodeview),
                ff.view.fenpdfgeometry.FenPDFGeometryConfiguration())
-        self.eventHandler = EventHandler(self.buoyManager, context)
             
         w.setCursor('default')
 
+        self.context = context
+        self.context.setMngr(self.buoyManager)
+
 
     def mouse(self, ev):
         if not self.buoyManager.mouse(ev):
-            self.eventHandler.mouse(ev)
+            self.eventHandler.contextMouse(ev)
 
-    def keystroke(self, key):
+    def key(self, key):
         self.eventHandler.key(key)
 
 currentScene = Scene(context)
@@ -432,7 +465,6 @@
 def screenshots():
     frame = 0
     s = Scene()
-
 
     # FIXME: move s to shot position
     vs = w.createVobScene()
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.24 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.25
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.24      Tue Aug 12 03:53:17 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Tue Aug 12 04:12:06 2003
@@ -202,6 +202,7 @@
 
     class GoHome(Action):
         def run(self):
+            pass
             #self.s.mgr.singles[1].mainNode = 
ff.view.buoy.MainNode2D(planeHome, irregu, ctrl)
             
 
Index: fenfire/org/fenfire/view/doublegeometer.py
diff -u fenfire/org/fenfire/view/doublegeometer.py:1.1 
fenfire/org/fenfire/view/doublegeometer.py:1.2
--- fenfire/org/fenfire/view/doublegeometer.py:1.1      Mon Aug 11 14:52:26 2003
+++ fenfire/org/fenfire/view/doublegeometer.py  Tue Aug 12 04:12:06 2003
@@ -67,33 +67,3 @@
 
        return [(self.mainbox1, None, None), 
                (self.mainbox2, None, None)]
-
-
-    def key(self, key):
-        self.context.key(key)
-
-        if key == "+":
-            self.split += .03
-        elif key == "-":
-            self.split -= .03
-        elif key == "Home":
-            self.mgr.singles[1].mainNode = ff.view.buoy.MainNode2D(planeHome, 
irregu, ctrl)
-        elif key == "Ctrl-Q":
-            p("going to save");
-
-            m = ff.swamp.Graphs.toModel(fen.graph);
-            m.write(java.io.FileWriter(FILE));
-
-            java.lang.System.exit(43)
-        elif key == "Ctrl-R":
-            vob.putil.demo.loadScenes()
-        #elif key == "?":
-        #    vob.putil.demo.showHelp = 1-showHelp
-        #    vob.AbstractUpdateManager.setNoAnimation()
-        else:
-            return globalkey(key)
-
-        vob.AbstractUpdateManager.chg()
-        return 1
-
-