X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fxwt%2FSurface.java;h=1e9e222909c80b54f6c5777d372b234251b08392;hb=2230f036c642e740fd1d3f0ac206c2555f3395c0;hp=126646605a5862db83fa7cc0f9bc067b26010884;hpb=0867bd3763893981567dec0bc8221ca98712760e;p=org.ibex.core.git diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java index 1266466..1e9e222 100644 --- a/src/org/xwt/Surface.java +++ b/src/org/xwt/Surface.java @@ -51,12 +51,6 @@ public abstract class Surface { /** true iff all surfaces created from now on should be scarred */ public static boolean scarAllSurfacesFromNowOn = 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; @@ -77,18 +71,15 @@ public abstract class Surface { */ public String cursor = "default"; - /** The width of the surface's drawable area, in real time */ - public int width = 0; - - /** 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; + + // Used For Simulating Clicks and DoubleClicks ///////////////////////////////////////////////// + /** the x-position of the mouse the last time a Press message was enqueued */ int last_press_x = Integer.MAX_VALUE; @@ -127,6 +118,7 @@ public abstract class Surface { /** Sets the surface's x and y position. */ public abstract void setLocation(int x, int y); + public void setLocation() { setLocation(root.x, root.y); } /** Sets the surface's title bar text, if applicable */ public abstract void setTitleBarText(String s); @@ -154,14 +146,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); + final Box who = Box.whoIs(root, mousex, mousey); MessageQueue.add(new Message() { public void perform() { - Surface.this.boxContainingMouse = who; Platform.clipboardReadEnabled = true; - root.put("Press3", null, Boolean.TRUE); + root.put("Press3", Boolean.TRUE); Platform.clipboardReadEnabled = false; }}); } @@ -172,9 +163,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; @@ -182,9 +173,9 @@ 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); @@ -194,9 +185,9 @@ public abstract class Surface { } 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 */ @@ -226,7 +217,7 @@ public abstract class Surface { Box b = (Box)keywatchers.elementAt(i); for(Box cur = b; cur != null; cur = cur.getParent()) if (cur.invisible) continue outer; - b.put("KeyPressed", null, key); + b.put("KeyPressed", key); } Platform.clipboardReadEnabled = false; } @@ -243,7 +234,7 @@ public abstract class Surface { Box b = (Box)keywatchers.elementAt(i); for(Box cur = b; cur != null; cur = cur.getParent()) if (cur.invisible) continue outer; - b.put("KeyReleased", null, key); + b.put("KeyReleased", key); } }}); } @@ -270,8 +261,8 @@ public abstract class Surface { cursor = "default"; // Root gets motion events outside itself (if trapped, of course) - if (root.is_trapped("Move") && !root.inside(oldmousex, oldmousey) && !root.inside(mousex, mousey) && (button1 || button2 || button3)) - root.put("Move", null, Boolean.TRUE); + if (!root.inside(oldmousex, oldmousey) && !root.inside(mousex, mousey) && (button1 || button2 || button3)) + root.put("Move", Boolean.TRUE); root.Move(oldmousex, oldmousey, mousex, mousey); if (!cursor.equals(oldcursor)) syncCursor(); @@ -279,38 +270,33 @@ public abstract class Surface { }}); } - protected final void SizeChange(int width, int height) { - this.width = width; - this.height = height; + protected final void SizeChange(final int width, final int height) { + MessageQueue.add(new Message() { public void perform() { + if (width == root.width && height == root.height) return; + root.width = width; + root.height = height; + root.needs_reflow = true; + }}); abort = true; - long lastResizeTime = System.currentTimeMillis(); - lastResizeTimeTop = (int)(lastResizeTime >> 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 PosChange(final int x, final int y) { + MessageQueue.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, 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); } + 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() { 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); Refresh(); } @@ -331,7 +317,7 @@ public abstract class Surface { Vec keywatchers = new Vec(); /** When set to true, render() should abort as soon as possible and restart the rendering process */ - volatile boolean abort = false; + static volatile boolean abort = false; /** a solid red 10x10 double buffer */ private DoubleBuffer showRenderBuf = null; @@ -360,17 +346,16 @@ public abstract class Surface { } /** wrapper for setSize() which makes sure to dirty the place where the scar used to be */ - void _setSize(int width, int height) { + void setSize() { if (scarred) { - width = Math.max(width, scarPicture.getWidth()); - height = Math.max(height, scarPicture.getHeight()); + root.width = Math.max(root.width, scarPicture.getWidth()); + root.height = Math.max(root.height, scarPicture.getHeight()); dirty(hscar, - root.size(1) - vscar - scarPicture.getHeight(), - scarPicture.getWidth(), scarPicture.getHeight()); + root.height - vscar - scarPicture.getHeight(), + scarPicture.getWidth(), + scarPicture.getHeight()); } - setSize(width, height); - this.width = width; - this.height = height; + setSize(root.width, root.height); } /** Indicates that the Surface is no longer needed */ @@ -381,7 +366,7 @@ public abstract class Surface { _dispose(); // quit when all windows are closed - if (allSurfaces.size() == 0 && quitIfAllSurfacesGone) { + if (allSurfaces.size() == 0 && quitIfAllSurfacesGone && Main.doneInitializing) { 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"); @@ -405,18 +390,17 @@ public abstract class Surface { } else { root.remove(); } - root.setSurface(this); + root.surface = this; // make sure the root is properly sized - while (root.needs_prerender || abort) { + do { abort = false; - root.prerender(); - } + root.reflow(); + } while(abort); // 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); - root.mark_for_prerender(); root.dirty(); Refresh(); } @@ -424,40 +408,24 @@ 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 - if (scarred) 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; + int x = (Platform.getScreenWidth() - root.width) / 2; + int y = (Platform.getScreenHeight() - root.height) / 2; setLocation(x, y); - root.set(Box.abs, 0, x); - root.set(Box.abs, 1, y); + root.x = x; + root.y = y; } sizePosChangesSinceLastRender = 0; @@ -470,25 +438,25 @@ public abstract class Surface { int 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, backbuffer); // if any area under the scar was repainted, rescar that area if (scarred && x < hscar + scarPicture.getWidth() && - y + h > height - scarPicture.getHeight() - vscar) { + 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, height - scarPicture.getHeight() - vscar); - int _y2 = Math.min(y + h, height - vscar); + int _y1 = Math.max(y, root.height - scarPicture.getHeight() - vscar); + int _y2 = Math.min(y + h, root.height - vscar); backbuffer.drawPicture(scarPicture, _x1, _y1, _x2, _y2, _x1 - (hscar), - _y1 - (height - scarPicture.getHeight() - vscar), + _y1 - (root.height - scarPicture.getHeight() - vscar), _x2 - (hscar), - _y2 - (height - scarPicture.getHeight() - vscar) + _y2 - (root.height - scarPicture.getHeight() - vscar) ); } @@ -524,7 +492,7 @@ public abstract class Surface { int[][] dirt = screenDirtyRegions.flush(); if (Main.showRenders && dirt != null && dirt.length > 0 && a == -1) - blit(backbuffer, 0, 0, 0, 0, width, height); + 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; @@ -534,8 +502,8 @@ public abstract class Surface { 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 (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 @@ -589,14 +557,8 @@ public abstract class Surface { MessageQueue.add(this); } - public void perform() { - Surface.this.boxContainingMouse = this.boxContainingMouse; - root.put(name, root, value); - } - - public String toString() { - return "SimpleMessage [name=" + name + ", value=" + value + "]"; - } + public void perform() { boxContainingMouse.put(name, value); } + public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; } }