[Gzz-commits] fenfire ./up.sh org/fenfire/modules/pp/Pp.java

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/23 13:04:06

Modified files:
        .              : up.sh 
        org/fenfire/modules/pp: Pp.java 

Log message:
        get off from workarounds

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/up.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.29 
fenfire/org/fenfire/modules/pp/Pp.java:1.30
--- fenfire/org/fenfire/modules/pp/Pp.java:1.29 Wed Apr 23 10:40:50 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Wed Apr 23 13:04:06 2003
@@ -28,7 +28,7 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.29 2003/04/23 14:40:50 
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.30 2003/04/23 17:04:06 
mudyc Exp $";
     public static final boolean dbg = false;
     protected static void p(String s) { if(dbg) pa(s); }
     protected static void pa(String s) { System.out.println("Pp::"+s); }
@@ -227,16 +227,10 @@
        ctrY = ((float)vs.size.height)/2;
 
        int frameCS;
-       if (GraphicsAPI.getInstance() instanceof GLAPI) {
-           int focusCtr = vs.translateCS(0, "FocusCenter", ctrX,ctrY);
-           frameCS = vs.orthoBoxCS(focusCtr, "FocusFrame", 200, 
-                                   -width/2, -height/2, 1, 1, 
-                                   width, height);
-       } else {
-           frameCS = vs.orthoBoxCS(0, "FocusFrame", 200, 
-                                   ctrX - width/2, ctrY - height/2, 1, 1, 
-                                   width, height);
-       }
+       int focusCtr = vs.translateCS(0, "FocusCenter", ctrX,ctrY, 200);
+       frameCS = vs.orthoBoxCS(focusCtr, "FocusFrame", 0, 
+                               -width/2, -height/2, 1, 1, 
+                               width, height);
        vs.activate(frameCS);
 
        if (focus == null)
Index: fenfire/up.sh
diff -u fenfire/up.sh:1.6 fenfire/up.sh:1.7
--- fenfire/up.sh:1.6   Wed Apr 23 11:05:11 2003
+++ fenfire/up.sh       Wed Apr 23 13:04:06 2003
@@ -2,8 +2,8 @@
 # associated with fenfire project.
 
 # ASSUMES: .. directory to contain the parts of our project.
-D=`pwd`
-DIR=$D/../
+#D=`pwd`
+#DIR=$D/../
 
 # cvs update
 #cd $DIR
@@ -29,10 +29,9 @@
 loom \
 manuscripts \
 ; do
-  echo $DIR/$dir
-  if [ -d "$DIR/$dir" ]; then
+  if [ -d "../$dir" ]; then
       echo $dir
-      (cd $DIR/$dir && cvs -z3 update -dP &)
+      (cd ../$dir && cvs -z3 update -dP &)
       sleep 1
   fi
 done