[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz gfx/gl/GLVobCoorder.java view/PageSpanC...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz/gzz gfx/gl/GLVobCoorder.java view/PageSpanC... |
Date: |
Thu, 06 Feb 2003 04:19:40 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 03/02/06 04:19:40
Modified files:
gzz/gfx/gl : GLVobCoorder.java
gzz/view : PageSpanCellView.java
gzz/view/buoy : buoymanager.py pagespanNodes.py
gzz/vob : VobCoorder.java
Log message:
Start getting mouse events
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobCoorder.java.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PageSpanCellView.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobCoorder.java.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
Patches:
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -u gzz/gzz/gfx/gl/GLVobCoorder.java:1.65
gzz/gzz/gfx/gl/GLVobCoorder.java:1.66
--- gzz/gzz/gfx/gl/GLVobCoorder.java:1.65 Wed Feb 5 13:47:40 2003
+++ gzz/gzz/gfx/gl/GLVobCoorder.java Thu Feb 6 04:19:37 2003
@@ -31,7 +31,7 @@
import gzz.client.gl.*;
public final class GLVobCoorder extends AffineVobCoorder {
-public static final String rcsid = "$Id: GLVobCoorder.java,v 1.65 2003/02/05
18:47:40 tjl Exp $";
+public static final String rcsid = "$Id: GLVobCoorder.java,v 1.66 2003/02/06
09:19:37 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -73,6 +73,9 @@
return -1;
}
+ /** Return true if there is not primary ancestor between
+ * cs and parent which is active.
+ */
private boolean isNearestActiveAncestor(int cs, int parent) {
cs = getParent(cs);
while(cs != -1) {
Index: gzz/gzz/view/PageSpanCellView.java
diff -u gzz/gzz/view/PageSpanCellView.java:1.12
gzz/gzz/view/PageSpanCellView.java:1.13
--- gzz/gzz/view/PageSpanCellView.java:1.12 Thu Feb 6 02:38:42 2003
+++ gzz/gzz/view/PageSpanCellView.java Thu Feb 6 04:19:40 2003
@@ -46,8 +46,8 @@
PageSpan[] pages;
PageSpanPaper[] psps;
float[] xywh;
- float w;
- float h;
+ public float w; // XXX Kludge to be public
+ public float h;
/** Allocate the structure to hold a given number of pages.
*/
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.6
gzz/gzz/view/buoy/buoymanager.py:1.7
--- gzz/gzz/view/buoy/buoymanager.py:1.6 Wed Feb 5 07:32:39 2003
+++ gzz/gzz/view/buoy/buoymanager.py Thu Feb 6 04:19:40 2003
@@ -42,6 +42,7 @@
main = vs.orthoBoxCS(center, "MAINVP", 0,
-100, -100, .2, .2, 1000, 1000)
+ self.vs.activate(main)
self.mainNode.renderMain(vs, self.nadir(main))
@@ -60,10 +61,17 @@
x+r, 300,
0.1)
self.vs.matcher.add(buoy, linkId)
- into = self.vs.orthoBoxCS(buoy, "V", 0, 0, 0, .5, .5, 1, 1)
+ into = self.vs.orthoBoxCS(buoy, "V", 0, 0, 0, .5, .5, 100, 100)
into = self.nadir(into)
- otherNode.renderBuoy(self.vs, into, linkId, otherAnchor)
+ self.vs.activate(into)
+ otherNode.renderBuoy(self.vs, into, linkId, otherAnchor, None)
def key(self, key):
gzz.client.AbstractUpdateManager.chg()
pass
+
+ def mouse(self, ev):
+ print ev
+ x, y = ev.getX(), ev.getY()
+ cs = self.vs.getCSAt(0, x, y, None)
+ print "IN CS: ",cs
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.13
gzz/gzz/view/buoy/pagespanNodes.py:1.14
--- gzz/gzz/view/buoy/pagespanNodes.py:1.13 Thu Feb 6 02:38:42 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py Thu Feb 6 04:19:40 2003
@@ -28,11 +28,20 @@
size = jarray.zeros(2, 'f')
class WholePageSpanNodeType(AbstractPageSpanNodeType):
- def renderBuoy(self, vs, into, linkId, anchorSpan):
+ def getSize(self, linkId, anchorSpan, wh):
sb = anchorSpan.getScrollBlock();
-
- pscv.place(makeEnf(sb.getCurrent()), vs, into,
- .5, 200);
+ layout = pscv.getLayout(sb)
+ wh[0] = layout.w
+ wh[1] = layout.h
+ return layout
+
+ def renderBuoy(self, vs, into, linkId, anchorSpan, layout):
+ if layout == None:
+ layout = pscv.getLayout(anchorSpan.getScrollBlock())
+ # For now, we'll just squish to fit
+ unit = vs.unitSqCS(into, "UNIT")
+ scaled = vs.scaleCS(unit, "SCALED", 1.0 / layout.w, 1.0 / layout.h)
+ layout.place(vs, scaled, .5, 200)
class AnchorPageSpanNodeType(AbstractPageSpanNodeType):
def renderBuoy(self, vs, into, linkId, anchorSpan):
Index: gzz/gzz/vob/VobCoorder.java
diff -u gzz/gzz/vob/VobCoorder.java:1.25 gzz/gzz/vob/VobCoorder.java:1.26
--- gzz/gzz/vob/VobCoorder.java:1.25 Fri Dec 6 07:08:28 2002
+++ gzz/gzz/vob/VobCoorder.java Thu Feb 6 04:19:40 2003
@@ -142,7 +142,8 @@
* getCSAt() is called.
*/
abstract public void activate(int CS);
- /** Get the topmost activated coordinate system which has parent as a
primary
+ /** Get the topmost activated coordinate system which
+ * has parent as a primary
* ancestor.
* This is defined as follows:
* <pre>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gzz gfx/gl/GLVobCoorder.java view/PageSpanC...,
Tuomas J. Lukka <=