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

[Matti Katila]

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

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/fenpdf: fenpdfcontext.py 

Log message:
        mousemenu fixes and doc. report immediately if broken.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.52 
fenfire/org/fenfire/bin/fenpdf10.py:1.53
--- fenfire/org/fenfire/bin/fenpdf10.py:1.52    Mon Aug 18 07:18:38 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Wed Aug 20 01:41:12 2003
@@ -302,33 +302,23 @@
 class EventHandler:
     def __init__(self, context):
         self.context = context
+
+        
     def mouse(self, ev, oldvs):
+        """ Callback from buoymanager, should not do context things..
+        Mostly because of click workaround. 
+        """
         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!')
 
-           # The following code has ABSOLUTELY no place in the geometer.
-
-            mousePrint(self.context.states.lastEvent, 'lastEvent')
-
             # release event must go to mainMouse MouseMultiplexer to work 
correctly!
             # mainMouse.deliverEvent(ev)
             # flush implemented...
             mainMouse.flush()
             buoyMouse.flush()
              
-            self.context.clean()
             w.setCursor('default')
 
             # workaround..
@@ -345,7 +335,8 @@
             return 0
 
         if self.context.doMouse(ev, oldvs):
-            p('context')
+            p('context seen, now cleaning it')
+            self.context.clean()
             mainMouse.flush()
             vob.AbstractUpdateManager.chg()
             return 1
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.16 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.17
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.16    Mon Aug 18 16:07:19 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Wed Aug 20 01:41:12 2003
@@ -322,9 +322,7 @@
         self.isHide = 1
 
     def mouse(self, ev, vs):
-        if not self.isHide:
-            if dbg: p('hidden menu')
-            return
+        if self.isHide: return
         
         cs = vs.matcher.getCS(0, 'MOUSE_MENU')
         p('cs:', cs)