X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=70dd5671d6ae6b5a3359d02200f1ec3adbb8c128;hb=16ad8b9430571d806f2aeb18ec472a277ff69423;hp=e1cb141c43dbb2c1538f7fb94d0ec61583d6de7a;hpb=a81a151e639664cb340cf3726f9e8b9c77d125fb;p=org.ibex.core.git diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java index e1cb141..70dd567 100644 --- a/src/org/xwt/Surface.java +++ b/src/org/xwt/Surface.java @@ -1,7 +1,8 @@ -// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] package org.xwt; import org.bouncycastle.util.encoders.Base64; +import org.xwt.js.*; import org.xwt.util.*; import java.io.*; import java.util.*; @@ -11,72 +12,70 @@ import java.util.*; * * Platform subclasses should include an inner class subclass of * Surface to return from the Platform._createSurface() method - * - * 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 - * now-executing message was enqueued). This distinction is important. */ -public abstract class Surface extends PixelBuffer { - - /** Dirty regions on the screen which need to be rebuilt using Surface.blit() */ - DirtyList screenDirtyRegions = new DirtyList(); +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 //////////////////////////////////////////////////////////////////////////////// - /**< 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 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; + volatile boolean abort = false; - 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 */ + // these three variables are used to ensure that user resizes trump programmatic resizes + volatile boolean syncRootBoxToSurface = false; + volatile int pendingWidth = 0; + volatile int pendingHeight = 0; + public static boolean alt = false; ///< true iff the alt button is pressed down + public static boolean control = false; ///< true iff the control button is pressed down + public static boolean shift = false; ///< true iff the shift button is pressed down + public static boolean button1 = false; ///< true iff button 1 is depressed + public static boolean button2 = false; ///< true iff button 2 is depressed + public static boolean button3 = false; ///< true iff button 3 is depressed - // 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 MessageQueue-time */ - public int mousey; /**< the y position of the mouse, relative to this Surface, in MessageQueue-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 */ + // Instance Data /////////////////////////////////////////////////////////////////////// + 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 + public int mousey; ///< y position of the mouse + public int _mousex; ///< x position of the mouse FIXME + public int _mousey; ///< y position of the mouse FIXME + public int newmousex = -1; ///< x position of the mouse, in real time; this lets us collapse Move's + public int newmousey = -1; ///< y position of the mouse, in real time; this lets us collapse Move's + 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 surface // Used For Simulating Clicks and DoubleClicks ///////////////////////////////////////////////// - int last_press_x = Integer.MAX_VALUE; /**< the x-position of the mouse the last time a Press message was enqueued */ - int last_press_y = Integer.MAX_VALUE; /**< the y-position of the mouse the last time a Press message was enqueued */ - static int lastClickButton = 0; /**< the last button to recieve a Click message; used for simulating DoubleClick's */ - static long lastClickTime = 0; /**< the last time a Click message was processed; used for simulating DoubleClick's */ + int last_press_x = Integer.MAX_VALUE; ///< the x-position of the mouse the last time a Press message was enqueued + int last_press_y = Integer.MAX_VALUE; ///< the y-position of the mouse the last time a Press message was enqueued + static int lastClickButton = 0; ///< the last button to recieve a Click message; used for simulating DoubleClick's + static long lastClickTime = 0; ///< the last time a Click message was processed; used for simulating DoubleClick's // 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 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) { } + 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 + 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 setMinimumSize(int minx, int miny, boolean resizable) { } + protected void setSize(int w, int h) { _setSize(w, h); } // Helper methods for subclasses //////////////////////////////////////////////////////////// @@ -89,14 +88,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 Message("_Press1", T, root); + else if (button == 2) new Message("_Press2", T, root); else if (button == 3) { - final Box who = Box.whoIs(root, mousex, mousey); - Message.Q.add(new Message() { public void perform() { + final Box who = root; + Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { Platform.clipboardReadEnabled = true; - root.put("Press3", Boolean.TRUE); - Platform.clipboardReadEnabled = false; + try { + root.putAndTriggerTraps("_Press3", T); + } finally { + Platform.clipboardReadEnabled = false; + } }}); } } @@ -106,9 +108,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 Message("_Release1", T, root); + else if (button == 2) new Message("_Release2", T, root); + else if (button == 3) new Message("_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; @@ -116,9 +118,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 Message("_Click1", T, root); + else if (button == 2) new Message("_Click2", T, root); + else if (button == 3) new Message("_Click3", T, root); if (Platform.needsAutoDoubleClick()) { long now = System.currentTimeMillis(); if (lastClickButton == button && now - lastClickTime < 350) DoubleClick(button); @@ -127,63 +129,16 @@ 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; - Message.Q.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 { - 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.width) w = root.width - x; if (y+h > 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, x + w, y + h, this, identity); + drawPicture(Main.scarImage, 0, root.height - Main.scarImage.height, x, y, x+w, y+h); - // if any area under the scar was repainted, rescar that area - if (x < hscar + scarPicture.getWidth() && - y + h > root.height - scarPicture.getHeight() - vscar) { - int _x1 = Math.max(x, hscar); - int _x2 = Math.min(x + w, hscar + scarPicture.getWidth()); - int _y1 = Math.max(y, root.height - scarPicture.getHeight() - vscar); - int _y2 = Math.min(y + h, root.height - vscar); - - drawPicture(scarPicture, _x1, _y1, _x2, _y2, - _x1, - _y1 - (root.height - scarPicture.getHeight()), - _x2, - _y2 - (root.height - scarPicture.getHeight()) - ); - } - if (abort) { - // x,y,w,h is only partially reconstructed, so we must be careful not to re-blit it - screenDirtyRegions.dirty(x, y, w, h); - + dirtyRegions.dirty(x, y, w, h); // put back all the dirty regions we haven't yet processed (including the current one) for(int j=i; j 0 && a == -1) - blit(backbuffer, 0, 0, 0, 0, root.width, root.height); - for(int i = 0; dirt != null && i < dirt.length; i++) { if (dirt[i] == null) continue; int x = dirt[i][0]; @@ -437,23 +353,25 @@ 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 any part of this region falls within the "bad region", just skip it - boolean hhit = (x >= a && x <= a + c) || (x+w >= a && x+w <= a + c); - boolean vhit = (y >= b && y <= b + d) || (y+h >= b && y+h <= b + d); - if (hhit && vhit) { - screenDirtyRegions.dirty(x, y, w, h); - continue; - } - + if (abort) return; blit(backbuffer, x, y, x, y, w + x, h + y); - } + } + /** 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); + Scheduler.renderAll(); } - } - public static final int hscar = 0; - public static final int vscar = 0; + 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 */ + public abstract void blit(PixelBuffer source, int sx, int sy, int dx, int dy, int dx2, int dy2); + + } }