*
* Note that the members in the section 'state variables' are either
* in real-time (the actual size/position/state), or in
- * MessageQueue-time (the size/position/state at the time that the
+ * Scheduler-time (the size/position/state at the time that the
* now-executing message was enqueued). This distinction is important.
*/
-// FIXME: put the scar box back in
public abstract class Surface extends PixelBuffer {
public int getWidth() { return root == null ? 0 : root.width; }
// Static Data ////////////////////////////////////////////////////////////////////////////////
/**< the most recently enqueued Move message; used to throttle the message rate */
- private static Message lastMoveMessage = null;
+ private static Scheduler.Task lastMoveMessage = null;
- /** all instances of Surface which need to be refreshed by the MessageQueue */
+ /** all instances of Surface which need to be refreshed by the Scheduler */
public static Vec allSurfaces = new Vec();
/** When set to true, render() should abort as soon as possible and restart the rendering process */
public static boolean alt = false; ///< true iff the alt button is pressed down, in real time
public static boolean control = false; ///< true iff the control button is pressed down, in real time
public static boolean shift = false; ///< true iff the shift button is pressed down, in real time
- public static boolean button1 = false; ///< true iff button 1 is depressed, in MessageQueue-time
- public static boolean button2 = false; ///< true iff button 2 is depressed, in MessageQueue-time
- public static boolean button3 = false; ///< true iff button 3 is depressed, in MessageQueue-time
+ public static boolean button1 = false; ///< true iff button 1 is depressed, in Scheduler-time
+ public static boolean button2 = false; ///< true iff button 2 is depressed, in Scheduler-time
+ public static boolean button3 = false; ///< true iff button 3 is depressed, in Scheduler-time
public Box root; /**< The Box at the root of this surface */
public String cursor = "default";
- public int mousex; ///< the x position of the mouse, relative to this Surface, in MessageQueue-time
- public int mousey; ///< the y position of the mouse, relative to this Surface, in MessageQueue-time
+ public int mousex; ///< the x position of the mouse, relative to this Surface, in Scheduler-time
+ public int mousey; ///< the y position of the mouse, relative to this Surface, in Scheduler-time
public boolean minimized = false; ///< True iff this surface is minimized, in real time
public boolean maximized = false; ///< True iff this surface is maximized, in real time
public abstract void setInvisible(boolean b); ///< If <tt>b</tt>, make window invisible; otherwise, make it non-invisible.
protected abstract void _setMaximized(boolean b); ///< If <tt>b</tt>, maximize the surface; otherwise, un-maximize it.
protected abstract void _setMinimized(boolean b); ///< If <tt>b</tt>, minimize the surface; otherwise, un-minimize it.
- protected abstract void setSize(int width, int height); ///< Sets the surface's width and height.
public abstract void setLocation(); ///< Set the surface's x/y position to that of the root box
public abstract void setTitleBarText(String s); ///< Sets the surface's title bar text, if applicable
public abstract void setIcon(Picture i); ///< Sets the surface's title bar text, if applicable
public abstract void _dispose(); ///< Destroy the surface
public void setLimits(int min_width, int min_height, int max_width, int max_height) { }
+ protected abstract void _setSize(int width, int height); ///< Sets the surface's width and height.
+ private int platform_window_width = 0;
+ private int platform_window_height = 0;
+ protected final void setSize(int width, int height) {
+ if (root.width != width || root.height != height) {
+ root.dirty(0, root.height - Main.scarImage.getHeight(), Main.scarImage.getWidth(), Main.scarImage.getHeight());
+ root.width = Math.max(Main.scarImage.getWidth(), width);
+ root.height = Math.max(Main.scarImage.getHeight(), height);
+ }
+ if (root.width > 0 && root.height > 0 && platform_window_width != root.width && platform_window_height != root.height)
+ _setSize(root.width, root.height);
+ }
+
// Helper methods for subclasses ////////////////////////////////////////////////////////////
protected final void Press(final int button) {
else if (button == 2) new SimpleMessage("Press2", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
else if (button == 3) {
final Box who = Box.whoIs(root, mousex, mousey);
- Message.Q.add(new Message() { public void perform() {
+ Scheduler.add(new Scheduler.Task() { public void perform() {
Platform.clipboardReadEnabled = true;
- root.put("Press3", Boolean.TRUE);
+ root.putAndTriggerJSTraps("Press3", Boolean.TRUE);
Platform.clipboardReadEnabled = false;
}});
}
else if (button == 3) new SimpleMessage("DoubleClick3", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
}
- /** sends a KeyPressed message; subclasses should not add the C- or A- prefixes, nor should they capitalize alphabet characters */
+ /** Sends a KeyPressed message; subclasses should not add the C- or A- prefixes,
+ * nor should they capitalize alphabet characters
+ */
protected final void KeyPressed(String key) {
if (key == null) return;
else if (control) key = "C-" + key;
final String fkey = key;
- Message.Q.add(new KMessage(key));
+ Scheduler.add(new KMessage(key));
}
// This is implemented as a private static class instead of an anonymous class to work around a GCJ bug
- private class KMessage implements Message {
+ private class KMessage extends Scheduler.Task {
String key = null;
public KMessage(String k) { key = k; }
public void perform() {
if (key.equals("C-v") || key.equals("A-v")) Platform.clipboardReadEnabled = true;
- /* FIXME
outer: for(int i=0; i<keywatchers.size(); i++) {
Box b = (Box)keywatchers.elementAt(i);
- for(Box cur = b; cur != null; cur = cur.getParent())
- if ((cur.flags & cur.INVISIBLE_FLAG) != 0) continue outer;
- b.put("KeyPressed", key);
+ for(Box cur = b; cur != null; cur = cur.parent)
+ if (!cur.test(cur.VISIBLE)) continue outer;
+ b.putAndTriggerJSTraps("KeyPressed", key);
}
- */
Platform.clipboardReadEnabled = false;
}
}
- /** sends a KeyReleased message; subclasses should not add the C- or A- prefixes, nor should they capitalize alphabet characters */
+ Vec keywatchers = new Vec();
+
+ /** sends a KeyReleased message; subclasses should not add the C- or A- prefixes,
+ * nor should they capitalize alphabet characters */
protected final void KeyReleased(final String key) {
if (key == null) return;
if (key.toLowerCase().equals("alt")) alt = false;
else if (key.toLowerCase().equals("control")) control = false;
else if (key.toLowerCase().equals("shift")) shift = false;
- Message.Q.add(new Message() { public void perform() {
- /* FIXME
+ Scheduler.add(new Scheduler.Task() { public void perform() {
outer: for(int i=0; i<keywatchers.size(); i++) {
Box b = (Box)keywatchers.elementAt(i);
- for(Box cur = b; cur != null; cur = cur.getParent())
- if ((cur.flags & cur.INVISIBLE_FLAG) != 0) continue outer;
- b.put("KeyReleased", key);
+ for(Box cur = b; cur != null; cur = cur.parent)
+ if (!cur.test(cur.VISIBLE)) continue outer;
+ b.putAndTriggerJSTraps("KeyReleased", key);
}
- */
}});
}
* message), the subclass should use (-1,-1).
*/
protected final void Move(final int newmousex, final int newmousey) {
- Message.Q.add(lastMoveMessage = new Message() { public void perform() {
+ Scheduler.add(lastMoveMessage = new Scheduler.Task() { public void perform() {
synchronized(Surface.this) {
// if move messages are arriving faster than we can process them, we just start ignoring them
// Root gets motion events outside itself (if trapped, of course)
if (!root.inside(oldmousex, oldmousey) && !root.inside(mousex, mousey) && (button1 || button2 || button3))
- root.put("Move", Boolean.TRUE);
+ root.putAndTriggerJSTraps("Move", Boolean.TRUE);
root.Move(oldmousex, oldmousey, mousex, mousey);
if (!cursor.equals(oldcursor)) syncCursor();
}
protected final void SizeChange(final int width, final int height) {
- Message.Q.add(new Message() { public void perform() {
+ Scheduler.add(new Scheduler.Task() { public void perform() {
if (width == root.width && height == root.height) return;
- root.needs_reflow = true;
- root.reflow(width, height);
+ root.set(root.REFLOW);
+ platform_window_width = width;
+ platform_window_height = height;
+ do { abort = false; root.reflow(width, height); } while(abort);
}});
abort = true;
}
protected final void PosChange(final int x, final int y) {
- Message.Q.add(new Message() { public void perform() {
- root.put("x", new Integer(x));
- root.put("y", new Integer(y));
+ Scheduler.add(new Scheduler.Task() { public void perform() {
+ root.x = x;
+ root.y = y;
+ root.putAndTriggerJSTraps("PosChange", Boolean.TRUE);
}});
}
protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? Boolean.TRUE : Boolean.FALSE, root); }
protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? Boolean.TRUE : Boolean.FALSE, root); }
protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? Boolean.TRUE : Boolean.FALSE, root); }
- public static void Refresh() { Message.Q.refresh(); }
+ public static void Refresh() {
+ Scheduler.add(new Scheduler.Task() { public void perform() {
+ renderAll();
+ }}); }
+
+ public static void renderAll() {
+ for(int i=0; i<allSurfaces.size(); i++)
+ ((Surface)allSurfaces.elementAt(i)).render();
+ }
public final void setMaximized(boolean b) { if (b != maximized) _setMaximized(maximized = b); }
public final void setMinimized(boolean b) { if (b != minimized) _setMinimized(minimized = b); }
// Other Methods ///////////////////////////////////////////////////////////////////////////////
- /** wrapper for setSize() which makes sure to dirty the place where the scar used to be */
- void setSize() {
- root.width = Math.max(root.width, 10);
- root.height = Math.max(root.height, 10);
- setSize(root.width, root.height);
- }
-
/** Indicates that the Surface is no longer needed */
public final void dispose(boolean quitIfAllSurfacesGone) {
if (Log.on) Log.log(this, "disposing " + this);
Refresh();
}
- public Surface(Box root) {
+ public static Surface fromBox(Box b) {
+ for(int i=0; i<allSurfaces.size(); i++) {
+ Surface s = (Surface)allSurfaces.elementAt(i);
+ if (s.root == b) return s;
+ }
+ return null;
+ }
+ public Surface(Box root) {
this.root = root;
- if (root.surface != null && root.surface.root == root) root.surface.dispose(false);
+ Surface old = fromBox(root);
+ if (old != null) old.dispose(false);
else root.remove();
- root.surface = this;
// make sure the root is properly sized
- do { abort = false; root.reflow(); } while(abort);
+ do { abort = false; root.reflow(root.width, root.height); } while(abort);
root.dirty();
Refresh();
// make sure the root is properly sized
do {
abort = false;
- root.reflow();
+ root.reflow(root.width, root.height);
+ setSize(root.width, root.height);
// update mouseinside and trigger Enter/Leave as a result of box size/position changes
String oldcursor = cursor;
cursor = "default";
if (!cursor.equals(oldcursor)) syncCursor();
} while(abort);
- Box.sizePosChangesSinceLastRender = 0;
+ //Box.sizePosChangesSinceLastRender = 0;
int[][] dirt = dirtyRegions.flush();
for(int i = 0; dirt != null && i < dirt.length; i++) {
if (dirt[i] == null) continue;
if (y+h > root.height) h = root.height - y;
if (w <= 0 || h <= 0) continue;
- root.render(0, 0, x, y, w, h, this, identity);
+ root.render(0, 0, x, y, x + w, y + h, this, identity);
+ drawPicture(Main.scarImage,
+ 0, root.height - Main.scarImage.getHeight(),
+ x, y, w, h);
if (abort) {
}
// FEATURE: reinstate recycler
- public class SimpleMessage implements Message {
+ public class SimpleMessage extends Scheduler.Task {
private Box boxContainingMouse;
private Object value;
this.boxContainingMouse = boxContainingMouse;
this.name = name;
this.value = value;
- Message.Q.add(this);
+ Scheduler.add(this);
}
- public void perform() { boxContainingMouse.put(name, value); }
+ public void perform() { boxContainingMouse.putAndTriggerJSTraps(name, value); }
public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; }
}
PixelBuffer backbuffer = Platform.createPixelBuffer(Platform.getScreenWidth(), Platform.getScreenHeight(), this);
DirtyList screenDirtyRegions = new DirtyList();
- public void drawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2) {
- screenDirtyRegions.dirty(dx1, dy1, dx2 - dx1, dy2 - dy1);
- backbuffer.drawPicture(source, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2); }
+ 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 drawPictureAlphaOnly(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int argb) {
+ screenDirtyRegions.dirty(cx1, cy1, cx2 - cx1, cy2 - cy1);
+ backbuffer.drawPictureAlphaOnly(source, dx, dy, cx1, cy1, cx2, cy2, argb);
+ }
public void fillTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int color) {
screenDirtyRegions.dirty(Math.min(x1, x3), y1, Math.max(x2, x4) - Math.min(x1, x3), y2 - y1);
- backbuffer.fillTrapezoid(x1, x2, y1, x3, x4, y2, color); }
+ backbuffer.fillTrapezoid(x1, x2, y1, x3, x4, y2, color);
+ }
public void render() {
super.render();
projects / org.ibex.core.git / blobdiff