[ff-cvs] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/20 14:30:13

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/fenpdf: fenpdfcontext.py 
        org/fenfire/fenpdf/appearance: views.py 
Added files:
        org/fenfire/fenpdf: fenpdf.py 
        org/fenfire/fenpdf/events: __init__.py mouse.py 

Log message:
        Refactoring: start new, smaller, better-defined central object.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdf.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/views.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/events/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/events/mouse.py?rev=1.1

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.57 
fenfire/org/fenfire/bin/fenpdf10.py:1.58
--- fenfire/org/fenfire/bin/fenpdf10.py:1.57    Wed Aug 20 13:08:22 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Wed Aug 20 14:30:12 2003
@@ -170,7 +170,8 @@
 
 # Default controls for main view
 ## see 
http://himalia.it.jyu.fi/ffdoc/fenfire/pegboard/fenpdf_v1_spec_1--tjl/peg.gen.html
 and 'Bindings'
-mainMouse = vob.mouse.MouseMultiplexer()
+
+
 
 # print "APP",dir(ff.fenpdf.appearance)
 # import org.fenfire.fenpdf.appearance.papers
@@ -289,61 +290,36 @@
         vob.AbstractUpdateManager.chg()
         return 1
 
+fenPDF = ff.fenpdf.fenpdf.FenPDF()
 
+fenPDF.fen = fen
 
 papers = ff.fenpdf.appearance.papers.Papers()
 eventHandler = EventHandler()
-views = ff.fenpdf.appearance.views.Views(fen, papers, mainMouse, 
-               eventHandler, planeHome)
 
-context = Context(w, fen, ppActions, views, FILE)
+
+context = Context(w, fen, ppActions, FILE)
+
+fenPDF.events.mouse = ff.fenpdf.events.mouse.MouseMapper(context)
+
+# XXX KLUDGE
+mainMouse = fenPDF.events.mouse.mainMouse
+buoyMouse = fenPDF.events.mouse.buoyMouse
+
+views = ff.fenpdf.appearance.views.Views(fenPDF, papers, 
+               eventHandler, 
+               planeHome)
+fenPDF.views = views
+
+context.states.cursor = ff.fenpdf.fenpdfcontext.Cursor(fen, 
views.getMultiplexerNodeContentFunction())
+
+
 eventHandler.context = context
 
 ff.view.buoy.MainNode2D.fen = fen
 ff.view.buoy.AbstractMainNode2D.context = context
 
-
-
-# With button 1
-mainMouse.setListener(1, 0,'Moving the pan around or the node if accursed.', \
-                      actions.mouse.CanvasNodePressListener(context, \
-                          actions.mouse.NodeMover(context), 
actions.mouse.PanMover(context)))
-mainMouse.setListener(1, vob.VobMouseEvent.SHIFT_MASK,
-                      'Selecting area of main view.',
-                      actions.mouse.SelectArea(context))
-mainMouse.setListener(1, vob.VobMouseEvent.CONTROL_MASK,
-                      'Move the note.',
-                      actions.mouse.NodeMover(context))
-mainMouse.setListener(1, 0, 'Browse to clicked point in the main view',
-                      actions.mouse.BrowseClick(context))
-
-# With button 3
-mainMouse.setListener(3, 0, mainMouse.VERTICAL, 1.0, \
-                      'Zooming the main view.', actions.mouse.ZoomPan(context))
-mainMouse.setListener(3, 0, mainMouse.HORIZONTAL, 1.0, \
-                      'Changing the size of main view (currently only for 
pagescroll).', # text
-                      actions.mouse.ChangeSize(context))
-mainMouse.setListener(3, vob.VobMouseEvent.SHIFT_MASK,
-                      'Select a node by click or unselect.',
-                      actions.mouse.IfSelectNodeOnPlane(context))
-mainMouse.setListener(3, 0, 'Show context menu if available (should be).',
-                      actions.mouse.MouseMenu(context))
-
-# With wheel
-mainMouse.setWheelListener(0, 'Moving the pan', \
-                           actions.mouse.PanMover(context))
-context.states.mainMouse = mainMouse
-
-
-# Default controls for buoys
-buoyMouse = vob.mouse.MouseMultiplexer()
-# With button 1
-buoyMouse.setListener(1, 0, 'Follow the link buoy.',
-                      actions.mouse.BuoyFollowClick(context))
-
-# With button 3
-buoyMouse.setListener(3, 0, 'Show mouse menu for buoy', \
-                      actions.mouse.BuoyMouseMenu(context))
+fenPDF.events.mouse.update()
 
        
 
