[Gzz-commits] gzz/gzz/modules/pp EventHandling.java PPMouseEv...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/07 11:10:35

Modified files:
        gzz/modules/pp : EventHandling.java PPMouseEvents.java 
                         PPView2.java 

Log message:
        Started framework to use new interpolation api.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/EventHandling.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPMouseEvents.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/EventHandling.java
diff -u gzz/gzz/modules/pp/EventHandling.java:1.8 
gzz/gzz/modules/pp/EventHandling.java:1.9
--- gzz/gzz/modules/pp/EventHandling.java:1.8   Wed Jan  1 05:33:27 2003
+++ gzz/gzz/modules/pp/EventHandling.java       Tue Jan  7 11:10:34 2003
@@ -32,10 +32,10 @@
 
 
 /** Handles events and emulates funtion pointer.
- * STATE: PROTOTYPE
+ * STATE: Working prototype
  */
 public class EventHandling {
-public static final String rcsid = "$Id: EventHandling.java,v 1.8 2003/01/01 
10:33:27 mudyc Exp $";
+public static final String rcsid = "$Id: EventHandling.java,v 1.9 2003/01/07 
16:10:34 mudyc Exp $";
     public boolean dbg = false;
     private void pa(String s) { System.out.println(s); }
     
Index: gzz/gzz/modules/pp/PPMouseEvents.java
diff -u gzz/gzz/modules/pp/PPMouseEvents.java:1.16 
gzz/gzz/modules/pp/PPMouseEvents.java:1.17
--- gzz/gzz/modules/pp/PPMouseEvents.java:1.16  Tue Jan  7 06:27:29 2003
+++ gzz/gzz/modules/pp/PPMouseEvents.java       Tue Jan  7 11:10:35 2003
@@ -28,7 +28,7 @@
  */
 
 public class PPMouseEvents {
-public static final String rcsid = "$Id: PPMouseEvents.java,v 1.16 2003/01/07 
11:27:29 mudyc Exp $";
+public static final String rcsid = "$Id: PPMouseEvents.java,v 1.17 2003/01/07 
16:10:35 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println(s); }
 
@@ -93,6 +93,8 @@
            m_ev.accursed_obj = null;
            m_ev.hit = null;
 
+           ppv.clearInterps();
+
            // KLUDGE!!!
            // there are no good way in gzz to handle events :/
            if (p_state.getCS() == kingCS && notEmptyFrame(kingCS, p_state)) {
@@ -194,7 +196,7 @@
        public void event(MouseEvent ev, EventHandling.MousePressState p_state,
                          Object[] obs) {
            context.setAccursed((Cell)obs[0]);
-           
((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(((Integer)obs[1]).intValue(),
 m_ev.kingCS);
+           ppv.addInterp("shortcut"+obs[0].toString(), obs[2]);
            AbstractUpdateManager.chg();
        }
     }
@@ -203,7 +205,7 @@
        public void event(MouseEvent ev, EventHandling.MousePressState p_state,
                          Object[] obs) {
            context.setAccursed((Cell)obs[0]);
-           ((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(m_ev.kingCS, 
((Integer)obs[3]).intValue() );
+           ppv.addInterp("link"+obs[0].toString(), obs[3]);
            AbstractUpdateManager.chg();
        }
     } 
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.42 
gzz/gzz/modules/pp/PPView2.java:1.43
--- gzz/gzz/modules/pp/PPView2.java:1.42        Tue Jan  7 06:27:29 2003
+++ gzz/gzz/modules/pp/PPView2.java     Tue Jan  7 11:10:35 2003
@@ -36,7 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.42 2003/01/07 
11:27:29 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.43 2003/01/07 
16:10:35 mudyc Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
@@ -141,6 +141,13 @@
     public Space space;
     public PPDims d;
 
+    private TreeMap interps = new TreeMap();
+    public void addInterp(Object key, Object o) { interps.put(key, o); }
+    public void clearInterps() { interps.clear(); }
+
+    private int MAIN_CS = -1;
+    
+
     Vob black = GLCache.getCallList("Color 0 0 0\n");
 
     CoordinatePlaneView coordinatePlaneView;
@@ -281,11 +288,9 @@
            int actr = vs.translateCS(anchorUnit, "TR12", .5f, .5f);
            int buoycs = floater.buoyCoordsys(actr, key);
 
-
            final int nadir_buoy = 
                ((GLVobCoorder)vs.coords).nadirOrigin(buoycs, nadir_point_cs);
            vs.matcher.add(nadir_buoy, "NADIR"+c.toString() );
-           //vs.matcher.add(nadir_buoy, new Pair(c, connectedFrom));
 
            //final int frameCS = vs.orthoBoxCS(buoycs, "frame", 0, 
            final int frameCS = vs.orthoBoxCS(nadir_buoy, "frame", 0, 
@@ -293,9 +298,19 @@
                    buoyVPWidth, buoyVPHeight);
            vs.activate(frameCS);
            ev_handler.onClick(frameCS, "Link CLICK",
-                              new Object[]{ c, connectedFrom, new 
Integer(anchor), new Integer(frameCS)});
+                              new Object[]{ c, connectedFrom, new 
Integer(MAIN_CS),
+                                            new Integer(frameCS), new 
Integer(anchor)});
            ev_handler.onDrag(frameCS, "Drag buoy");
 
+           // XXX hehheh...  remember that new accursed have already been set!
+           if (pp_events.context != null && 
+               interps.get("link"+pp_events.context.getAccursed().toString()) 
!= null) {
+               ((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(MAIN_CS, 
+                                                                    
((Integer)interps.get("link"+pp_events.context.getAccursed().toString())).intValue()
+               );
+           }
+
+
            // XXX Pan
            int[] pan = getCoords(c);
            final int c2fCS = vs.coords.ortho(0, 0, 
@@ -373,6 +388,7 @@
                (-mainWidth)/2, -mainHeight/2, 1, 1, 
                mainWidth, mainHeight);
        vs.activate(frameCS);
+       MAIN_CS = frameCS;
        ev_handler.onClick(frameCS, "Click MAINVP",
                           new Object[]{ new Integer(mainctr), new 
Integer(frameCS)}
                           );
@@ -521,11 +537,12 @@
                    fr = cs_gen.getNextCS();
                }
 
-
-               //vs.matcher.add(fr, p);
                vs.activate(fr);
-               ev_handler.onClick(fr, "Shortcut link", new Object[]{p, new 
Integer(fr)});
-
+               ev_handler.onClick(fr, "Shortcut link", new Object[]{p, new 
Integer(MAIN_CS), new Integer(fr)});
+               if (interps.get("shortcut"+p.toString()) != null) {
+                   
((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(MAIN_CS, 
+                        
((Integer)interps.get("shortcut"+p.toString())).intValue());
+               }
 
                int c2f = vs.coords.ortho(0, 11, 0, 0, 
                                          leftPanelZoom, leftPanelZoom);
@@ -537,10 +554,7 @@
                
                i++;
            }
-           //((DefaultVobMatcher)vs.matcher).dumbByParent();
        }
-       
-       
     }