X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=3a083ccbd1540d02250d8d586f7fb73fbae7d920;hb=0b0673bbc7f06c5d5418d5ab7ad5961a464e2de0;hp=922f2e3c4b11276def566489fda05fd902293931;hpb=d1db5780c2fe79cf7acaa71508358d410aec7b96;p=org.ibex.core.git
diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index 922f2e3..3a083cc 100644
--- a/src/org/xwt/Surface.java
+++ b/src/org/xwt/Surface.java
@@ -14,7 +14,7 @@ import java.util.*;
*
* 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.
*/
public abstract class Surface extends PixelBuffer {
@@ -25,23 +25,20 @@ public abstract class Surface extends PixelBuffer {
// 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 */
static volatile boolean abort = false;
- /** the scar image drawn on the bottom right hand corner */
- static Box scarBox = null;
-
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
@@ -50,8 +47,8 @@ public abstract class Surface extends PixelBuffer {
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
@@ -75,13 +72,25 @@ public abstract class Surface extends PixelBuffer {
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.
- 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 ////////////////////////////////////////////////////////////
@@ -97,9 +106,9 @@ public abstract class Surface extends PixelBuffer {
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;
}});
}
@@ -137,7 +146,9 @@ public abstract class Surface extends PixelBuffer {
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;
@@ -151,42 +162,41 @@ public abstract class Surface extends PixelBuffer {
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 root.height) h = root.height - y;
if (w <= 0 || h <= 0) continue;
- paintRegion(x, y, w, h);
+ 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) {
@@ -343,11 +355,10 @@ public abstract class Surface extends PixelBuffer {
return;
}
}
-
}
// FEATURE: reinstate recycler
- public class SimpleMessage implements Message {
+ public class SimpleMessage extends Scheduler.Task {
private Box boxContainingMouse;
private Object value;
@@ -357,10 +368,10 @@ public abstract class Surface extends PixelBuffer {
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 + "]"; }
}
@@ -370,32 +381,31 @@ public abstract class Surface extends PixelBuffer {
public static abstract class DoubleBufferedSurface extends Surface {
- public DoubleBufferedSurface(Box root) {
- super(root);
+ public DoubleBufferedSurface(Box root) { super(root); }
+ PixelBuffer backbuffer = Platform.createPixelBuffer(Platform.getScreenWidth(), Platform.getScreenHeight(), this);
+ DirtyList screenDirtyRegions = new DirtyList();
- // this is a bit dangerous since we're passing ourselves to another method before subclasses' ctors have run...
- backbuffer = Platform.createPixelBuffer(Platform.getScreenWidth(), Platform.getScreenHeight(), this);
+ 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);
}
- /** The automatic double buffer for the root box */
- PixelBuffer backbuffer = null;
-
- /** Dirty regions on the screen which need to be rebuilt using Surface.blit() */
- 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) {
- backbuffer.drawPicture(source, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2); }
+ 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 fillRect(int x1, int y1, int x2, int y2, int color) {
- backbuffer.fillRect(x1, y1, x2, y2, color); }
-
- public void paintRegion(int x, int y, int w, int h) {
- super.paintRegion(x, y, w, h);
- screenDirtyRegions.dirty(x, y, w, h);
+ 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);
}
public void render() {
super.render();
+ render_();
+ }
+
+ public void render_() {
int[][] dirt = screenDirtyRegions.flush();
for(int i = 0; dirt != null && i < dirt.length; i++) {
if (dirt[i] == null) continue;