X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=9f48b2c123d23bb0f9f522c31674e75d2aa47b4a;hb=6a96430e10e27fc1de5754cb5add705f929dd109;hp=089480e79ae34ec83797e7d4bb4346c15f4023d7;hpb=8235361e8601ae7b36ab707058de3b52225d15a2;p=org.ibex.core.git
diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index 089480e..9f48b2c 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.
*/
// FIXME: put the scar box back in
@@ -25,10 +25,16 @@ public abstract class Surface extends PixelBuffer {
// Static Data ////////////////////////////////////////////////////////////////////////////////
+ // FIXME
+ 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;
- /** 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 */
@@ -37,9 +43,9 @@ public abstract class Surface extends PixelBuffer {
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
@@ -48,8 +54,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
@@ -73,13 +79,21 @@ 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.
+ 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);
+ }
// Helper methods for subclasses ////////////////////////////////////////////////////////////
@@ -95,7 +109,7 @@ 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 Message() { public void perform() {
Platform.clipboardReadEnabled = true;
root.put("Press3", Boolean.TRUE);
Platform.clipboardReadEnabled = false;
@@ -149,11 +163,11 @@ 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 Message {
String key = null;
public KMessage(String k) { key = k; }
public void perform() {
@@ -176,7 +190,7 @@ public abstract class Surface extends PixelBuffer {
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() {
+ Scheduler.add(new Message() { public void perform() {
/* FIXME
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);
+ root.render(0, 0, x, y, w, h, this, identity);
+ drawPicture(Main.scarImage,
+ 0, root.height - Main.scarImage.getHeight(),
+ x, y, w, h);
if (abort) {
@@ -326,11 +345,10 @@ public abstract class Surface extends PixelBuffer {
return;
}
}
-
}
// FEATURE: reinstate recycler
- public class SimpleMessage implements Message {
+ public class SimpleMessage extends Message {
private Box boxContainingMouse;
private Object value;
@@ -340,7 +358,7 @@ 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); }
@@ -357,16 +375,26 @@ public abstract class Surface extends PixelBuffer {
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 fillRect(int x1, int y1, int x2, int y2, int color) {
- screenDirtyRegions.dirty(x1, y1, x2 - x1, y2 - y1);
- backbuffer.fillRect(x1, y1, x2, y2, 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.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;