X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=fd665541f3e82b6757df9e752848d049d3c05a71;hb=ea8d7a51a7c20e9fccacdd7d16b9a3e55a6bd8e3;hp=a1879810cd71abc9d90b9adf2cacb47983a345a6;hpb=67eeff476179a91ae930ea89cbecde22132ca532;p=org.ibex.core.git
diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index a187981..fd66554 100644
--- a/src/org/xwt/Surface.java
+++ b/src/org/xwt/Surface.java
@@ -2,6 +2,7 @@
package org.xwt;
import org.bouncycastle.util.encoders.Base64;
+import org.xwt.js.*;
import org.xwt.util.*;
import java.io.*;
import java.util.*;
@@ -17,49 +18,43 @@ import java.util.*;
* Scheduler-time (the size/position/state at the time that the
* now-executing message was enqueued). This distinction is important.
*/
-public abstract class Surface extends PixelBuffer {
+public abstract class Surface extends PixelBuffer implements Scheduler.Task {
- public int getWidth() { return root == null ? 0 : root.width; }
- public int getHeight() { return root == null ? 0 : root.height; }
-
// Static Data ////////////////////////////////////////////////////////////////////////////////
- private abstract static class Message extends Scheduler.Task {
- public abstract void perform();
- public Object call(Object arg) { perform(); return null; }
- }
-
- /**< the most recently enqueued Move message; used to throttle the message rate */
- private static Message lastMoveMessage = null;
+ private static Boolean T = Boolean.TRUE;
+ private static Boolean F = Boolean.FALSE;
/** 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 */
- static volatile boolean abort = false;
+ volatile boolean abort = false;
+ volatile int pendingWidth = -1;
+ volatile int pendingHeight = -1;
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 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 static boolean button3 = false; ///< true iff button 3 is depressed, in Scheduler-tiem
// Instance Data ///////////////////////////////////////////////////////////////////////
- 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 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
-
- /** Dirty regions on the backbuffer which need to be rebuilt using Box.render() */
- private DirtyList dirtyRegions = new DirtyList();
-
+ public Box root; ///< The Box at the root of this surface
+ public String cursor = "default"; ///< The active cursor to switch to when syncCursor() is called
+ public int mousex; ///< x position of the mouse, in Scheduler-time
+ public int mousey; ///< y position of the mouse, in Scheduler-time
+ public int _mousex; ///< x position of the mouse, in Scheduler-time
+ public int _mousey; ///< y position of the mouse, in Scheduler-time
+ public int newmousex = -1; ///< x position of the mouse, in realtime
+ public int newmousey = -1; ///< y position of the mouse, in realtime
+ 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
+ DirtyList dirtyRegions = new DirtyList(); ///< Dirty regions on the *screen*
// Used For Simulating Clicks and DoubleClicks /////////////////////////////////////////////////
@@ -71,27 +66,19 @@ public abstract class Surface extends PixelBuffer {
// Methods to be overridden by subclasses ///////////////////////////////////////////////////////
- public abstract void toBack(); ///< when invoked, the surface should push itself to the back of the stacking order
- public abstract void toFront(); ///< when invoked, the surface should pull itself to the front of the stacking order
- public abstract void syncCursor(); ///< the actual cursor for this surface to the cursor referenced by cursor
+ 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
public abstract void setInvisible(boolean b); ///< If b, make window invisible; otherwise, make it non-invisible.
protected abstract void _setMaximized(boolean b); ///< If b, maximize the surface; otherwise, un-maximize it.
protected abstract void _setMinimized(boolean b); ///< If b, minimize the surface; otherwise, un-minimize it.
- 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.
-
- 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);
- }
- _setSize(root.width, root.height);
- }
+ public abstract void setLocation(); ///< Set the surface's x/y position to that of the root box
+ protected abstract void _setSize(int w, int h); ///< set the actual size of the surface
+ 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) { /* FIXME */ }
+
// Helper methods for subclasses ////////////////////////////////////////////////////////////
@@ -103,14 +90,17 @@ public abstract class Surface extends PixelBuffer {
else if (button == 2) button2 = true;
else if (button == 3) button3 = true;
- 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));
+ if (button == 1) new SimpleMessage("_Press1", T, root);
+ else if (button == 2) new SimpleMessage("_Press2", T, root);
else if (button == 3) {
- final Box who = Box.whoIs(root, mousex, mousey);
- Scheduler.add(new Message() { public void perform() {
+ final Box who = root;
+ Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn {
Platform.clipboardReadEnabled = true;
- root.putAndTriggerJSTraps("Press3", Boolean.TRUE);
- Platform.clipboardReadEnabled = false;
+ try {
+ root.putAndTriggerTraps("_Press3", T);
+ } finally {
+ Platform.clipboardReadEnabled = false;
+ }
}});
}
}
@@ -120,9 +110,9 @@ public abstract class Surface extends PixelBuffer {
else if (button == 2) button2 = false;
else if (button == 3) button3 = false;
- 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 (button == 1) new SimpleMessage("_Release1", T, root);
+ else if (button == 2) new SimpleMessage("_Release2", T, root);
+ else if (button == 3) new SimpleMessage("_Release3", T, root);
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;
@@ -130,9 +120,9 @@ public abstract class Surface extends PixelBuffer {
}
protected final void Click(int button) {
- 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 (button == 1) new SimpleMessage("_Click1", T, root);
+ else if (button == 2) new SimpleMessage("_Click2", T, root);
+ else if (button == 3) new SimpleMessage("_Click3", T, root);
if (Platform.needsAutoDoubleClick()) {
long now = System.currentTimeMillis();
if (lastClickButton == button && now - lastClickTime < 350) DoubleClick(button);
@@ -141,61 +131,21 @@ public abstract class Surface extends PixelBuffer {
}
}
- protected final void DoubleClick(int button) {
- 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 */
- protected final void KeyPressed(String key) {
- if (key == null) return;
-
- if (key.toLowerCase().endsWith("shift")) shift = true;
- else if (shift) key = key.toUpperCase();
-
- if (key.toLowerCase().equals("alt")) alt = true;
- else if (alt) key = "A-" + key;
-
- if (key.toLowerCase().endsWith("control")) control = true;
- else if (control) key = "C-" + key;
-
- final String fkey = 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 extends Message {
- String key = null;
- public KMessage(String k) { key = k; }
- public void perform() {
- if (key.equals("C-v") || key.equals("A-v")) Platform.clipboardReadEnabled = true;
- outer: for(int i=0; i root.height) h = root.height - y;
if (w <= 0 || h <= 0) continue;
- root.render(0, 0, x, y, w, h, this, identity);
- drawPicture(Main.scarImage,
- 0, root.height - Main.scarImage.getHeight(),
- x, y, w, h);
+ root.render(0, 0, x, y, x + w, y + h, this, identity);
+ drawPicture(Main.scarImage, 0, root.height - Main.scarImage.height, x, y, w, h);
if (abort) {
@@ -347,15 +271,13 @@ public abstract class Surface extends PixelBuffer {
if (dirt[j] != null)
dirtyRegions.dirty(dirt[j][0], dirt[j][1], dirt[j][2], dirt[j][3]);
- // tail-recurse
- render();
return;
}
}
}
// FEATURE: reinstate recycler
- public class SimpleMessage extends Message {
+ public class SimpleMessage implements Scheduler.Task {
private Box boxContainingMouse;
private Object value;
@@ -368,7 +290,28 @@ public abstract class Surface extends PixelBuffer {
Scheduler.add(this);
}
- public void perform() { boxContainingMouse.putAndTriggerJSTraps(name, value); }
+ public void perform() {
+ if (name.equals("_KeyPressed")) {
+ String value = (String)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;
+ } else if (name.equals("_KeyReleased")) {
+ String value = (String)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;
+ }
+ try {
+ boxContainingMouse.putAndTriggerTraps(name, value);
+ } catch (JSExn e) {
+ Log.info(Surface.class, "Exception thrown from "+name+" handler");
+ JS.log(e);
+ } finally {
+ Platform.clipboardReadEnabled = false;
+ }
+ }
public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; }
}
@@ -387,21 +330,19 @@ public abstract class Surface extends PixelBuffer {
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) {
+ public void drawGlyph(Font.Glyph 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);
+ backbuffer.drawGlyph(source, dx, dy, cx1, cy1, cx2, cy2, argb);
}
- public void fillJSTrapezoid(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) {
screenDirtyRegions.dirty(Math.min(x1, x3), y1, Math.max(x2, x4) - Math.min(x1, x3), y2 - y1);
- backbuffer.fillJSTrapezoid(x1, x2, y1, x3, x4, y2, color); }
+ backbuffer.fillTrapezoid(x1, x2, y1, x3, x4, y2, color);
+ }
public void render() {
super.render();
- render_();
- }
-
- public void render_() {
+ if (abort) return;
int[][] dirt = screenDirtyRegions.flush();
for(int i = 0; dirt != null && i < dirt.length; i++) {
if (dirt[i] == null) continue;
@@ -414,6 +355,7 @@ public abstract class Surface extends PixelBuffer {
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 (abort) return;
blit(backbuffer, x, y, x, y, w + x, h + y);
}
}
@@ -421,7 +363,12 @@ public abstract class Surface extends PixelBuffer {
/** 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);
- Refresh();
+ Scheduler.renderAll();
+ }
+
+ public void dirty(int x, int y, int w, int h) {
+ screenDirtyRegions.dirty(x, y, w, h);
+ super.dirty(x, y, w, h);
}
/** copies a region from the doublebuffer to this surface */