[Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/08 02:06:05

Modified files:
        gzz/modules/pp : PPMouseEvents.java PPView2.java 
        gzz/modules/pp/vob: CalendarBg.java 

Log message:
        some keymap work and year++

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPMouseEvents.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/CalendarBg.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/PPMouseEvents.java
diff -u gzz/gzz/modules/pp/PPMouseEvents.java:1.17 
gzz/gzz/modules/pp/PPMouseEvents.java:1.18
--- gzz/gzz/modules/pp/PPMouseEvents.java:1.17  Tue Jan  7 11:10:35 2003
+++ gzz/gzz/modules/pp/PPMouseEvents.java       Wed Jan  8 02:06:05 2003
@@ -28,7 +28,7 @@
  */
 
 public class PPMouseEvents {
-public static final String rcsid = "$Id: PPMouseEvents.java,v 1.17 2003/01/07 
16:10:35 mudyc Exp $";
+public static final String rcsid = "$Id: PPMouseEvents.java,v 1.18 2003/01/08 
07:06:05 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println(s); }
 
@@ -205,8 +205,9 @@
        public void event(MouseEvent ev, EventHandling.MousePressState p_state,
                          Object[] obs) {
            context.setAccursed((Cell)obs[0]);
-           ppv.addInterp("link"+obs[0].toString(), obs[3]);
-           AbstractUpdateManager.chg();
+           ppv.addInterp("link"+obs[0].toString(), obs[1]);
+           ppv.addInterp("main", obs[3]);
+           AbstractUpdateManager.chg();         
        }
     } 
 
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.43 
gzz/gzz/modules/pp/PPView2.java:1.44
--- gzz/gzz/modules/pp/PPView2.java:1.43        Tue Jan  7 11:10:35 2003
+++ gzz/gzz/modules/pp/PPView2.java     Wed Jan  8 02:06:05 2003
@@ -36,7 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.43 2003/01/07 
16:10:35 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.44 2003/01/08 
07:06:05 mudyc Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
@@ -302,13 +302,22 @@
                                             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, 
+               ((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(frameCS, 
                                                                     
((Integer)interps.get("link"+pp_events.context.getAccursed().toString())).intValue()
                );
            }
+           */
+
+
+           if (interps.get("link"+c.toString()) != null) {
+               ((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(frameCS, 
+                  ((Integer)interps.get("link"+c.toString())).intValue());
+           }
 
 
            // XXX Pan
@@ -396,6 +405,12 @@
                           new Object[]{ new Integer(mainctr), new 
Integer(frameCS)}
                          );
        pp_events.setKingCS(frameCS);
+
+       if (interps.get("main") != null) {
+           ((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(MAIN_CS, 
+               ((Integer)interps.get("main")).intValue());
+       }
+       
 
 
        // cell to frame CS
Index: gzz/gzz/modules/pp/vob/CalendarBg.java
diff -u gzz/gzz/modules/pp/vob/CalendarBg.java:1.2 
gzz/gzz/modules/pp/vob/CalendarBg.java:1.3
--- gzz/gzz/modules/pp/vob/CalendarBg.java:1.2  Tue Nov  5 04:52:14 2002
+++ gzz/gzz/modules/pp/vob/CalendarBg.java      Wed Jan  8 02:06:05 2003
@@ -32,7 +32,7 @@
 import java.util.*;
 
 public class CalendarBg {
-public static final String rcsid = "$Id: CalendarBg.java,v 1.2 2002/11/05 
09:52:14 tjl Exp $";
+public static final String rcsid = "$Id: CalendarBg.java,v 1.3 2003/01/08 
07:06:05 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
     static gzz.vob.vobs.CalendarVob[] vobs = new gzz.vob.vobs.CalendarVob[14];
@@ -46,7 +46,7 @@
        gzz.vob.vobs.CalendarVob.setShifting(0.37f, 0.85f, 0.2f, 0.1f);
 
        for(int i=1; i<=12; i++) {
-           vobs[i] = new gzz.vob.vobs.CalendarVob(2002, i);
+           vobs[i] = new gzz.vob.vobs.CalendarVob(2003, i);
        }
 
     }