[ff-cvs] fenfire/org/fenfire/fenpdf fenpdfcontext.py act...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/21 04:24:09

Modified files:
        org/fenfire/fenpdf: fenpdfcontext.py 
        org/fenfire/fenpdf/actions: mouse.py 
        org/fenfire/fenpdf/events: mouse.py 
Added files:
        org/fenfire/fenpdf/events: key.py 

Log message:
        Move keyhandler

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/actions/mouse.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/key.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/events/mouse.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenpdf/actions/mouse.py
diff -u fenfire/org/fenfire/fenpdf/actions/mouse.py:1.3 
fenfire/org/fenfire/fenpdf/actions/mouse.py:1.4
--- fenfire/org/fenfire/fenpdf/actions/mouse.py:1.3     Thu Aug 21 04:15:23 2003
+++ fenfire/org/fenfire/fenpdf/actions/mouse.py Thu Aug 21 04:24:09 2003
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2003, Matti Katila and Benja Fallenstein
+# Copyright (c) 2003, Matti Katila, Benja Fallenstein and Tuomas J. Lukka
 # 
 # This file is part of Fenfire.
 # 
@@ -19,6 +19,11 @@
 # MA  02111-1307  USA
 # 
 # 
+
+"""
+Mouse actions. These actions implement
+various mouse listening things.
+"""
 
 from __future__ import nested_scopes
 from org import fenfire as ff
Index: fenfire/org/fenfire/fenpdf/events/mouse.py
diff -u fenfire/org/fenfire/fenpdf/events/mouse.py:1.2 
fenfire/org/fenfire/fenpdf/events/mouse.py:1.3
--- fenfire/org/fenfire/fenpdf/events/mouse.py:1.2      Thu Aug 21 04:15:23 2003
+++ fenfire/org/fenfire/fenpdf/events/mouse.py  Thu Aug 21 04:24:09 2003
@@ -5,6 +5,9 @@
 from org.fenfire.fenpdf import actions
 
 """Map mouse events to actions
+
+This class contains two MouseMultiplexers, one for
+main views and another for buoys.
 """
 
 class MouseMapper:
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.20 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.21
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.20    Thu Aug 21 03:28:54 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Thu Aug 21 04:24:09 2003
@@ -22,7 +22,6 @@
 from org import fenfire as ff
 from org.fenfire.swamp import Nodes
 import org.nongnu.libvob as vob
-from org.fenfire.spanimages.gl import papermakers
 import java, jarray
 
 dbg = 0
@@ -32,85 +31,6 @@
 
 global w
 
-
-class KeyHandler:
-    def __init__(self, states):
-        self.states = states
-        self.makerTypes = [
-           papermakers.fancyBlur(),
-           papermakers.fancyHalo(),
-           papermakers.fancyBlend(),
-           papermakers.white(),
-            ]
-    def key(self, stroke, main):
-        p('KEY', stroke,', v:',main)
-
-
-        fen = self.states.fen
-        pp = self.states.ppActions
-        cur = self.states.cursor
-        acc = cur.getAccursed()
-        offs = cur.getCursorOffset()
-        alphContent = ff.util.AlphContent(self.states.fen)
-
-        ### normal alphabets etc.
-        if len(stroke) == 1:
-           p( "Typing: ", acc, cur, cur.getAccursed())
-           if acc == None:
-               paper = Nodes.toString(main.getPlane())
-               note = pp.newNote(paper, int(main.getFocus().getPanX()),
-                                  int(main.getFocus().getPanY()), "")
-               cur.setAccursed(Nodes.get(note))
-           
-            acc = Nodes.toString(cur.getAccursed())
-           pp.insertText(acc, offs, stroke)
-           cur.setCursorOffset(offs + 1)
-            return
-
-        if stroke == 'Ctrl-B':
-            p('change the bg texture..')
-            v = main.getView2D()
-            while v != None:
-                if isinstance(v, ff.view.PaperView2D):
-                    v.drawPaper = not v.drawPaper
-                v = v.getChildView2D()
-        if stroke == 'Ctrl-I':
-            p('change spanImageFactory\'s papermaker')
-            self.makerTypes.append(self.makerTypes.pop(0))
-            self.states.spanImageFactory.paperMaker = self.makerTypes[0]
-            self.states.nodeview.reinit(fen.graph, 100)
-            self.states.view2d.pageview_without_surrounding.flush()
-
-        if acc == None: 
-           print "Other keys only for accursed"
-           return
-
-        if stroke == 'Return':
-            if dbg: p('Insert \\n')
-           
-           acc = Nodes.toString(acc)
-           pp.insertText(acc, offs, "\n")
-            cur.setCursorOffset(offs + 1)
-       elif stroke == 'Backspace':
-            note = Nodes.toString(acc)
-            if offs >= 1:
-                p('delete:', offs)
-                pp.deleteText(note, offs - 1, offs)
-                offs = cur.setCursorOffset(offs - 1)
-                text = alphContent.getText(fen.constgraph, acc)
-                if offs == 0 and len(text) == 0:
-                    if RDFUtil.isLinked(fen.graph, acc):
-                        pp.insertText(note, 0, "#")
-                    else:
-                        pp.deleteNote(note)
-                        cur.setAccursed(None)
-       elif stroke == 'Left':
-            if offs > 0: cur.setCursorOffset(offs - 1)
-        elif stroke == 'Right':
-            text = alphContent.getText(acc)
-            if offs < len(text):
-                cur.setCursorOffset( offs + 1)
-
 class Cursor(ff.view.lava.Cursor):
     def __init__(self, fen, multiplexer):
         ff.view.lava.Cursor.__init__(self, fen)
@@ -346,7 +266,7 @@
         global w
         w = win
         self.states = ContextStates(fen, pp)
-        self.keys = KeyHandler(self.states)
+        self.keys = ff.fenpdf.events.key.KeyHandler(self.states)
         self.mousemenu = MouseMenu(self.states)
        self.filename = filename