[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz ./TODO gzz/client/AbstractBinder.java gzz/c...
|
From: |
Benja Fallenstein |
|
Subject: |
[Gzz-commits] gzz ./TODO gzz/client/AbstractBinder.java gzz/c... |
|
Date: |
Wed, 25 Sep 2002 06:56:56 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Benja Fallenstein <address@hidden> 02/09/25 06:56:54
Modified files:
. : TODO
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:
- &ref1 Some crude hack that allows getting the Fallback.Win object
in which a key event processed by FallbackBinder occurred
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.133&tr2=1.134&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/AbstractBinder.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Binder.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/GraphicsAPI.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTAPI.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/AWTScreen.java.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/awt/FrameScreen.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLAPI.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/gl/GLScreen.java.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/Win.java.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/FallbackBinder.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/TestVobScene.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.133 gzz/TODO:1.134
*** gzz/TODO:1.133 Wed Sep 25 06:44:23 2002
--- gzz/TODO Wed Sep 25 06:56:53 2002
***************
*** 17,24 ****
papertest.py and others.
Also avoids name clashes
benja:
- - &ref1 Some crude hack that allows getting the Fallback.Win object
- in which a key event processed by FallbackBinder occurred
- think with Tjl about the edit bindings for xupdf demo
- Ted's cursor spec [WAITING FOR *ref1, *ref2]
- check with Tjl that saving works
--- 17,22 ----
Index: gzz/gzz/client/AbstractBinder.java
diff -c gzz/gzz/client/AbstractBinder.java:1.1
gzz/gzz/client/AbstractBinder.java:1.2
*** gzz/gzz/client/AbstractBinder.java:1.1 Tue May 14 13:56:25 2002
--- gzz/gzz/client/AbstractBinder.java Wed Sep 25 06:56:54 2002
***************
*** 36,40 ****
public void setScreen(Screen s) {
this.screen = s;
}
! public void mouse(MouseEvent e) { }
}
--- 36,40 ----
public void setScreen(Screen s) {
this.screen = s;
}
! public void mouse(MouseEvent e, Object window) { }
}
Index: gzz/gzz/client/Binder.java
diff -c gzz/gzz/client/Binder.java:1.7 gzz/gzz/client/Binder.java:1.8
*** gzz/gzz/client/Binder.java:1.7 Mon Aug 5 05:57:28 2002
--- gzz/gzz/client/Binder.java Wed Sep 25 06:56:54 2002
***************
*** 38,55 ****
/** 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().
*/
void setScreen(Screen s) ;
! /** The timeout (set separately) with the given id
* expired.
*/
void timeout(Object id);
--- 38,55 ----
/** 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().
*/
void setScreen(Screen s) ;
! /** The timeout (set separately) with the given id
* expired.
*/
void timeout(Object id);
Index: gzz/gzz/client/Fallback.java
diff -c gzz/gzz/client/Fallback.java:1.34 gzz/gzz/client/Fallback.java:1.35
*** gzz/gzz/client/Fallback.java:1.34 Tue Sep 24 15:23:07 2002
--- gzz/gzz/client/Fallback.java Wed Sep 25 06:56:54 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.34 2002/09/24
19:23:07 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.35 2002/09/25
10:56:54 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 229,235 ****
bg = colors.getBg();
AbstractUpdateManager.addWindow(new Screen(
! gfxapi.createWindow(),
binder,
this
));
--- 229,235 ----
bg = colors.getBg();
AbstractUpdateManager.addWindow(new Screen(
! gfxapi.createWindow(this),
binder,
this
));
Index: gzz/gzz/client/GraphicsAPI.java
diff -c gzz/gzz/client/GraphicsAPI.java:1.17
gzz/gzz/client/GraphicsAPI.java:1.18
*** gzz/gzz/client/GraphicsAPI.java:1.17 Wed Sep 4 08:48:09 2002
--- gzz/gzz/client/GraphicsAPI.java Wed Sep 25 06:56:54 2002
***************
*** 49,55 ****
gfxapi = new gzz.client.awt.AWTAPI();
else if(cl.equals("gl"))
gfxapi = new gzz.client.gl.GLAPI();
! else
throw new Error("Invalid client type '"+cl+"': should be awt or
gl");
}
--- 49,55 ----
gfxapi = new gzz.client.awt.AWTAPI();
else if(cl.equals("gl"))
gfxapi = new gzz.client.gl.GLAPI();
! else
throw new Error("Invalid client type '"+cl+"': should be awt or
gl");
}
***************
*** 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
--- 65,74 ----
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);
/** Obtain a text style object for an abstract font at a given
* size. The parameters are as
***************
*** 100,106 ****
* size as size.
* This vobscene will <b>not</b> contain any instructions
* to clear the window etc., since vobscenes can be used as
! * viewports.
*/
public VobScene createVobScene() {
return createVobScene(getSize());
--- 102,108 ----
* size as size.
* This vobscene will <b>not</b> contain any instructions
* to clear the window etc., since vobscenes can be used as
! * viewports.
*/
public VobScene createVobScene() {
return createVobScene(getSize());
***************
*** 114,128 ****
*/
abstract public void registerBinder(Binder s);
! /** Add a timeout: Binder.timeout() is called after
* given number of milliseconds.
*/
public void addTimeout(int ms, Object o) {
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.
*/
--- 116,136 ----
*/
abstract public void registerBinder(Binder s);
! /** Add a timeout: Binder.timeout() is called after
* given number of milliseconds.
*/
public void addTimeout(int ms, Object o) {
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.
*/
Index: gzz/gzz/client/awt/AWTAPI.java
diff -c gzz/gzz/client/awt/AWTAPI.java:1.10 gzz/gzz/client/awt/AWTAPI.java:1.11
*** gzz/gzz/client/awt/AWTAPI.java:1.10 Thu Aug 29 05:41:16 2002
--- gzz/gzz/client/awt/AWTAPI.java Wed Sep 25 06:56:54 2002
***************
*** 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);
--- 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);
Index: gzz/gzz/client/awt/AWTScreen.java
diff -c gzz/gzz/client/awt/AWTScreen.java:1.19
gzz/gzz/client/awt/AWTScreen.java:1.20
*** gzz/gzz/client/awt/AWTScreen.java:1.19 Wed Sep 4 18:15:39 2002
--- gzz/gzz/client/awt/AWTScreen.java Wed Sep 25 06:56:54 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.19 2002/09/04
22:15:39 benja 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.20 2002/09/25
10:56:54 benja Exp $";
public static boolean dbg = false;
private static void p(String s) { if(dbg) pa(s); }
***************
*** 77,84 ****
public Dimension getSize() { return canvas.getSize(); }
! public AWTScreen(GraphicsAPI api) {
! super(api);
canvas.addMouseListener(this);
canvas.addMouseMotionListener(this);
canvas.setVisible(true);
--- 77,84 ----
public Dimension getSize() { return canvas.getSize(); }
! public AWTScreen(GraphicsAPI api, Object repr) {
! super(api, repr);
canvas.addMouseListener(this);
canvas.addMouseMotionListener(this);
canvas.setVisible(true);
***************
*** 181,192 ****
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);
}
}
--- 181,192 ----
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);
}
}
Index: gzz/gzz/client/awt/FrameScreen.java
diff -c gzz/gzz/client/awt/FrameScreen.java:1.10
gzz/gzz/client/awt/FrameScreen.java:1.11
*** gzz/gzz/client/awt/FrameScreen.java:1.10 Thu Aug 29 05:41:16 2002
--- gzz/gzz/client/awt/FrameScreen.java Wed Sep 25 06:56:54 2002
***************
*** 29,43 ****
*/
public class FrameScreen extends AWTScreen {
! public static final String rcsid = "$Id: FrameScreen.java,v 1.10 2002/08/29
09:41:16 tjl 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) {
--- 29,43 ----
*/
public class FrameScreen extends AWTScreen {
! public static final String rcsid = "$Id: FrameScreen.java,v 1.11 2002/09/25
10:56:54 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) {
Index: gzz/gzz/client/gl/GLAPI.java
diff -c gzz/gzz/client/gl/GLAPI.java:1.18 gzz/gzz/client/gl/GLAPI.java:1.19
*** gzz/gzz/client/gl/GLAPI.java:1.18 Mon Sep 23 04:24:25 2002
--- gzz/gzz/client/gl/GLAPI.java Wed Sep 25 06:56:54 2002
***************
*** 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);
--- 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);
Index: gzz/gzz/client/gl/GLScreen.java
diff -c gzz/gzz/client/gl/GLScreen.java:1.28
gzz/gzz/client/gl/GLScreen.java:1.29
*** gzz/gzz/client/gl/GLScreen.java:1.28 Mon Sep 23 04:24:25 2002
--- gzz/gzz/client/gl/GLScreen.java Wed Sep 25 06:56:54 2002
***************
*** 33,43 ****
import java.util.HashMap;
public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.28 2002/09/23
08:24:25 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
! java.awt.Canvas fakeSource = new java.awt.Canvas();
HashMap timeouts = new HashMap();
--- 33,43 ----
import java.util.HashMap;
public class GLScreen extends GraphicsAPI.Window {
! public static final String rcsid = "$Id: GLScreen.java,v 1.29 2002/09/25
10:56:54 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
! java.awt.Canvas fakeSource = new java.awt.Canvas();
HashMap timeouts = new HashMap();
***************
*** 75,81 ****
s = s.substring(0, s.length()-1) +
Character.toUpperCase(c);
}
! binder.keystroke(s);
}
boolean didDrag = false;
--- 75,81 ----
s = s.substring(0, s.length()-1) +
Character.toUpperCase(c);
}
! binder.keystroke(s, repr);
}
boolean didDrag = false;
***************
*** 116,122 ****
1,
false);
if(what == RELEASE && !didDrag) {
! binder.mouse(ev);
ev = new MouseEvent(fakeSource,
MouseEvent.MOUSE_CLICKED,
0,
--- 116,122 ----
1,
false);
if(what == RELEASE && !didDrag) {
! binder.mouse(ev, repr);
ev = new MouseEvent(fakeSource,
MouseEvent.MOUSE_CLICKED,
0,
***************
*** 143,149 ****
return ;
}
if(dbg) pa("GLScreen mouseEvent: "+x+" "+y+" "+button+" ->
"+ev);
! binder.mouse(ev);
}
public void timeout(int id) {
--- 143,149 ----
return ;
}
if(dbg) pa("GLScreen mouseEvent: "+x+" "+y+" "+button+" ->
"+ev);
! binder.mouse(ev, repr);
}
public void timeout(int id) {
***************
*** 154,160 ****
// XXX To be removed later
Vob clear ;
public Vob getBGClear() {
! if(clear == null)
clear = GLRen.createCallList(
"ClearColor 0.5 0.3 0.6 1.0\n"+
"Clear COLOR_BUFFER_BIT DEPTH_BUFFER_BIT\n"+
--- 154,160 ----
// XXX To be removed later
Vob clear ;
public Vob getBGClear() {
! if(clear == null)
clear = GLRen.createCallList(
"ClearColor 0.5 0.3 0.6 1.0\n"+
"Clear COLOR_BUFFER_BIT DEPTH_BUFFER_BIT\n"+
***************
*** 195,202 ****
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);
--- 195,202 ----
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);
Index: gzz/gzz/modules/pp/Win.java
diff -c gzz/gzz/modules/pp/Win.java:1.49 gzz/gzz/modules/pp/Win.java:1.50
*** gzz/gzz/modules/pp/Win.java:1.49 Wed Sep 4 18:15:39 2002
--- gzz/gzz/modules/pp/Win.java Wed Sep 25 06:56:54 2002
***************
*** 36,42 ****
*/
public class Win extends AbstractBinder implements Shower {
! public static final String rcsid = "$Id: Win.java,v 1.49 2002/09/04 22:15:39
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); }
--- 36,42 ----
*/
public class Win extends AbstractBinder implements Shower {
! public static final String rcsid = "$Id: Win.java,v 1.50 2002/09/25 10:56:54
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); }
***************
*** 172,178 ****
throws RemoteException {
this.updateSpaceRun = updateSpaceRun;
AbstractUpdateManager.addWindow(new Screen(
! GraphicsAPI.getInstance().createWindow(),
this,
this
));
--- 172,178 ----
throws RemoteException {
this.updateSpaceRun = updateSpaceRun;
AbstractUpdateManager.addWindow(new Screen(
! GraphicsAPI.getInstance().createWindow(this),
this,
this
));
***************
*** 248,254 ****
}
// public void hardcodedMouse(MouseEvent me, VobScene vs, Cell wc)
! public void mouse(MouseEvent me) {
try {
p("PP client mouse "+me);
--- 248,254 ----
}
// public void hardcodedMouse(MouseEvent me, VobScene vs, Cell wc)
! public void mouse(MouseEvent me, Object window) {
try {
p("PP client mouse "+me);
***************
*** 337,343 ****
return n;
}
! public void keystroke(String key) {
try {
Cell c = cursor;
--- 337,343 ----
return n;
}
! public void keystroke(String key, Object window) {
try {
Cell c = cursor;
Index: gzz/gzz/view/FallbackBinder.java
diff -c gzz/gzz/view/FallbackBinder.java:1.9
gzz/gzz/view/FallbackBinder.java:1.10
*** gzz/gzz/view/FallbackBinder.java:1.9 Tue Sep 24 15:23:07 2002
--- gzz/gzz/view/FallbackBinder.java Wed Sep 25 06:56:54 2002
***************
*** 40,46 ****
/** Keybindings for the Fallback client.
*/
public class FallbackBinder extends AbstractBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.9 2002/09/24
19:23:07 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 40,46 ----
/** Keybindings for the Fallback client.
*/
public class FallbackBinder extends AbstractBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.10
2002/09/25 10:56:54 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 123,129 ****
}
}
! public void keystroke(String k) {
if(dbg) pa("Key: "+k);
if(k.equals("\uFFFF")) {
--- 123,129 ----
}
}
! public void keystroke(String k, Object win) {
if(dbg) pa("Key: "+k);
if(k.equals("\uFFFF")) {
Index: gzz/test/gzz/vob/TestVobScene.java
diff -c gzz/test/gzz/vob/TestVobScene.java:1.10
gzz/test/gzz/vob/TestVobScene.java:1.11
*** gzz/test/gzz/vob/TestVobScene.java:1.10 Thu Aug 29 05:41:16 2002
--- gzz/test/gzz/vob/TestVobScene.java Wed Sep 25 06:56:54 2002
***************
*** 29,35 ****
*/
abstract public class TestVobScene extends TestCase {
! String rcsid = "$Id: TestVobScene.java,v 1.10 2002/08/29 09:41:16 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.11 2002/09/25 10:56:54 benja Exp
$";
static boolean dbg = false;
public TestVobScene(String s) { super(s); }
***************
*** 41,47 ****
abstract GraphicsAPI getGraphicsAPI() ;
public VobScene createVobScene() {
! return getGraphicsAPI().createWindow().createVobScene(new
Dimension(500,500));
}
--- 41,47 ----
abstract GraphicsAPI getGraphicsAPI() ;
public VobScene createVobScene() {
! return getGraphicsAPI().createWindow(null).createVobScene(new
Dimension(500,500));
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz ./TODO gzz/client/AbstractBinder.java gzz/c...,
Benja Fallenstein <=