[Gzz-commits] libvob org/nongnu/libvob/AbstractUpdateManager....

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/09 10:09:26

Modified files:
        org/nongnu/libvob: AbstractUpdateManager.java 
        org/nongnu/libvob/demo: fpfont.py 
        org/nongnu/libvob/impl/awt: JUpdateManager.java 
        org/nongnu/libvob/impl/gl: GLUpdateManager.java 
        org/nongnu/libvob/util: PS2Reader.java 
        src/os         : Os-GLX.cxx 

Log message:
        Lego controller WORKS\!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/AbstractUpdateManager.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/demo/fpfont.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/util/PS2Reader.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/os/Os-GLX.cxx.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/AbstractUpdateManager.java
diff -u libvob/org/nongnu/libvob/AbstractUpdateManager.java:1.3 
libvob/org/nongnu/libvob/AbstractUpdateManager.java:1.4
--- libvob/org/nongnu/libvob/AbstractUpdateManager.java:1.3     Mon Mar 17 
04:55:26 2003
+++ libvob/org/nongnu/libvob/AbstractUpdateManager.java Wed Apr  9 10:09:25 2003
@@ -44,7 +44,7 @@
  */
 
 public abstract class AbstractUpdateManager implements Runnable {
-public static final String rcsid = "$Id: AbstractUpdateManager.java,v 1.3 
2003/03/17 09:55:26 benja Exp $";
+public static final String rcsid = "$Id: AbstractUpdateManager.java,v 1.4 
2003/04/09 14:09:25 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -220,8 +220,10 @@
        if(restartUpd) return;
        if(dbg) pa("UPDMANAGER CHG - NORESTARTUPD");
        synchronized(ordering) {
+           if(dbg) pa("UPDMANAGER CHG - IN SYNCHRONIZED");
            restartUpd = true;
            ordering.notifyAll();
+           if(dbg) pa("UPDMANAGER CHG - NOTIFIED");
            interruptEventloop();
        }
        
@@ -361,7 +363,7 @@
        instance.interruptEventloop();
     }
 
