-// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
+
package org.ibex.graphics;
import org.ibex.js.*;
* Platform subclasses should include an inner class subclass of
* Surface to return from the Platform._createSurface() method
*/
-public abstract class Surface extends PixelBuffer implements Task {
+public abstract class Surface implements Callable {
// Static Data ////////////////////////////////////////////////////////////////////////////////
- private static final JS T = JS.T;
- private static final JS F = JS.F;
+ private static final JS T = JSU.T;
+ private static final JS F = JSU.F;
/** all instances of Surface which need to be refreshed by the Scheduler */
public static Vec allSurfaces = new Vec();
// Methods to be overridden by subclasses ///////////////////////////////////////////////////////
+ public abstract PixelBuffer getPixelBuffer(); ///< returns a PixelBuffer representing this Surface
public abstract void toBack(); ///< should push surface to the back of the stacking order
public abstract void toFront(); ///< should pull surface to the front of the stacking order
public abstract void syncCursor(); ///< set the actual cursor to this.cursor if they do not match
if (button == 1) new Message("_Press1", T, root);
else if (button == 2) new Message("_Press2", T, root);
else if (button == 3) {
- Scheduler.add(new Task() { public void perform() throws JSExn {
+ Scheduler.add(new Callable() { public Object run(Object o) throws JSExn {
Platform.clipboardReadEnabled = true;
try {
- root.putAndTriggerTraps(JS.S("_Press3"), T);
+ root.putAndTriggerTraps(JSU.S("_Press3"), T);
} finally {
Platform.clipboardReadEnabled = false;
}
+ return null;
}});
}
}
}
}
- private final static JS MOVE = JS.S("_Move");
+ private final static JS MOVE = JSU.S("_Move");
/** we enqueue ourselves in the Scheduler when we have a Move message to deal with */
- private Task mover = new Task() {
- public void perform() {
- if (mousex == newmousex && mousey == newmousey) return;
+ private Callable mover = new Callable() {
+ public Object run(Object o) {
+ if (mousex == newmousex && mousey == newmousey) return null;
int oldmousex = mousex; mousex = newmousex;
int oldmousey = mousey; mousey = newmousey;
String oldcursor = cursor; cursor = "default";
if (oldmousex != mousex || oldmousey != mousey)
root.putAndTriggerTrapsAndCatchExceptions(MOVE, T);
if (!cursor.equals(oldcursor)) syncCursor();
+ return null;
} };
/**
Scheduler.add(mover);
}
- protected final void HScroll(int pixels) { new Message("_HScroll", JS.N(pixels), root); }
- protected final void VScroll(int pixels) { new Message("_VScroll", JS.N(pixels), root); }
- protected final void HScroll(float lines) { new Message("_HScroll", JS.N(lines), root); }
- protected final void VScroll(float lines) { new Message("_VScroll", JS.N(lines), root); }
+ protected final void HScroll(int pixels) { new Message("_HScroll", JSU.N(pixels), root); }
+ protected final void VScroll(int pixels) { new Message("_VScroll", JSU.N(pixels), root); }
+ protected final void HScroll(float lines) { new Message("_HScroll", JSU.N(lines), root); }
+ protected final void VScroll(float lines) { new Message("_VScroll", JSU.N(lines), root); }
/** subclasses should invoke this method when the user resizes the window */
protected final void SizeChange(final int width, final int height) {
// FEATURE: can we avoid creating objects here?
protected final void PosChange(final int x, final int y) {
- Scheduler.add(new Task() { public void perform() throws JSExn {
+ Scheduler.add(new Callable() { public Object run(Object o) throws JSExn {
root.x = x;
root.y = y;
- root.putAndTriggerTrapsAndCatchExceptions(JS.S("PosChange"), T);
+ root.putAndTriggerTrapsAndCatchExceptions(JSU.S("PosChange"), T);
+ return null;
}});
}
private final String[] doubleClick = new String[] { null, "_DoubleClick1", "_DoubleClick2", "_DoubleClick3" };
protected final void DoubleClick(int button) { new Message(doubleClick[button], T, root); }
- protected final void KeyPressed(String key) { new Message("_KeyPressed", JS.S(key), root); }
- protected final void KeyReleased(String key) { new Message("_KeyReleased", JS.S(key), root); }
+ protected final void KeyPressed(String key) { new Message("_KeyPressed", JSU.S(key), root); }
+ protected final void KeyReleased(String key) { new Message("_KeyReleased", JSU.S(key), root); }
protected final void Close() { new Message("Close", T, root); }
protected final void Minimized(boolean b) { minimized = b; new Message("Minimized", b ? T : F, root); }
protected final void Maximized(boolean b) { maximized = b; new Message("Maximized", b ? T : F, root); }
private boolean scheduled = false;
public void Refresh() { if (!scheduled) Scheduler.add(this); scheduled = true; }
- public void perform() { scheduled = false; Scheduler.renderAll(); }
+ public Object run(Object o) { scheduled = false; Scheduler.renderAll(); return null; }
public final void setMaximized(boolean b) { if (b != maximized) _setMaximized(maximized = b); }
public final void setMinimized(boolean b) { if (b != minimized) _setMinimized(minimized = b); }
setSize(rootwidth, rootheight);
/*String oldcursor = cursor;
cursor = "default";
- root.putAndTriggerTrapsAndCatchExceptions("_Move", JS.T);
+ root.putAndTriggerTrapsAndCatchExceptions("_Move", JSU.T);
if (!cursor.equals(oldcursor)) syncCursor();*/
} while(abort);
}
// FEATURE: reinstate recycler
- public class Message implements Task {
+ public class Message implements Callable {
private Box boxContainingMouse;
private JS value;
Scheduler.add(this);
}
- public void perform() throws JSExn {
+ public Object run(Object o) throws JSExn {
if (name.equals("_KeyPressed")) {
- String value = JS.toString(this.value);
+ String value = JSU.toString(this.value);
if (value.toLowerCase().endsWith("shift")) shift = true; else if (shift) value = value.toUpperCase();
if (value.toLowerCase().equals("alt")) alt = true; else if (alt) value = "A-" + value;
if (value.toLowerCase().endsWith("control")) control = true; else if (control) value = "C-" + value;
if (value.equals("C-v") || value.equals("A-v")) Platform.clipboardReadEnabled = true;
- this.value = JS.S(value);
+ this.value = JSU.S(value);
} else if (name.equals("_KeyReleased")) {
- String value = JS.toString(this.value);
+ String value = JSU.toString(this.value);
if (value.toLowerCase().equals("alt")) alt = false;
else if (value.toLowerCase().equals("control")) control = false;
else if (value.toLowerCase().equals("shift")) shift = false;
- this.value = JS.S(value);
+ this.value = JSU.S(value);
} else if (name.equals("_HScroll") || name.equals("_VScroll")) {
// FIXME: technically points != pixels
- if (JS.isInt(value))
- value = JS.N(JS.toInt(value) * root.fontSize());
+ if (JSU.isInt(value))
+ value = JSU.N(JSU.toInt(value) * root.fontSize());
}
try {
- boxContainingMouse.putAndTriggerTrapsAndCatchExceptions(JS.S(name), value);
+ boxContainingMouse.putAndTriggerTrapsAndCatchExceptions(JSU.S(name), value);
} finally {
Platform.clipboardReadEnabled = false;
}
+ return null;
}
- public String toString() { return "Message [name=" + name + ", value=" + JS.debugToString(value) + "]"; }
+ public String toString() { return "Message [name=" + name + ", value=" + JSU.str(value) + "]"; }
}