X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=70dd5671d6ae6b5a3359d02200f1ec3adbb8c128;hb=16c24a73c1c1b2955db0bbbaf5a940215329bca1;hp=79a6194076a730d33fe6100bf81086d669f7aac5;hpb=456bc0af52725d0babe8db1a6cec88943a3cbed1;p=org.ibex.core.git diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java index 79a6194..70dd567 100644 --- a/src/org/xwt/Surface.java +++ b/src/org/xwt/Surface.java @@ -12,11 +12,6 @@ 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 - * 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 implements Scheduler.Task { @@ -30,33 +25,33 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task { /** When set to true, render() should abort as soon as possible and restart the rendering process */ volatile boolean abort = false; - volatile int pendingWidth = -1; - volatile int pendingHeight = -1; - volatile int actualWidth = -1; - volatile int actualHeight = -1; - 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 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-tiem + // 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"; ///< The active cursor to switch to when syncCursor() is called - public int mousex; ///< x position of the mouse, in Scheduler-time - public int mousey; ///< y position of the mouse, in Scheduler-time - public int _mousex; ///< x position of the mouse, in Scheduler-time - public int _mousey; ///< y position of the mouse, in Scheduler-time - public int newmousex = -1; ///< x position of the mouse, in realtime - public int newmousey = -1; ///< y position of the mouse, in realtime + 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 *screen* + DirtyList dirtyRegions = new DirtyList(); ///< Dirty regions on the surface // Used For Simulating Clicks and DoubleClicks ///////////////////////////////////////////////// @@ -80,13 +75,8 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task { 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); } - protected void setSize(int w, int h) { - if (w == actualWidth && h == actualHeight) return; - actualWidth = w; - actualHeight = h; - _setSize(w, h); - } // Helper methods for subclasses //////////////////////////////////////////////////////////// @@ -98,8 +88,8 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task { else if (button == 2) button2 = true; else if (button == 3) button3 = true; - if (button == 1) new SimpleMessage("_Press1", T, root); - else if (button == 2) new SimpleMessage("_Press2", T, root); + if (button == 1) new Message("_Press1", T, root); + else if (button == 2) new Message("_Press2", T, root); else if (button == 3) { final Box who = root; Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { @@ -118,9 +108,9 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task { else if (button == 2) button2 = false; else if (button == 3) button3 = false; - if (button == 1) new SimpleMessage("_Release1", T, root); - else if (button == 2) new SimpleMessage("_Release2", T, root); - else if (button == 3) new SimpleMessage("_Release3", T, root); + 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; @@ -128,9 +118,9 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task { } protected final void Click(int button) { - if (button == 1) new SimpleMessage("_Click1", T, root); - else if (button == 2) new SimpleMessage("_Click2", T, root); - else if (button == 3) new SimpleMessage("_Click3", T, root); + 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); @@ -147,12 +137,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task { String oldcursor = cursor; cursor = "default"; // Root gets motion events outside itself (if trapped) if (!root.inside(oldmousex, oldmousey) && !root.inside(mousex, mousey) && (button1 || button2 || button3)) - try { - root.putAndTriggerTraps("_Move", T); - } catch (JSExn e) { - Log.info(Surface.class, "Exception thrown from Move message handler"); - JS.log(e); - } + root.putAndTriggerTrapsAndCatchExceptions("_Move", T); if (!cursor.equals(oldcursor)) syncCursor(); } @@ -171,8 +156,9 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task { /** subclasses should invoke this method when the user resizes the window */ protected final void SizeChange(final int width, final int height) { if (pendingWidth == width && pendingHeight == height) return; - actualWidth = pendingWidth = width; - actualHeight = pendingHeight = height; + pendingWidth = width; + pendingHeight = height; + syncRootBoxToSurface = true; abort = true; Scheduler.renderAll(); } @@ -182,18 +168,18 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task { Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { root.x = x; root.y = y; - root.putAndTriggerTraps("PosChange", T); + root.putAndTriggerTrapsAndCatchExceptions("PosChange", T); }}); } private final String[] doubleClick = new String[] { null, "_DoubleClick1", "_DoubleClick2", "_DoubleClick3" }; - protected final void DoubleClick(int button) { new SimpleMessage(doubleClick[button], T, root); } - protected final void KeyPressed(String key) { new SimpleMessage("_KeyPressed", key, root); } - protected final void KeyReleased(String key) { new SimpleMessage("_KeyReleased", key, root); } - protected final void Close() { new SimpleMessage("Close", T, root); } - protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? T : F, root); } - protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? T : F, root); } - protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? T : F, root); } + protected final void DoubleClick(int button) { new Message(doubleClick[button], T, root); } + protected final void KeyPressed(String key) { new Message("_KeyPressed", key, root); } + protected final void KeyReleased(String key) { new Message("_KeyReleased", key, root); } + protected final void Close() { new Message("Close", T, root); } + protected final void Minimized(boolean b) { minimized = b; new Message("Minimized", b ? T : F, root); } + protected final void Maximized(boolean b) { maximized = b; new Message("Maximized", b ? T : F, root); } + protected final void Focused(boolean b) { new Message("Focused", b ? T : F, root); } public void Refresh() { Scheduler.add(new Scheduler.Task() { public void perform() { } }); } public final void setMaximized(boolean b) { if (b != maximized) _setMaximized(maximized = b); } @@ -219,6 +205,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task { } public static Surface fromBox(Box b) { + // FIXME use a hash table here for(int i=0; i