else if (button == 2) button2 = true;
else if (button == 3) button3 = true;
- if (button == 1) new SimpleMessage("Press1", Boolean.TRUE, root.whoIs(mousex, mousey));
- else if (button == 2) new SimpleMessage("Press2", Boolean.TRUE, root.whoIs(mousex, mousey));
+ if (button == 1) new SimpleMessage("Press1", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+ else if (button == 2) new SimpleMessage("Press2", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
else if (button == 3) {
- final Box who = root.whoIs(mousex, mousey);
+ final Box who = Box.whoIs(root, mousex, mousey);
MessageQueue.add(new Message() { public void perform() {
Platform.clipboardReadEnabled = true;
root.put("Press3", Boolean.TRUE);
else if (button == 2) button2 = false;
else if (button == 3) button3 = false;
- if (button == 1) new SimpleMessage("Release1", Boolean.TRUE, root.whoIs(mousex, mousey));
- else if (button == 2) new SimpleMessage("Release2", Boolean.TRUE, root.whoIs(mousex, mousey));
- else if (button == 3) new SimpleMessage("Release3", Boolean.TRUE, root.whoIs(mousex, mousey));
+ if (button == 1) new SimpleMessage("Release1", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+ else if (button == 2) new SimpleMessage("Release2", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+ else if (button == 3) new SimpleMessage("Release3", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
if (Platform.needsAutoClick() && Math.abs(last_press_x - mousex) < 5 && Math.abs(last_press_y - mousey) < 5) Click(button);
last_press_x = Integer.MAX_VALUE;
}
protected final void Click(int button) {
- if (button == 1) new SimpleMessage("Click1", Boolean.TRUE, root.whoIs(mousex, mousey));
- else if (button == 2) new SimpleMessage("Click2", Boolean.TRUE, root.whoIs(mousex, mousey));
- else if (button == 3) new SimpleMessage("Click3", Boolean.TRUE, root.whoIs(mousex, mousey));
+ if (button == 1) new SimpleMessage("Click1", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+ else if (button == 2) new SimpleMessage("Click2", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+ else if (button == 3) new SimpleMessage("Click3", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
if (Platform.needsAutoDoubleClick()) {
long now = System.currentTimeMillis();
if (lastClickButton == button && now - lastClickTime < 350) DoubleClick(button);
}
protected final void DoubleClick(int button) {
- if (button == 1) new SimpleMessage("DoubleClick1", Boolean.TRUE, root.whoIs(mousex, mousey));
- else if (button == 2) new SimpleMessage("DoubleClick2", Boolean.TRUE, root.whoIs(mousex, mousey));
- else if (button == 3) new SimpleMessage("DoubleClick3", Boolean.TRUE, root.whoIs(mousex, mousey));
+ if (button == 1) new SimpleMessage("DoubleClick1", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+ else if (button == 2) new SimpleMessage("DoubleClick2", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+ 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 */
cursor = "default";
// Root gets motion events outside itself (if trapped, of course)
- if (root.is_trapped("Move") && !root.inside(oldmousex, oldmousey) && !root.inside(mousex, mousey) && (button1 || button2 || button3))
+ if (!root.inside(oldmousex, oldmousey) && !root.inside(mousex, mousey) && (button1 || button2 || button3))
root.put("Move", Boolean.TRUE);
root.Move(oldmousex, oldmousey, mousex, mousey);
}
protected final void PosChange(int x, int y) {
- root.set(Box.abs, 0, x);
- root.set(Box.abs, 1, y);
+ if (x != root.x) root.put("x", new Integer(x));
+ if (y != root.y) root.put("y", new Integer(y));
new SimpleMessage("PosChange", Boolean.TRUE, root);
}
width = Math.max(width, scarPicture.getWidth());
height = Math.max(height, scarPicture.getHeight());
dirty(hscar,
- root.size(1) - vscar - scarPicture.getHeight(),
+ root.height - vscar - scarPicture.getHeight(),
scarPicture.getWidth(), scarPicture.getHeight());
}
setSize(width, height);
} else {
root.remove();
}
- root.setSurface(this);
+ root.surface = this;
// make sure the root is properly sized
- while (root.needs_prerender || abort) {
- abort = false;
- root.prerender();
- }
+ do {
+ Box.abort = false;
+ root.reflow();
+ } while(Box.abort);
// this is a bit dangerous since we're passing ourselves to another method before subclasses' ctors have run...
backbuffer = Platform.createDoubleBuffer(Platform.getScreenWidth(), Platform.getScreenHeight(), this);
- root.mark_for_prerender();
root.dirty();
Refresh();
}
public synchronized void render() {
// if the window size changed as a result of a user action, we have to update the root box's size
- if (root.size(0) != width || root.size(1) != height) {
+ if (root.width != width || root.width != height) {
// since the scar will be moving, dirty the place it used to be
if (scarred) dirty(hscar,
- root.size(1) - vscar - scarPicture.getHeight(),
+ root.height - vscar - scarPicture.getHeight(),
scarPicture.getWidth(), scarPicture.getHeight());
// sort of ugly; we can't use set() here because it will cause an infinite mutual recursion
- root._size_0 = (int)width;
- root._size_1 = (int)height;
+ root.width = (int)width;
+ root.height = (int)height;
- root.mark_for_prerender();
+ root.needs_reflow = true;
root.put("SizeChange", Boolean.TRUE);
}
- while (root.needs_prerender || abort) {
- abort = false;
- root.prerender();
-
+ // make sure the root is properly sized
+ do {
+ Box.abort = false;
+ root.reflow();
// update mouseinside and trigger Enter/Leave as a result of box size/position changes
String oldcursor = cursor;
cursor = "default";
root.Move(mousex, mousey, mousex, mousey);
if (!cursor.equals(oldcursor)) syncCursor();
- }
+ } while(Box.abort);
if (centerSurfaceOnRender) {
centerSurfaceOnRender = false;
int x = (Platform.getScreenWidth() - width) / 2;
int y = (Platform.getScreenHeight() - height) / 2;
setLocation(x, y);
- root.set(Box.abs, 0, x);
- root.set(Box.abs, 1, y);
+ root.x = x;
+ root.y = y;
}
sizePosChangesSinceLastRender = 0;
int h = dirt[i][3];
if (x < 0) x = 0;
if (y < 0) y = 0;
- if (x+w > root.size(0)) w = root.size(0) - x;
- if (y+h > root.size(1)) h = root.size(1) - y;
+ if (x+w > root.width) w = root.width - x;
+ if (y+h > root.height) h = root.height - y;
if (w <= 0 || h <= 0) continue;
// if any part of this region falls within the "bad region", just skip it
projects / org.ibex.core.git / blobdiff