Index: fenfire/org/fenfire/fenpdf/appearance/views.py
diff -u fenfire/org/fenfire/fenpdf/appearance/views.py:1.3 
fenfire/org/fenfire/fenpdf/appearance/views.py:1.4
--- fenfire/org/fenfire/fenpdf/appearance/views.py:1.3  Wed Aug 20 12:54:36 2003
+++ fenfire/org/fenfire/fenpdf/appearance/views.py      Wed Aug 20 14:30:13 2003
@@ -16,13 +16,13 @@
     versions that use other node types as well (mm graphs etc)
     """
 
-    def __init__(self, fen, papers, mainMouseMultiplexer, eventHandler,
+    def __init__(self, fenPDF, papers, eventHandler,
                        home):
-       self.fen = fen
+       self.fenPDF = fenPDF
+       self.fen = self.fenPDF.fen # XXX
        self.papers = papers
        self.textStyle = vob.GraphicsAPI.getInstance(
                            ).getTextStyle("sans", 0, 24)
-       self.mainMouseMultiplexer = mainMouseMultiplexer
        self.eventHandler = eventHandler
        self.home = home
 
@@ -48,12 +48,12 @@
        canvasNodeType = ff.view.buoy.NodeType2D(
                    self.canvasview2d, 
                    ff.view.buoy.MainNode2D.MainNode2DFactory(
-                       self.mainMouseMultiplexer))
+                       self.fenPDF.events.mouse.getMainMouseMultiplexer()))
 
        pageNodeType = ff.view.buoy.NodeType2DFull(
                    self.pagescrollview2d, 
                    ff.view.buoy.FisheyeMainNode2D.FisheyeMainNode2DFactory(
-                       self.mainMouseMultiplexer))
+                       self.fenPDF.events.mouse.getMainMouseMultiplexer()))
 
 
        ########## The connectors 
@@ -91,9 +91,9 @@
            ff.fenpdf.appearance.fenpdfgeometry.FenPDFGeometryConfiguration()
 
        mainNode = ff.view.buoy.MainNode2D(self.home, 
-                                   self.canvasview2d, 
self.mainMouseMultiplexer)
+                                   self.canvasview2d, 
self.fenPDF.events.mouse.getMainMouseMultiplexer())
        mainNode2 = ff.view.buoy.MainNode2D(self.home, 
-                                   self.canvasview2d, 
self.mainMouseMultiplexer)
+                                   self.canvasview2d, 
self.fenPDF.events.mouse.getMainMouseMultiplexer())
 
        self.buoyManager = vob.buoy.buoymanager.MultiBuoyManager(
            [mainNode, mainNode2], self.connectors, self.eventHandler,
@@ -111,10 +111,10 @@
     def createMainNode(self, plane):
        if isinstance(plane, alph.PageScroll):
            return ff.view.buoy.FisheyeMainNode2D(plane, self.pagescrollview2d,
-                       self.mainMouseMultiplexer)
+                       self.fenPDF.events.mouse.getMainMouseMultiplexer())
        else:
            return ff.view.buoy.MainNode2D(plane, self.canvasview2d, 
-                       self.mainMouseMultiplexer)
+                       self.fenPDF.events.mouse.getMainMouseMultiplexer())
 
     def scene(self, vs):
        return self.buoyManager.scene(vs)
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.18 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.19
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.18    Wed Aug 20 12:34:33 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Wed Aug 20 14:30:12 2003
@@ -122,13 +122,11 @@
         self.multiplexer.setMultiplexerNodes(set)
 
 class ContextStates:
-    def __init__(self, fen, ppAction, views):
+    def __init__(self, fen, ppAction):
         self.clean()
-        self.cursor = Cursor(fen, views.getMultiplexerNodeContentFunction())
         self.ppActions = ppAction
         self.fen = fen
         self.pageview = None
-       self.views = views
 
         # buoymanager, set with setBuoymanager()
         self.buoymanager = None
@@ -344,10 +342,10 @@
 class Context(ff.view.lava.ContextNodeView.Context,
               ff.view.buoy.AbstractMainNode2D.Context,
               ff.view.lava.TextHandler.Context):
-    def __init__(self, win, fen, pp, views, filename):
+    def __init__(self, win, fen, pp, filename):
         global w
         w = win
-        self.states = ContextStates(fen, pp, views)
+        self.states = ContextStates(fen, pp)
         self.keys = KeyHandler(self.states)
         self.mousemenu = MouseMenu(self.states)
        self.filename = filename