[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./TODO gfx/demo/gldemo.py gzz/client/Abstra...
From: |
Benja Fallenstein |
Subject: |
[Gzz-commits] gzz ./TODO gfx/demo/gldemo.py gzz/client/Abstra... |
Date: |
Thu, 26 Sep 2002 07:54:07 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Benja Fallenstein <address@hidden> 02/09/26 07:54:07
Modified files:
. : TODO
gfx/demo : gldemo.py
gzz/client : AbstractBinder.java Binder.java Fallback.java
GraphicsAPI.java
gzz/client/awt : AWTAPI.java AWTScreen.java FrameScreen.java
gzz/client/gl : GLAPI.java GLScreen.java
gzz/modules/pp : Win.java
gzz/view : FallbackBinder.java
test/gzz/vob : TestVobScene.java
Log message:
Revert binder change
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/AbstractBinder.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Binder.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/GraphicsAPI.java.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTAPI.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTScreen.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/FrameScreen.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLAPI.java.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLScreen.java.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/Win.java.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/FallbackBinder.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/TestVobScene.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.145 gzz/TODO:1.146
*** gzz/TODO:1.145 Thu Sep 26 07:27:58 2002
--- gzz/TODO Thu Sep 26 07:54:07 2002
***************
*** 11,22 ****
0.8alpha2: Crucial demos for continued funding preliminary work - until 28th
( unlike the other releases, the things here are in priority order )
tuukkah:
! - unit tests for libcoords:
- a general test which tests that a CoordSys implementation
and its inverse match up (enabled for most coordsys).
- tests for the hierarchy working correctly
- a general test that transform() and performGL() do the same thing
! - implement DistortCoords::createInverse(). This is not easy, and
it IS allowable to use numeric approximation for root-finding.
Make sure you abstract this into libdistort properly
(inverse should be in the functions themselves)
--- 11,22 ----
0.8alpha2: Crucial demos for continued funding preliminary work - until 28th
( unlike the other releases, the things here are in priority order )
tuukkah:
! - unit tests for libcoords:
- a general test which tests that a CoordSys implementation
and its inverse match up (enabled for most coordsys).
- tests for the hierarchy working correctly
- a general test that transform() and performGL() do the same thing
! - implement DistortCoords::createInverse(). This is not easy, and
it IS allowable to use numeric approximation for root-finding.
Make sure you abstract this into libdistort properly
(inverse should be in the functions themselves)
***************
*** 27,33 ****
papertest.py and others.
Also avoids name clashes
benja:
- - undo Binder changes, putting stuff in Fallback, as discussed on IRC
- think with Tjl about the edit bindings for xupdf demo
- check with Tjl that saving works
- ZZ vanishingview cell size for pagespans and linebroken
--- 27,32 ----
***************
*** 46,52 ****
- demo using hierarchical rotations
- make paperquad use nonlinearity
+ fix coordsys to take an iterator, which does the lerping,
! so we can store parameters more naturally and also create
coordsys independently of the CoordSet stuff.
- move coordsys into their own header file, or at least
coords header file...
--- 45,51 ----
- demo using hierarchical rotations
- make paperquad use nonlinearity
+ fix coordsys to take an iterator, which does the lerping,
! so we can store parameters more naturally and also create
coordsys independently of the CoordSet stuff.
- move coordsys into their own header file, or at least
coords header file...
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.24 gzz/gfx/demo/gldemo.py:1.25
*** gzz/gfx/demo/gldemo.py:1.24 Wed Sep 25 07:32:10 2002
--- gzz/gfx/demo/gldemo.py Thu Sep 26 07:54:07 2002
***************
*** 214,220 ****
pass
class Bindings(AbstractBinder):
! def keystroke(self, s, win):
print "KEY: '%s'"%s
if s == "q" or s == "Q":
System.exit(43)
--- 214,220 ----
pass
class Bindings(AbstractBinder):
! def keystroke(self, s):
print "KEY: '%s'"%s
if s == "q" or s == "Q":
System.exit(43)
***************
*** 223,229 ****
elif not globalkey(s):
currentScene.key(s)
AbstractUpdateManager.chg()
! def mouse(self, e, win):
if hasattr(currentScene, "mouse"):
currentScene.mouse(e)
# print "MOUSE: '%s'"%e
--- 223,229 ----
elif not globalkey(s):
currentScene.key(s)
AbstractUpdateManager.chg()
! def mouse(self, e):
if hasattr(currentScene, "mouse"):
currentScene.mouse(e)
# print "MOUSE: '%s'"%e
Index: gzz/gzz/client/AbstractBinder.java
diff -c gzz/gzz/client/AbstractBinder.java:1.3
gzz/gzz/client/AbstractBinder.java:1.4
*** gzz/gzz/client/AbstractBinder.java:1.3 Wed Sep 25 08:27:59 2002
--- gzz/gzz/client/AbstractBinder.java Thu Sep 26 07:54:07 2002
***************
*** 36,41 ****
public void setScreen(Screen s) {
this.screen = s;
}
! public void mouse(MouseEvent e, Object window) { }
! public void windowClosed(Object window) { }
}
--- 36,41 ----
public void setScreen(Screen s) {
this.screen = s;
}
! public void mouse(MouseEvent e) { }
! public void windowClosed() { }
}
Index: gzz/gzz/client/Binder.java
diff -c gzz/gzz/client/Binder.java:1.9 gzz/gzz/client/Binder.java:1.10
*** gzz/gzz/client/Binder.java:1.9 Wed Sep 25 08:27:59 2002
--- gzz/gzz/client/Binder.java Thu Sep 26 07:54:07 2002
***************
*** 38,48 ****
/** A keystroke.
* @diagram screen
*/
! void keystroke(String s, Object window);
/** A mouse event.
* @diagram screen
*/
! void mouse(MouseEvent e, Object window);
/** Set the Screen this Binder is connected to. To be used
* only in Screen.Screen().
--- 38,48 ----
/** A keystroke.
* @diagram screen
*/
! void keystroke(String s);
/** A mouse event.
* @diagram screen
*/
! void mouse(MouseEvent e);
/** Set the Screen this Binder is connected to. To be used
* only in Screen.Screen().
***************
*** 53,61 ****
* expired.
*/
void timeout(Object id);
!
/** A window has been closed by the user.
*/
! void windowClosed(Object window);
}
--- 53,61 ----
* expired.
*/
void timeout(Object id);
!
/** A window has been closed by the user.
*/
! void windowClosed();
}
Index: gzz/gzz/client/Fallback.java
diff -c gzz/gzz/client/Fallback.java:1.36 gzz/gzz/client/Fallback.java:1.37
*** gzz/gzz/client/Fallback.java:1.36 Wed Sep 25 09:08:19 2002
--- gzz/gzz/client/Fallback.java Thu Sep 26 07:54:07 2002
***************
*** 72,78 ****
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
! public static final String rcsid = "$Id: Fallback.java,v 1.36 2002/09/25
13:08:19 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 72,78 ----
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
! public static final String rcsid = "$Id: Fallback.java,v 1.37 2002/09/26
11:54:07 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 122,128 ****
Set decorators;
! public class Win extends AbstractShower implements ViewContext {
public Cell cursor;
public int textCursor = -1;
public int[] dimsIndices = new int[4];
--- 122,128 ----
Set decorators;
! public class Win extends AbstractShower implements ViewContext, Binder {
public Cell cursor;
public int textCursor = -1;
public int[] dimsIndices = new int[4];
***************
*** 222,227 ****
--- 222,232 ----
if(viewIndex > viewList.length) viewIndex = 0;
return viewList[viewIndex];
}
+
+ public void keystroke(String s) { binder.keystroke(s, this); }
+ public void mouse(MouseEvent ev) {}
+ public void timeout(Object o) {}
+ public void windowClosed() { binder.windowClosed(this); }
Win(ColorScheme colors) {
for(int i=0; i<dimsIndices.length; i++)
***************
*** 232,239 ****
bg = colors.getBg();
AbstractUpdateManager.addWindow(new Screen(
! gfxapi.createWindow(this),
! binder,
this
));
this.screen.window.setLocation(0, 0, 300, 300);
--- 237,244 ----
bg = colors.getBg();
AbstractUpdateManager.addWindow(new Screen(
! gfxapi.createWindow(),
! this,
this
));
this.screen.window.setLocation(0, 0, 300, 300);
Index: gzz/gzz/client/GraphicsAPI.java
diff -c gzz/gzz/client/GraphicsAPI.java:1.19
gzz/gzz/client/GraphicsAPI.java:1.20
*** gzz/gzz/client/GraphicsAPI.java:1.19 Wed Sep 25 11:42:50 2002
--- gzz/gzz/client/GraphicsAPI.java Thu Sep 26 07:54:07 2002
***************
*** 65,75 ****
public abstract void startUpdateManager(Runnable r);
/** Create a new window.
- * @param repr The client-level object representing this window.
- * Passed to the binder when an event occurs.
*/
! public abstract Window createWindow(Object repr);
! public Window createWindow() { return createWindow(null); }
/** Obtain a text style object for an abstract font at a given
* size. The parameters are as
--- 65,72 ----
public abstract void startUpdateManager(Runnable r);
/** Create a new window.
*/
! public abstract Window createWindow();
/** Obtain a text style object for an abstract font at a given
* size. The parameters are as
***************
*** 124,137 ****
throw new UnsupportedOperationException("Not in this gfxapi");
}
! /** @param repr The object represented by this window (passed to binder)
! */
! public Window(GraphicsAPI api, Object repr) {
this.gfxapi = api;
- this.repr = repr;
}
private final GraphicsAPI gfxapi;
- protected final Object repr;
/** Get the GraphicsAPI this window is associated with.
*/
--- 121,130 ----
throw new UnsupportedOperationException("Not in this gfxapi");
}
! public Window(GraphicsAPI api) {
this.gfxapi = api;
}
private final GraphicsAPI gfxapi;
/** Get the GraphicsAPI this window is associated with.
*/
Index: gzz/gzz/client/awt/AWTAPI.java
diff -c gzz/gzz/client/awt/AWTAPI.java:1.11 gzz/gzz/client/awt/AWTAPI.java:1.12
*** gzz/gzz/client/awt/AWTAPI.java:1.11 Wed Sep 25 06:56:54 2002
--- gzz/gzz/client/awt/AWTAPI.java Thu Sep 26 07:54:07 2002
***************
*** 39,46 ****
public void startUpdateManager(Runnable r) {
JUpdateManager.startJUpdateManager(r);
}
! public Window createWindow(Object repr) {
! return new FrameScreen(this, repr);
}
public TextStyle getTextStyle(String family, int style, int size) {
return new RawTextStyle(new ScalableFont(family, style, size), null);
--- 39,46 ----
public void startUpdateManager(Runnable r) {
JUpdateManager.startJUpdateManager(r);
}
! public Window createWindow() {
! return new FrameScreen(this);
}
public TextStyle getTextStyle(String family, int style, int size) {
return new RawTextStyle(new ScalableFont(family, style, size), null);
Index: gzz/gzz/client/awt/AWTScreen.java
diff -c gzz/gzz/client/awt/AWTScreen.java:1.21
gzz/gzz/client/awt/AWTScreen.java:1.22
*** gzz/gzz/client/awt/AWTScreen.java:1.21 Wed Sep 25 10:45:43 2002
--- gzz/gzz/client/awt/AWTScreen.java Thu Sep 26 07:54:07 2002
***************
*** 34,40 ****
public abstract class AWTScreen
extends GraphicsAPI.Window
implements MouseListener, MouseMotionListener, Obs,
JUpdateManager.EventProcessor {
! public static final String rcsid = "$Id: AWTScreen.java,v 1.21 2002/09/25
14:45:43 tjl Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
--- 34,40 ----
public abstract class AWTScreen
extends GraphicsAPI.Window
implements MouseListener, MouseMotionListener, Obs,
JUpdateManager.EventProcessor {
! public static final String rcsid = "$Id: AWTScreen.java,v 1.22 2002/09/26
11:54:07 benja Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
***************
*** 78,85 ****
public Dimension getSize() { return canvas.getSize(); }
! public AWTScreen(GraphicsAPI api, Object repr) {
! super(api, repr);
canvas.addMouseListener(this);
canvas.addMouseMotionListener(this);
canvas.setVisible(true);
--- 78,85 ----
public Dimension getSize() { return canvas.getSize(); }
! public AWTScreen(GraphicsAPI api) {
! super(api);
canvas.addMouseListener(this);
canvas.addMouseMotionListener(this);
canvas.setVisible(true);
***************
*** 192,203 ****
KeyEvent ke = (KeyEvent)e;
String name = InputEventUtil.getKeyEventName(ke);
if(name != null && !name.equals("")) {
! binder.keystroke(name, repr);
}
} else if(e instanceof MouseEvent) {
MouseEvent me = (MouseEvent) e;
! binder.mouse(me, repr);
}
}
--- 192,203 ----
KeyEvent ke = (KeyEvent)e;
String name = InputEventUtil.getKeyEventName(ke);
if(name != null && !name.equals("")) {
! binder.keystroke(name);
}
} else if(e instanceof MouseEvent) {
MouseEvent me = (MouseEvent) e;
! binder.mouse(me);
}
}
Index: gzz/gzz/client/awt/FrameScreen.java
diff -c gzz/gzz/client/awt/FrameScreen.java:1.12
gzz/gzz/client/awt/FrameScreen.java:1.13
*** gzz/gzz/client/awt/FrameScreen.java:1.12 Wed Sep 25 09:00:57 2002
--- gzz/gzz/client/awt/FrameScreen.java Thu Sep 26 07:54:07 2002
***************
*** 29,43 ****
*/
public class FrameScreen extends AWTScreen {
! public static final String rcsid = "$Id: FrameScreen.java,v 1.12 2002/09/25
13:00:57 benja Exp $";
protected Frame zzFrame;
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.out.println(s); }
! public FrameScreen(GraphicsAPI api, Object repr) {
! super(api, repr);
zzFrame = new Frame("Gzz");
zzFrame.addComponentListener(new ComponentAdapter() {
public void componentMoved(ComponentEvent e) {
--- 29,43 ----
*/
public class FrameScreen extends AWTScreen {
! public static final String rcsid = "$Id: FrameScreen.java,v 1.13 2002/09/26
11:54:07 benja Exp $";
protected Frame zzFrame;
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
private static void pa(String s) { System.out.println(s); }
! public FrameScreen(GraphicsAPI api) {
! super(api);
zzFrame = new Frame("Gzz");
zzFrame.addComponentListener(new ComponentAdapter() {
public void componentMoved(ComponentEvent e) {
***************
*** 57,63 ****
zzFrame.dispose();
}
public void windowClosed(WindowEvent _) {
! binder.windowClosed(FrameScreen.this.repr);
}
public void windowOpened(WindowEvent _) {}
public void windowIconified(WindowEvent _) {}
--- 57,63 ----
zzFrame.dispose();
}
public void windowClosed(WindowEvent _) {
! binder.windowClosed();
}
public void windowOpened(WindowEvent _) {}
public void windowIconified(WindowEvent _) {}
Index: gzz/gzz/client/gl/GLAPI.java
diff -c gzz/gzz/client/gl/GLAPI.java:1.19 gzz/gzz/client/gl/GLAPI.java:1.20
*** gzz/gzz/client/gl/GLAPI.java:1.19 Wed Sep 25 06:56:54 2002
--- gzz/gzz/client/gl/GLAPI.java Thu Sep 26 07:54:07 2002
***************
*** 42,49 ****
}
});
}
! public Window createWindow(Object repr) {
! return new GLScreen(this, repr);
}
public TextStyle getTextStyle(String family, int style, int size) {
return gzz.vob.GLTextStyle.create(family, style, size);
--- 42,49 ----
}
});
}
! public Window createWindow() {
! return new GLScreen(this);
}
public TextStyle getTextStyle(String family, int style, int size) {
return gzz.vob.GLTextStyle.create(family, style, size);
Index: gzz/gzz/client/gl/GLScreen.java
diff -c gzz/gzz/client/gl/GLScreen.java:1.33
gzz/gzz/client/gl/GLScreen.java:1.34
*** gzz/gzz/client/gl/GLScreen.java:1.33 Thu Sep 26 07:19:12 2002
--- gzz/gzz/client/gl/GLScreen.java Thu Sep 26 07:54:07 2002
***************
*** 33,39 ****
import java.util.HashMap;
public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.33 2002/09/26
11:19:12 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 33,39 ----
import java.util.HashMap;
public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.34 2002/09/26
11:54:07 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 78,84 ****
if(s.startsWith("Ctrl-Shift-")) {
s = "Alt-" + s.substring("Ctrl-Shift-".length());
}
! binder.keystroke(s, repr);
}
boolean didDrag = false;
--- 78,84 ----
if(s.startsWith("Ctrl-Shift-")) {
s = "Alt-" + s.substring("Ctrl-Shift-".length());
}
! binder.keystroke(s);
}
boolean didDrag = false;
***************
*** 119,125 ****
1,
false);
if(what == RELEASE && !didDrag) {
! binder.mouse(ev, repr);
ev = new MouseEvent(fakeSource,
MouseEvent.MOUSE_CLICKED,
0,
--- 119,125 ----
1,
false);
if(what == RELEASE && !didDrag) {
! binder.mouse(ev);
ev = new MouseEvent(fakeSource,
MouseEvent.MOUSE_CLICKED,
0,
***************
*** 146,160 ****
return ;
}
if(dbg) pa("GLScreen mouseEvent: "+x+" "+y+" "+button+" ->
"+ev);
! binder.mouse(ev, repr);
}
public void timeout(int id) {
binder.timeout(timeouts.remove(new Integer(id)));
}
!
public void windowClosed() {
! binder.windowClosed(repr);
}
}
--- 146,160 ----
return ;
}
if(dbg) pa("GLScreen mouseEvent: "+x+" "+y+" "+button+" ->
"+ev);
! binder.mouse(ev);
}
public void timeout(int id) {
binder.timeout(timeouts.remove(new Integer(id)));
}
!
public void windowClosed() {
! binder.windowClosed();
}
}
***************
*** 203,210 ****
GLEventHandler h = new GLEventHandler();
! public GLScreen(GraphicsAPI api, Object repr) {
! super(api, repr);
if(dbg) pa("Create glscreen");
window = GL.createWindow(0, 0, 1200, 900, h);
// window = GL.createWindow(0, 0, 200, 200, h);
--- 203,210 ----
GLEventHandler h = new GLEventHandler();
! public GLScreen(GraphicsAPI api) {
! super(api);
if(dbg) pa("Create glscreen");
window = GL.createWindow(0, 0, 1200, 900, h);
// window = GL.createWindow(0, 0, 200, 200, h);
Index: gzz/gzz/modules/pp/Win.java
diff -c gzz/gzz/modules/pp/Win.java:1.51 gzz/gzz/modules/pp/Win.java:1.52
*** gzz/gzz/modules/pp/Win.java:1.51 Wed Sep 25 10:45:43 2002
--- gzz/gzz/modules/pp/Win.java Thu Sep 26 07:54:07 2002
***************
*** 36,42 ****
*/
public class Win extends AbstractBinder implements Shower {
! public static final String rcsid = "$Id: Win.java,v 1.51 2002/09/25 14:45:43
tjl Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
--- 36,42 ----
*/
public class Win extends AbstractBinder implements Shower {
! public static final String rcsid = "$Id: Win.java,v 1.52 2002/09/26 11:54:07
benja Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.err.println(s); }
***************
*** 97,103 ****
/** The dragged cell's original coordinates on paper.
*/
! private static int[] drag_origin;
/** The vobscene that's currently drawn into the window.
* (actually, the latest generated one).
--- 97,103 ----
/** The dragged cell's original coordinates on paper.
*/
! private static int[] drag_origin;
/** The vobscene that's currently drawn into the window.
* (actually, the latest generated one).
***************
*** 172,178 ****
throws RemoteException {
this.updateSpaceRun = updateSpaceRun;
AbstractUpdateManager.addWindow(new Screen(
! GraphicsAPI.getInstance().createWindow(this),
this,
this
));
--- 172,178 ----
throws RemoteException {
this.updateSpaceRun = updateSpaceRun;
AbstractUpdateManager.addWindow(new Screen(
! GraphicsAPI.getInstance().createWindow(),
this,
this
));
***************
*** 248,254 ****
}
// public void hardcodedMouse(MouseEvent me, VobScene vs, Cell wc)
! public void mouse(MouseEvent me, Object window) {
try {
p("PP client mouse "+me);
--- 248,254 ----
}
// public void hardcodedMouse(MouseEvent me, VobScene vs, Cell wc)
! public void mouse(MouseEvent me) {
try {
p("PP client mouse "+me);
***************
*** 336,342 ****
return n;
}
! public void keystroke(String key, Object window) {
try {
Cell c = cursor;
--- 336,342 ----
return n;
}
! public void keystroke(String key) {
try {
Cell c = cursor;
Index: gzz/gzz/view/FallbackBinder.java
diff -c gzz/gzz/view/FallbackBinder.java:1.15
gzz/gzz/view/FallbackBinder.java:1.16
*** gzz/gzz/view/FallbackBinder.java:1.15 Wed Sep 25 09:23:10 2002
--- gzz/gzz/view/FallbackBinder.java Thu Sep 26 07:54:07 2002
***************
*** 39,46 ****
/** Keybindings for the Fallback client.
*/
! public class FallbackBinder extends AbstractBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.15
2002/09/25 13:23:10 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 39,46 ----
/** Keybindings for the Fallback client.
*/
! public class FallbackBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.16
2002/09/26 11:54:07 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 463,471 ****
if(dbg) pa("deleting "+tmp+" now");
if(tmp != null) tmp.delete();
}
- }
-
- public void timeout(Object o) {
}
public void windowClosed(Object window0) {
--- 463,468 ----
Index: gzz/test/gzz/vob/TestVobScene.java
diff -c gzz/test/gzz/vob/TestVobScene.java:1.12
gzz/test/gzz/vob/TestVobScene.java:1.13
*** gzz/test/gzz/vob/TestVobScene.java:1.12 Wed Sep 25 10:45:43 2002
--- gzz/test/gzz/vob/TestVobScene.java Thu Sep 26 07:54:07 2002
***************
*** 29,35 ****
*/
abstract public class TestVobScene extends TestCase {
! String rcsid = "$Id: TestVobScene.java,v 1.12 2002/09/25 14:45:43 tjl Exp $";
static boolean dbg = false;
public TestVobScene(String s) { super(s); }
--- 29,35 ----
*/
abstract public class TestVobScene extends TestCase {
! String rcsid = "$Id: TestVobScene.java,v 1.13 2002/09/26 11:54:07 benja Exp
$";
static boolean dbg = false;
public TestVobScene(String s) { super(s); }
***************
*** 41,47 ****
abstract GraphicsAPI getGraphicsAPI() ;
public VobScene createVobScene() {
! return getGraphicsAPI().createWindow(null).createVobScene(new
Dimension(500,500));
}
--- 41,47 ----
abstract GraphicsAPI getGraphicsAPI() ;
public VobScene createVobScene() {
! return getGraphicsAPI().createWindow().createVobScene(new
Dimension(500,500));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./TODO gfx/demo/gldemo.py gzz/client/Abstra...,
Benja Fallenstein <=