[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] libvob/org/nongnu/libvob AbstractUpdateManager....
From: |
Benja Fallenstein |
Subject: |
[Gzz-commits] libvob/org/nongnu/libvob AbstractUpdateManager.... |
Date: |
Mon, 17 Mar 2003 04:55:27 -0500 |
CVSROOT: /cvsroot/libvob
Module name: libvob
Changes by: Benja Fallenstein <address@hidden> 03/03/17 04:55:26
Modified files:
org/nongnu/libvob: AbstractUpdateManager.java
org/nongnu/libvob/impl: OrthoCoorder.java
org/nongnu/libvob/impl/awt: AWTScreen.java JUpdateManager.java
Log message:
forthport vital fixes for loom from gzz cvs
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/AbstractUpdateManager.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/impl/OrthoCoorder.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/awt/AWTScreen.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/awt/JUpdateManager.java.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.2
libvob/org/nongnu/libvob/AbstractUpdateManager.java:1.3
--- libvob/org/nongnu/libvob/AbstractUpdateManager.java:1.2 Fri Mar 7
06:38:19 2003
+++ libvob/org/nongnu/libvob/AbstractUpdateManager.java Mon Mar 17 04:55:26 2003
@@ -44,7 +44,7 @@
*/
public abstract class AbstractUpdateManager implements Runnable {
-public static final String rcsid = "$Id: AbstractUpdateManager.java,v 1.2
2003/03/07 11:38:19 tjl Exp $";
+public static final String rcsid = "$Id: AbstractUpdateManager.java,v 1.3
2003/03/17 09:55:26 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -65,7 +65,7 @@
/** The order of windows, from the most important to the least.
*/
- private ArrayList ordering = new ArrayList();
+ protected ArrayList ordering = new ArrayList();
/** Whether an update is currently in progress, through
* a window being painted.
Index: libvob/org/nongnu/libvob/impl/OrthoCoorder.java
diff -u libvob/org/nongnu/libvob/impl/OrthoCoorder.java:1.3
libvob/org/nongnu/libvob/impl/OrthoCoorder.java:1.4
--- libvob/org/nongnu/libvob/impl/OrthoCoorder.java:1.3 Mon Mar 10 08:29:31 2003
+++ libvob/org/nongnu/libvob/impl/OrthoCoorder.java Mon Mar 17 04:55:26 2003
@@ -35,7 +35,7 @@
*/
public class OrthoCoorder extends VobCoorder {
-public static final String rcsid = "$Id: OrthoCoorder.java,v 1.3 2003/03/10
13:29:31 humppake Exp $";
+public static final String rcsid = "$Id: OrthoCoorder.java,v 1.4 2003/03/17
09:55:26 benja Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.err.println(s); }
@@ -84,12 +84,7 @@
void setInfo(int cs, float xoffs, float yoffs,
float xscale, float yscale,
OrthoRenderInfo info) {
- wh[0] = 0; wh[1] = 0; wh[2] = 1; wh[3] = 1;
- sys.transformRect(cs, wh);
- info.setCoords(sys.depth[cs],
- xscale * sys.x[cs] + xoffs, yscale * sys.y[cs] + yoffs,
- xscale * sys.w[cs], yscale * sys.h[cs],
- 0, 0, xscale * wh[2], yscale * wh[3]);
+ setInterpInfo(cs, this, cs, 0, xoffs, yoffs, xscale, yscale, info);
}
public boolean contains(int cs, float px, float py, float[]
internalcoords) {
Index: libvob/org/nongnu/libvob/impl/awt/AWTScreen.java
diff -u libvob/org/nongnu/libvob/impl/awt/AWTScreen.java:1.3
libvob/org/nongnu/libvob/impl/awt/AWTScreen.java:1.4
--- libvob/org/nongnu/libvob/impl/awt/AWTScreen.java:1.3 Fri Mar 7
06:38:21 2003
+++ libvob/org/nongnu/libvob/impl/awt/AWTScreen.java Mon Mar 17 04:55:26 2003
@@ -30,7 +30,6 @@
import java.awt.*;
import java.awt.event.*;
-
import java.awt.image.PixelGrabber;
/** A single output window.
@@ -38,7 +37,7 @@
public abstract class AWTScreen
extends GraphicsAPI.AbstractWindow
implements MouseListener, MouseMotionListener,
JUpdateManager.EventProcessor {
- public static final String rcsid = "$Id: AWTScreen.java,v 1.3 2003/03/07
11:38:21 tjl Exp $";
+ public static final String rcsid = "$Id: AWTScreen.java,v 1.4 2003/03/17
09:55:26 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println(s); }
@@ -181,20 +180,27 @@
fract = 1-fract;
towardsOther = false;
}
- if(osc == null) osc = sc;
if(dbg) pa("Going to render: "+sc+" "+osc+" "+fract);
if(dbg) sc.dump();
- if(dbg) osc.dump();
+ if(dbg && osc!=null) osc.dump();
- if(sc != listprev || osc != listnext) {
+ if(osc != null && (sc != listprev || osc != listnext)) {
listprev = sc;
listnext = osc;
interplist = sc.matcher.interpList(osc.matcher,
towardsOther);
}
+ OrthoCoorder oc;
+ if(osc != null)
+ oc = (OrthoCoorder)osc.coords;
+ else {
+ oc = null;
+ interplist = null;
+ }
+
((OrthoCoorder)sc.coords).renderVobs((DefaultVobMap)sc.map,
- (OrthoCoorder)osc.coords,
+ oc,
interplist,
fract,
gr, fg
Index: libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java
diff -u libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java:1.2
libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java:1.3
--- libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java:1.2 Fri Mar 7
06:38:21 2003
+++ libvob/org/nongnu/libvob/impl/awt/JUpdateManager.java Mon Mar 17
04:55: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.2 2003/03/07
11:38:21 tjl Exp $";
+public static final String rcsid = "$Id: JUpdateManager.java,v 1.3 2003/03/17
09:55:26 benja 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); }
@@ -51,10 +51,11 @@
private static List eventList = new LinkedList();
public static void addEvent(EventProcessor proc, AWTEvent e) {
- synchronized(eventList) {
+ JUpdateManager m = (JUpdateManager)instance;
+ synchronized(m.ordering) {
eventList.add(proc);
eventList.add(e);
- eventList.notifyAll();
+ m.ordering.notifyAll();
if(dbg) pa("Queue "+e+"; listlen="+eventList.size());
}
}
@@ -89,7 +90,7 @@
got = true;
EventProcessor proc;
AWTEvent evt;
- synchronized(eventList) {
+ synchronized(ordering) {
proc = (EventProcessor)eventList.get(0);
evt = (AWTEvent)eventList.get(1);
eventList.remove(1);
@@ -105,16 +106,17 @@
protected boolean handleEvents(boolean waitForEvent) {
if(!waitForEvent)
return handleEvents_nohang();
- synchronized(eventList) {
- while(!handleEvents_nohang()) {
- try {
- p("JUpdateManager: going to wait for next event");
- eventList.wait();
- } catch(InterruptedException e) {
- pa("JUpdateManager: interrupted??");
- }
+ synchronized(ordering) {
+ if(handleEvents_nohang()) return true;
+ try {
+ p("JUpdateManager: going to wait for next event");
+ // We wait on 'ordering' since that is also
+ // what is notified by AbstractUpdateManager.chg()
+ ordering.wait();
+ } catch(InterruptedException e) {
+ pa("JUpdateManager: interrupted??");
}
+ return handleEvents_nohang();
}
- return true;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] libvob/org/nongnu/libvob AbstractUpdateManager....,
Benja Fallenstein <=