X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=089480e79ae34ec83797e7d4bb4346c15f4023d7;hb=8235361e8601ae7b36ab707058de3b52225d15a2;hp=1da3c3eb618c90a16ea6f50a8f0bfdd91ea5deec;hpb=119001be312b275cd9f3d2484ee62f358e1b71ec;p=org.ibex.core.git diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java index 1da3c3e..089480e 100644 --- a/src/org/xwt/Surface.java +++ b/src/org/xwt/Surface.java @@ -1,4 +1,4 @@ -// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL] package org.xwt; import org.bouncycastle.util.encoders.Base64; @@ -17,120 +17,68 @@ import java.util.*; * MessageQueue-time (the size/position/state at the time that the * now-executing message was enqueued). This distinction is important. */ -public abstract class Surface { +// FIXME: put the scar box back in +public abstract class Surface extends PixelBuffer { + public int getWidth() { return root == null ? 0 : root.width; } + public int getHeight() { return root == null ? 0 : root.height; } + // Static Data //////////////////////////////////////////////////////////////////////////////// - /** true iff a user-created surface was created */ - static boolean refreshableSurfaceWasCreated = false; - - /** a reference to the most recently enqueued Move message; used to throttle the message rate */ + /**< 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 */ public static Vec allSurfaces = new Vec(); - - /** true iff the alt button is pressed down, in real time */ - public static boolean alt = false; - /** true iff the control button is pressed down, in real time */ - public static boolean control = false; - - /** true iff the shift button is pressed down, in real time */ - public static boolean shift = false; - - /** true iff button 1 is depressed, in MessageQueue-time */ - public static boolean button1 = false; - - /** true iff button 2 is depressed, in MessageQueue-time */ - public static boolean button2 = false; - - /** true iff button 3 is depressed, in MessageQueue-time */ - public static boolean button3 = false; - - - // Public Members and State Variables ///////////////////////////////////////////////////////// - - /** this is the box on this surface which the mouse was inside at the time that the currently-executing event was enqueued */ - public Box boxContainingMouse = null; - - /** false if the surface has never been rendered; used to determine if the surface should be repositioned to be centered on the screen */ - public boolean centerSurfaceOnRender = true; - - /** the x position of the mouse, relative to this Surface, in MessageQueue-time */ - public int mousex; + /** When set to true, render() should abort as soon as possible and restart the rendering process */ + static volatile boolean abort = false; - /** the y position of the mouse, relative to this Surface, in MessageQueue-time */ - public int mousey; + 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 - /** True iff this surface is minimized, in real time */ - public boolean minimized = false; + - /** True iff this surface is maximized, in real time */ - public boolean maximized = false; + // Instance Data /////////////////////////////////////////////////////////////////////// - /** The name of the cursor on this surface -- this value fluctuates during rendering, so it may not be accurate; - * syncCursor() is called once the value is stable, to prevent the "flickering cursor" phenomenon - */ + public Box root; /**< The Box at the root of this surface */ public String cursor = "default"; - /** The width of the surface's drawable area, in real time */ - public int width = 0; + 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 - /** The height of the surface's drawable area, in real time */ - public int height = 0; - - /** The Box at the root of this surface */ - public Box root; - - /** The number of SizeChange/PosChange traps triggered since the last successful render -- used to detect infinite loops */ - public int sizePosChangesSinceLastRender = 0; - - /** the x-position of the mouse the last time a Press message was enqueued */ - int last_press_x = Integer.MAX_VALUE; + /** Dirty regions on the backbuffer which need to be rebuilt using Box.render() */ + private DirtyList dirtyRegions = new DirtyList(); - /** the y-position of the mouse the last time a Press message was enqueued */ - int last_press_y = Integer.MAX_VALUE; + // 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 + // Methods to be overridden by subclasses /////////////////////////////////////////////////////// - /** when this method is invoked, the surface should push itself to the back of the stacking order */ - public abstract void toBack(); - - /** when this method is invoked, the surface should pull itself to the front of the stacking order */ - public abstract void toFront(); - - /** sets the actual cursor for this surface to the cursor referenced by cursor */ - public abstract void syncCursor(); - - /** If b == true, make the window invisible; otherwise, make it non-invisible. */ - public abstract void setInvisible(boolean b); - - /** If b == true, maximize the surface; otherwise, un-maximize it. */ - protected abstract void _setMaximized(boolean b); - - /** If b == true, minimize the surface; otherwise, un-minimize it. */ - protected abstract void _setMinimized(boolean b); - - /** Sets the surface's width and height. */ - protected abstract void setSize(int width, int height); - - /** Sets the surface's x and y position. */ - public abstract void setLocation(int x, int y); - - /** Sets the surface's title bar text, if applicable */ - public abstract void setTitleBarText(String s); - - /** Sets the surface's title bar text, if applicable */ - public abstract void setIcon(Picture i); - - /** copies a region from the doublebuffer to this surface */ - public abstract void blit(DoubleBuffer source, int sx, int sy, int dx, int dy, int dx2, int dy2); - - /** Destroy the surface */ - public abstract void _dispose(); + 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) { } // Helper methods for subclasses //////////////////////////////////////////////////////////// @@ -143,14 +91,13 @@ public abstract class Surface { 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); - MessageQueue.add(new Message() { public void perform() { - Surface.this.boxContainingMouse = who; + final Box who = Box.whoIs(root, mousex, mousey); + Message.Q.add(new Message() { public void perform() { Platform.clipboardReadEnabled = true; - root.put("Press1", null, Boolean.TRUE); + root.put("Press3", Boolean.TRUE); Platform.clipboardReadEnabled = false; }}); } @@ -161,9 +108,9 @@ public abstract class Surface { 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; @@ -171,32 +118,38 @@ public abstract class Surface { } 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); + lastClickButton = button; + lastClickTime = now; + } } 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 */ protected final void KeyPressed(String key) { if (key == null) return; - - if (key.equals("alt")) alt = true; + + 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.endsWith("control")) control = true; + if (key.toLowerCase().endsWith("control")) control = true; else if (control) key = "C-" + key; - if (key.endsWith("shift")) shift = true; - else if (shift) key = key.toUpperCase(); - final String fkey = key; - MessageQueue.add(new KMessage(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 @@ -205,8 +158,14 @@ public abstract class Surface { public KMessage(String k) { key = k; } public void perform() { if (key.equals("C-v") || key.equals("A-v")) Platform.clipboardReadEnabled = true; - for(int i=0; i> 32); - lastResizeTimeBottom = (int)(lastResizeTime & 0xffffffff); - Refresh(); } - protected final void PosChange(int x, int y) { - root.set(Box.abs, 0, x); - root.set(Box.abs, 1, y); - new SimpleMessage("PosChange", Boolean.TRUE, null); - } - - protected final void Close() { new SimpleMessage("Close", Boolean.TRUE, null); } - protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? Boolean.TRUE : Boolean.FALSE, null); } - protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? Boolean.TRUE : Boolean.FALSE, null); } - protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? Boolean.TRUE : Boolean.FALSE, null); } - public static void Refresh() { MessageQueue.refresh(); } - - // the following value is split into two int's to work around GCJ bug java/6393 - - /** used in conjunction with Platform.supressDirtyOnResize() */ - private int lastResizeTimeTop = 0; - private int lastResizeTimeBottom = 0; - - /** 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) { - long lastResizeTime = (((long)lastResizeTimeTop) << 32) | (long)lastResizeTimeBottom; - if (Platform.supressDirtyOnResize() && System.currentTimeMillis() - lastResizeTime < 100 && (w >= width - 1 || h >= height - 1)) return; - screenDirtyRegions.dirty(x, y, w, h); - blitDirtyScreenRegions(); + protected final void PosChange(final int x, final int y) { + Message.Q.add(new Message() { public void perform() { + root.put("x", new Integer(x)); + root.put("y", new Integer(y)); + }}); } + protected final void Close() { new SimpleMessage("Close", Boolean.TRUE, root); } + protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? Boolean.TRUE : Boolean.FALSE, root); } + protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? Boolean.TRUE : Boolean.FALSE, root); } + protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? Boolean.TRUE : Boolean.FALSE, root); } + public static void Refresh() { Message.Q.refresh(); } - // Private Instance Data ///////////////////////////////////////////////////////////////////////////////////////////// - - /** The automatic double buffer for the root box */ - DoubleBuffer backbuffer = null; - - /** Dirty regions on the backbuffer which need to be rebuilt using Box.render() */ - private DirtyList backbufferDirtyRegions = new DirtyList(); - - /** Dirty regions on the screen which need to be rebuilt using Surface.blit() */ - private DirtyList screenDirtyRegions = new DirtyList(); - - /** A list of all the Boxes on this Surface that should be notified of keyboard events */ - Vec keywatchers = new Vec(); - - /** When set to true, render() should abort as soon as possible and restart the rendering process */ - volatile boolean abort = false; - - /** a solid red 10x10 double buffer */ - private DoubleBuffer showRenderBuf = null; - - /** a striped 100x100 double buffer */ - private DoubleBuffer showRenderBuf2 = null; - + public final void setMaximized(boolean b) { if (b != maximized) _setMaximized(maximized = b); } + public final void setMinimized(boolean b) { if (b != minimized) _setMinimized(minimized = b); } // Other Methods /////////////////////////////////////////////////////////////////////////////// - /** If b == true, maximize the surface; otherwise, un-maximize it. */ - public final void setMaximized(boolean b) { - if (b == maximized) return; - _setMaximized(b); - maximized = b; - } - - /** If b == true, minimize the surface; otherwise, un-minimize it. */ - public final void setMinimized(boolean b) { - if (b == minimized) return; - _setMinimized(b); - minimized = b; - } - /** wrapper for setSize() which makes sure to dirty the place where the scar used to be */ - void _setSize(int width, int height) { - dirty(hscar, - root.size(1) - vscar - scarPicture.getHeight(), - scarPicture.getWidth(), scarPicture.getHeight()); - setSize(width, height); - this.width = width; - this.height = height; + void setSize() { + root.width = Math.max(root.width, 10); + root.height = Math.max(root.height, 10); + setSize(root.width, root.height); } /** Indicates that the Surface is no longer needed */ - public final void dispose() { - if (root == null) return; + public final void dispose(boolean quitIfAllSurfacesGone) { if (Log.on) Log.log(this, "disposing " + this); allSurfaces.removeElement(this); _dispose(); - - // quit when all windows are closed if (allSurfaces.size() == 0) { - if (Log.on) { - if (refreshableSurfaceWasCreated) Log.log(this, "exiting because last remaining surface was disposed"); - else Log.log(this, "exiting because no surface was ever created"); - } - Platform.exit(); + if (Log.on) Log.log(this, "exiting because last surface was destroyed"); + System.exit(0); } } - /** Indicates that the backbuffer region x,y,w,h is no longer correct and must be regenerated */ public void dirty(int x, int y, int w, int h) { - backbufferDirtyRegions.dirty(x, y, w, h); + dirtyRegions.dirty(x, y, w, h); Refresh(); } public Surface(Box root) { + this.root = root; - if (root.surface != null && root.surface.root == root) root.surface.dispose(); - root.remove(); - root.setSurface(this); + if (root.surface != null && root.surface.root == root) root.surface.dispose(false); + else root.remove(); + root.surface = this; // make sure the root is properly sized - while (root.needs_prerender || abort) { - abort = false; - root.prerender(); - } - - // 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); + do { abort = false; root.reflow(); } while(abort); - root.mark_for_prerender(); root.dirty(); Refresh(); } @@ -388,191 +287,111 @@ public abstract class Surface { /** runs the prerender() and render() pipelines in the root Box to regenerate the backbuffer, then blits it to the screen */ 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) { - - // since the scar will be moving, dirty the place it used to be - dirty(hscar, - root.size(1) - 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 = (short)width; - root._size_1 = (short)height; - - root.mark_for_prerender(); - root.put("SizeChange", null, Boolean.TRUE); - } - - while (root.needs_prerender || abort) { + // make sure the root is properly sized + do { abort = false; - root.prerender(); - + 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(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); - } - - sizePosChangesSinceLastRender = 0; - int[][] dirt = backbufferDirtyRegions.flush(); + Box.sizePosChangesSinceLastRender = 0; + int[][] dirt = dirtyRegions.flush(); for(int i = 0; dirt != null && i < dirt.length; i++) { if (dirt[i] == null) continue; - int x = dirt[i][0]; - int y = dirt[i][1]; - int w = dirt[i][2]; - int h = dirt[i][3]; + int x = dirt[i][0], y = dirt[i][1], w = dirt[i][2], h = dirt[i][3]; if (x < 0) x = 0; if (y < 0) y = 0; - if (x+w > width) w = width - x; - if (y+h > height) h = height - 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; - root.render(x, y, w, h, backbuffer); + root.render(0, 0, x, y, w, h, this); - // if any area under the scar was repainted, rescar that area - if (x < hscar + scarPicture.getWidth() && - y + h > height - scarPicture.getHeight() - vscar) { - int _x1 = Math.max(x, hscar); - int _x2 = Math.min(x + w, hscar + scarPicture.getWidth()); - int _y1 = Math.max(y, height - scarPicture.getHeight() - vscar); - int _y2 = Math.min(y + h, height - vscar); - - backbuffer.drawPicture(scarPicture, _x1, _y1, _x2, _y2, - _x1 - (hscar), - _y1 - (height - scarPicture.getHeight() - vscar), - _x2 - (hscar), - _y2 - (height - scarPicture.getHeight() - vscar) - ); - } - if (abort) { // x,y,w,h is only partially reconstructed, so we must be careful not to re-blit it - blitDirtyScreenRegions(x, y, w, h); - 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, width, height); - - for(int i = 0; dirt != null && i < dirt.length; i++) { - if (dirt[i] == null) continue; - int x = dirt[i][0]; - int y = dirt[i][1]; - int w = dirt[i][2]; - 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 (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; - } - - blit(backbuffer, x, y, x, y, w + x, h + y); - - if (Main.showRenders) { - if (showRenderBuf == null) { - showRenderBuf = Platform.createDoubleBuffer(10, 10, this); - showRenderBuf.fillRect(0, 0, 10, 10, 0x00FF0000); - showRenderBuf2 = Platform.createDoubleBuffer(100, 100, this); - for(int y1 = 0; y1<100; y1++) - for(int x1 = 0; x1<100; x1++) - if ((x1 + y1) % 5 == 0) - showRenderBuf2.fillRect(x1, y1, x1 + 1, y1 + 1, 0x00FF0000); - } - for(int x1 = x; x1 root.width) w = root.width - x; + if (y+h > root.height) h = root.height - y; + if (w <= 0 || h <= 0) continue; + 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); + Refresh(); + } - /** The scar's vertical offset */ - int vscar = 0; + /** 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); - /** the scar image drawn on the bottom right hand corner */ - static Picture scarPicture = null; + } }