[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py view/buoy/A...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/07 07:10:07

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/view/buoy: AbstractMainNode2D.java actions.py 

Log message:
        workarounds, broilerplate

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/actions.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.2 
fenfire/org/fenfire/bin/fenpdf10.py:1.3
--- fenfire/org/fenfire/bin/fenpdf10.py:1.2     Wed Aug  6 13:07:52 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Thu Aug  7 07:10:07 2003
@@ -43,6 +43,23 @@
 FenPDF is offered you by the Fenfire team(http://fenfire.org).
 
 
+ 
+Fenfire is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+ 
+Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+Public License for more details.
+ 
+You should have received a copy of the GNU Lesser General
+Public License along with Fenfire; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+MA  02111-1307  USA
+ 
+
 """
 
 
@@ -333,16 +350,34 @@
     def mouse(self, ev, oldvs):
         if dbg: p(ev)
 
+        def mousePrint(ev, txt='event'):
+            if ev.getType() == ev.MOUSE_RELEASED:
+                p(txt,'mouse released')
+            elif ev.getType() == ev.MOUSE_CLICKED:
+                p(txt,'mouse clicked')
+            elif ev.getType() == ev.MOUSE_PRESSED:
+                p(txt,'mouse pressed')
+            else: pass
+        if dbg: mousePrint(ev)
+
         if ev.getType() == ev.MOUSE_RELEASED:
             p('mainMouse released? - there\'s a bug in here!')
+            mousePrint(self.lastEvent, 'lastEvent')
+
+            # workaround..
+            if self.lastEvent.getType() == ev.MOUSE_PRESSED:
+                p('workaround')
+                return 1
+
             # mainMouse XXX
             #ctrl.removePressState()
             self.context.states.clean()
             w.setCursor('default')
             # There is a bug in AbstractUpdateManager code(?) and that's why 
now is must to return.
-            # return 1
+            #return 1
             return 0
        #return 0
+        self.lastEvent = ev
 
         # ...then see context
         if ev.getType() != ev.MOUSE_CLICKED:
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.39 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.40
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.39  Wed Aug  6 
11:55:54 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Thu Aug  7 
07:10:07 2003
@@ -252,7 +252,7 @@
        focus.setPan(pt[0], pt[1]);
        clipPan();
            
-       AbstractUpdateManager.chg();
+       //AbstractUpdateManager.chg();
     }
 
     public void changeSize(float change) { ; }
Index: fenfire/org/fenfire/view/buoy/actions.py
diff -u fenfire/org/fenfire/view/buoy/actions.py:1.3 
fenfire/org/fenfire/view/buoy/actions.py:1.4
--- fenfire/org/fenfire/view/buoy/actions.py:1.3        Wed Aug  6 12:25:20 2003
+++ fenfire/org/fenfire/view/buoy/actions.py    Thu Aug  7 07:10:07 2003
@@ -61,8 +61,8 @@
     def clicked(self, x, y):
         if 1 or dbg: p('move pan slow')
         self.super()
-        self.main.moveToPoint(int(x),int(y), self.oldVS)
         self.context.states.fastChg = 0
+        self.main.moveToPoint(int(x),int(y), self.oldVS)
 
 class ZoomPan(vob.input.RelativeAxisListener, AbstractAction):
     def changedRelative(self, x):