-    protected void interruptEventloop() { }
+    abstract protected void interruptEventloop() ;
 
     /** Do the background tasks that need to be done in 
      * the main thread.
Index: libvob/org/nongnu/libvob/demo/fpfont.py
diff -u libvob/org/nongnu/libvob/demo/fpfont.py:1.14 
libvob/org/nongnu/libvob/demo/fpfont.py:1.15
--- libvob/org/nongnu/libvob/demo/fpfont.py:1.14        Wed Apr  9 09:03:27 2003
+++ libvob/org/nongnu/libvob/demo/fpfont.py     Wed Apr  9 10:09:25 2003
@@ -15,6 +15,9 @@
     font2 = GL.createFont(None, 64)
     vob.putil.demowindow.font = font
     vob.putil.demowindow.font2 = font2
+
+    vob.putil.demowindow.mouser = vob.util.PS2Reader("/dev/input/mouse0")
+
     fonttexs = []
 
     fn = jarray.zeros(10*10, 'b')
@@ -352,9 +355,11 @@
 """
 words = loremipsum.split(" ")
 
+vob.AbstractUpdateManager.dbg = 1
+vob.impl.gl.GLUpdateManager.dbg = 1
 
 t = 0
-class Scene:
+class Scene(vob.util.PS2Reader.Listener):
     def __init__(self):
        self.prognum_dummylist = [ 0 for x in fp ]
        self.key = KeyPresses(
@@ -365,6 +370,9 @@
            ListIndex("prognum", "prognum_dummylist", 0, "prog type", "T", "t"),
            Action("Create dist texture", "d", self.makeDist),
            )
+       self.mouser = vob.putil.demowindow.mouser
+       self.mouser.setListener(self)
+       self.mouser.start()
 
     def makeDist(self, foo, foo2):
        vs = vob.putil.demowindow.w.createVobScene()
@@ -392,6 +400,7 @@
        vob.putil.demowindow.w.renderStill(vs, 0)
 
     def scene(self, vs):
+       print "GLUP DBG: ",vob.impl.gl.GLUpdateManager.dbg
        putnoc(vs, background((1,1,1)))
 
        fpid =  fp[self.prognum].getProgId()
@@ -425,6 +434,9 @@
 
         cs = vs.orthoCS(0, "a", 0, self.x, self.y, 1, 1)
 
+       print "x,y:", self.mouser.x, self.mouser.y
+        cs = vs.orthoCS(cs, "a", 0, self.mouser.x, self.mouser.y, 1, 1)
+
        cs = vs.rotateCS(cs, "b", self.a)
 
        if self.prognum == 0:
@@ -441,4 +453,8 @@
         
         putnoc(vs, getDListNocoords("PopAttrib"))
 
+    def chg(*args):
+       print "chg ",args
+       AbstractUpdateManager.setNoAnimation()
+       AbstractUpdateManager.chg()
 
Index: libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java
diff -u libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java:1.3 
libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java:1.4
--- libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java:1.3   Mon Mar 17 
04:55:26 2003
+++ libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java       Wed Apr  9 
10:09:26 2003
@@ -33,7 +33,7 @@
 import java.awt.image.*;
 
 public class JUpdateManager extends AbstractUpdateManager {
-public static final String rcsid = "$Id: JUpdateManager.java,v 1.3 2003/03/17 
09:55:26 benja Exp $";
+public static final String rcsid = "$Id: JUpdateManager.java,v 1.4 2003/04/09 
14:09:26 tjl Exp $";
     private static boolean dbg = false;
     private static void p(String s) { if(dbg) pa(s); }
     private static void pa(String s) { System.err.println(s); }
@@ -119,4 +119,6 @@
            return handleEvents_nohang();
        }
     }
+
+    protected void interruptEventloop()  { }
 }
Index: libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java
diff -u libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java:1.2 
libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java:1.3
--- libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java:1.2   Fri Mar  7 
06:38:22 2003
+++ libvob/org/nongnu/libvob/impl/gl/GLUpdateManager.java       Wed Apr  9 
10:09:26 2003
@@ -36,10 +36,9 @@
 
 
 public class GLUpdateManager extends AbstractUpdateManager {
-public static final String rcsid = "$Id: GLUpdateManager.java,v 1.2 2003/03/07 
11:38:22 tjl Exp $";
-    private static boolean dbg = false;
-    private static void p(String s) { if(dbg) pa(s); }
-    private static void pa(String s) { System.err.println(s); }
+public static final String rcsid = "$Id: GLUpdateManager.java,v 1.3 2003/04/09 
14:09:26 tjl Exp $";
+    public static boolean dbg = false;
+    private static void pa(String s) { System.out.println(s); }
 
     // can be switched from jython..
     public static boolean demoMode = false;
@@ -52,12 +51,12 @@
 
     private Thread t = new Thread(this);
     {
-       p("STARTGLTHREAD");
+       if(dbg) pa("STARTGLTHREAD");
        t.start();
     }
 
     protected boolean handleEvents(boolean waitForEvent) {
-       p("HandleEvents "+waitForEvent);
+       if(dbg) pa("HandleEvents "+waitForEvent);
        GL.eventLoop(waitForEvent);
        return true;
     }
@@ -76,6 +75,7 @@
     private int freeMemoryCountdown = 50;
 
     protected boolean doIdle() {
+       if(dbg) pa("GLUpdatemanager doIdle");
        if(demoMode) {
             processEvent(
                 new ActionEvent(this, ActionEvent.ACTION_LAST, "DEMO_EVENT"));
@@ -93,6 +93,8 @@
     }
 
     protected void interruptEventloop() {
+       if(dbg) pa("GLUpdatemanager interrupt eventloop");
        GL.interruptEventloop();
+       if(dbg) pa("GLUpdatemanager interrupt done");
     }
 }
Index: libvob/org/nongnu/libvob/util/PS2Reader.java
diff -u libvob/org/nongnu/libvob/util/PS2Reader.java:1.2 
libvob/org/nongnu/libvob/util/PS2Reader.java:1.3
--- libvob/org/nongnu/libvob/util/PS2Reader.java:1.2    Wed Apr  9 09:03:27 2003
+++ libvob/org/nongnu/libvob/util/PS2Reader.java        Wed Apr  9 10:09:26 2003
@@ -14,6 +14,10 @@
     private RandomAccessFile in;
     private Listener chg;
 
+    public void setListener(Listener chg) {
+       this.chg = chg;
+    }
+
     static final byte[] imps2 = new byte[] {
        (byte)0xf3, (byte)0xc8, (byte)0xf3, (byte)0x64, (byte)0xf3, (byte)0x50
     };
@@ -29,6 +33,23 @@
     public boolean b1;
     public boolean b2;
     public boolean b3;
+
+    Thread t;
+
+    public void start() {
+       if(t != null) return;
+       t = new Thread(new Runnable() {
+           public void run() {
+               while(true) {
+                   try {
+                       PS2Reader.this.read();
+                   } catch(Exception e) {
+                   }
+               }
+           }
+       });
+       t.start();
+    }
 
     private byte[] buf = new byte[4];
     private void read() throws IOException {
Index: libvob/src/os/Os-GLX.cxx
diff -u libvob/src/os/Os-GLX.cxx:1.2 libvob/src/os/Os-GLX.cxx:1.3
--- libvob/src/os/Os-GLX.cxx:1.2        Fri Feb 28 08:56:08 2003
+++ libvob/src/os/Os-GLX.cxx    Wed Apr  9 10:09:26 2003
@@ -42,6 +42,7 @@
 #include <X11/keysym.h>
 
 #include <vob/os/Os.hxx>
+#include <vob/Debug.hxx>
 
 
 
@@ -50,12 +51,11 @@
 #define BARF(m) { cerr << m << "\n"; exit(18); }
 
 
-#define DBG(cname) if(!cname);else (std::cout << "CallGL: ")
 
 namespace Vob {
 namespace Os {
 
-    bool dbg;
+    DBGVAR(dbg, "Os");
 
     using std::cerr;
     using std::cout;
@@ -684,8 +684,10 @@
                DBG(dbg) << "Emptying interrupt pipe\n";
                while(read(interruptPipe[0], &b, 4) > 0) {
                    DBG(dbg) << "Got "<<b[0]<<" "<<b[1]<<" "<<b[2]<< " 
"<<b[3]<<"\n";
+                   wait = false;
                }
                DBG(dbg) << "Empty\n";
+               continue;
            }