import org.ibex.js.*;
import org.ibex.util.*;
import org.ibex.plat.*;
-
-import org.ibex.core.*; // FIXME
+import org.ibex.core.*;
/**
* A Surface, as described in the Ibex Reference.
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 */
+ /** all instances of Surface which need to be refreshed by the Platform.Scheduler */
public static Vec allSurfaces = new Vec();
/** When set to true, render() should abort as soon as possible and restart the rendering process */
if (button == 1) new Message("_Press1", T, root);
else if (button == 2) new Message("_Press2", T, root);
else if (button == 3) {
- Scheduler.add(new Callable() { public Object run(Object o) throws JSExn {
+ Platform.Scheduler.add(new Callable() { public Object run(Object o) throws JSExn {
Platform.clipboardReadEnabled = true;
try {
root.putAndTriggerTraps(JSU.S("_Press3"), T);
}
private final static JS MOVE = JSU.S("_Move");
- /** we enqueue ourselves in the Scheduler when we have a Move message to deal with */
+ /** we enqueue ourselves in the Platform.Scheduler when we have a Move message to deal with */
private Callable mover = new Callable() {
public Object run(Object o) {
if (mousex == newmousex && mousey == newmousey) return null;
protected final void Move(final int newmousex, final int newmousey) {
this.newmousex = newmousex;
this.newmousey = newmousey;
- Scheduler.add(mover);
+ Platform.Scheduler.add(mover);
}
protected final void HScroll(int pixels) { new Message("_HScroll", JSU.N(pixels), root); }
pendingHeight = height;
syncRootBoxToSurface = true;
abort = true;
- Scheduler.renderAll();
+ Refresh();
}
// FEATURE: can we avoid creating objects here?
protected final void PosChange(final int x, final int y) {
- Scheduler.add(new Callable() { public Object run(Object o) throws JSExn {
- root.x = x;
- root.y = y;
+ Platform.Scheduler.add(new Callable() { public Object run(Object o) throws JSExn {
+ // FIXME
+ //root.x = x;
+ //root.y = y;
root.putAndTriggerTrapsAndCatchExceptions(JSU.S("PosChange"), T);
return null;
}});
protected final void Focused(boolean b) { new Message("Focused", b ? T : F, root); }
private boolean scheduled = false;
- public void Refresh() { if (!scheduled) Scheduler.add(this); scheduled = true; }
- public Object run(Object o) { scheduled = false; Scheduler.renderAll(); return null; }
+ public void Refresh() { if (!scheduled) Platform.Scheduler.add(this); scheduled = true; }
+ public Object run(Object o) { scheduled = false; Platform.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); }
// make sure the root is properly sized
do {
abort = false;
- root.pack();
if (syncRootBoxToSurface) {
root.setWidth(root.minwidth, pendingWidth);
root.setHeight(root.minheight, pendingHeight);
}
int rootwidth = root.test(root.HSHRINK) ? root.contentwidth : root.maxwidth;
int rootheight = root.test(root.VSHRINK) ? root.contentheight : root.maxheight;
- if (rootwidth != root.width || rootheight != root.height) {
+ if (rootwidth != root.getRootWidth() || rootheight != root.getRootHeight()) {
// dirty the place where the scar used to be and where it is now
- dirty(0, root.height - scarImage.height, scarImage.width, scarImage.height);
+ dirty(0, root.getRootHeight() - scarImage.height, scarImage.width, scarImage.height);
dirty(0, rootheight - scarImage.height, scarImage.width, scarImage.height);
}
root.reflow();
} while(abort);
int[][] dirt = dirtyRegions.flush();
+ /*
for(int i = 0; dirt != null && i < dirt.length; i++) {
if (dirt[i] == null) continue;
int x = dirt[i][0], y = dirt[i][1], w = dirt[i][2], h = dirt[i][3];
if (x < 0) x = 0;
if (y < 0) y = 0;
- if (x+w > root.width) w = root.width - x;
- if (y+h > root.height) h = root.height - y;
+ if (x+w > root.getRootWidth()) w = root.getRootWidth() - x;
+ if (y+h > root.getRootHeight()) h = root.getRootHeight() - y;
if (w <= 0 || h <= 0) continue;
+ */
+ // FIXME: set clip to -- x, y, x + w, y + h,
- root.render(0, 0, x, y, x + w, y + h, this.getPixelBuffer(), identity);
- getPixelBuffer().drawPicture(scarImage, 0, root.height - scarImage.height, x, y, x+w, y+h);
+ root.render(this.getPixelBuffer(), identity, null);
+
+ //try { Thread.sleep(500); } catch (Exception e) { }
+ /*
+ //getPixelBuffer().drawPicture(scarImage, 0, root.getRootHeight() - scarImage.height, x, y, x+w, y+h);
if (abort) {
// x,y,w,h is only partially reconstructed, so we must be careful not to re-blit it
return;
}
}
+ */
unrendered = false;
}
this.boxContainingMouse = boxContainingMouse;
this.name = name;
this.value = value;
- Scheduler.add(this);
+ Platform.Scheduler.add(this);
}
public Object run(Object o) throws JSExn {
DirtyList screenDirtyRegions = new DirtyList();
public PixelBuffer getPixelBuffer() { return this; }
+ public void fillTriangle(int x1, int y1, int x2, int y2, int x3, int y3, int argb) {
+ backbuffer.fillTriangle(x1, y1, x2, y2, x3, y3, argb);
+ }
+ public void drawPicture(Picture p, Affine a, Mesh h) {
+ throw new Error("drawPicture() not implemented");
+ }
+ public void drawGlyph(Font.Glyph source,Affine a,Mesh h,int rgb,int bg) {
+ //screenDirtyRegions.dirty(cx1, cy1, cx2 - cx1, cy2 - cy1);
+ backbuffer.drawGlyph(source, a, h, rgb, bg);
+ }
+ /*
public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
screenDirtyRegions.dirty(cx1, cy1, cx2 - cx1, cy2 - cy1);
backbuffer.drawPicture(source, dx, dy, cx1, cy1, cx2, cy2);
}
public void drawGlyph(Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int argb, int bc) {
- screenDirtyRegions.dirty(cx1, cy1, cx2 - cx1, cy2 - cy1);
- backbuffer.drawGlyph(source, dx, dy, cx1, cy1, cx2, cy2, argb, bc);
}
-
- public void stroke(Polygon p, int color) {
+ */
+ public void stroke(Mesh p, int color) {
// FIXME
}
- public void fill(Polygon p, Paint paint) {
+ public void fill(Mesh p, Paint paint) {
// FIXME
}
screenDirtyRegions.dirty(x1, y1, x2, y2);
backbuffer.drawLine(x1, y1, x2, y2, color);
}
-
+ /*
public abstract void _fillTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int color);
public void fillTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int color) {
// we don't dirty trapezoid-fills since it's faster to just do them directly than to copy from the backbuffer
backbuffer.fillTrapezoid(x1, x2, y1, x3, x4, y2, color);
//_fillTrapezoid(x1, x2, y1, x3, x4, y2, color);
}
-
+ */
public void render() {
super.render();
if (abort) return;
+ /*
int[][] dirt = screenDirtyRegions.flush();
for(int i = 0; dirt != null && i < dirt.length; i++) {
if (dirt[i] == null) continue;
int h = dirt[i][3];
if (x < 0) x = 0;
if (y < 0) y = 0;
- if (x+w > root.width) w = root.width - x;
- if (y+h > root.height) h = root.height - y;
+ if (x+w > root.getRootWidth()) w = root.getRootWidth() - x;
+ if (y+h > root.getRootHeight()) h = root.getRootHeight() - y;
if (w <= 0 || h <= 0) continue;
if (abort) return;
blit(backbuffer, x, y, x, y, w + x, h + y);
}
+ */
+ System.out.println("blit");
+ blit(backbuffer, 0, 0, 0, 0, root.getRootWidth(), root.getRootHeight());
}
// This is how subclasses signal a 'shallow dirty', indicating that although the backbuffer is valid, the screen is not
public final void Dirty(int x, int y, int w, int h) {
- screenDirtyRegions.dirty(x, y, w, h);
- Scheduler.renderAll();
+ //screenDirtyRegions.dirty(x, y, w, h);
+ //Refresh();
+ blit(x,y,w,h);
}
public void dirty(int x, int y, int w, int h) {