From: megacz Date: Fri, 30 Jan 2004 07:36:12 +0000 (+0000) Subject: 2003/09/23 21:16:10 X-Git-Tag: RC3~587 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=d1db5780c2fe79cf7acaa71508358d410aec7b96 2003/09/23 21:16:10 darcs-hash:20040130073612-2ba56-ef2027ae415755b35eda251301cb4ef407bf6595.gz --- diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp index 2c25b44..554b287 100644 --- a/src/org/xwt/Box.java.pp +++ b/src/org/xwt/Box.java.pp @@ -1122,26 +1122,22 @@ public final class Box extends JS.Scope { } }); specialBoxProperties.put("image", new SpecialBoxProperty() { - // FIXME - /* + /* FIXME public Object get(Box b) { return b.image == null ? null : ImageDecoder.imageToNameMap.get(b.image); } + */ public void put(Box b, Object value) { - if ((value == null && b.image == null) || - (value != null && b.image != null && value.equals(ImageDecoder.imageToNameMap.get(b.image)))) return; - String s = value == null ? null : value.toString(); - if (s == null || s.equals("")) b.image = null; - else { - if ((b.image = ImageDecoder.getPicture(s)) == null) { - if (Log.on) Log.logJS(Box.class, "unable to load image " + s); - } else { - b.minwidth = b.image.getWidth(); - b.minheight = b.image.getHeight(); - MARK_FOR_REFLOW_b; - } + if (value == null) { + b.image = null; + } else if (value instanceof Res) { + b.image = Picture.fromRes((Res)value); + } else { + // FIXME } + b.minwidth = b.image == null ? 0 : b.image.getWidth(); + b.minheight = b.image == null ? 0 : b.image.getHeight(); + MARK_FOR_REFLOW_b; b.dirty(); } - */ }); //#repeat globalx/globaly x/y diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java index 590d126..9febf7c 100644 --- a/src/org/xwt/Main.java +++ b/src/org/xwt/Main.java @@ -14,6 +14,7 @@ import org.xwt.translators.*; public class Main { /** + * FEATURE: this should be implemented using self-emulation * Used for security checks. If this is null, it means that only * scripts originating from the local filesystem are loaded in * the engine (maximum permissions). If scripts have been loaded @@ -22,120 +23,68 @@ public class Main { */ public static java.net.InetAddress originAddr = null; public static String originHost = null; - - /** the URL where the initial xwar came from. */ public static String origin = null; - /** true iff the user asked for rendered regions to be shown with a red rectangle */ - public static boolean showRenders = false; - - /** don't check if all surfaces are gone (and quit) until this is true */ - public static boolean doneInitializing = false; + public static Res builtin = null; + + public static void printUsage() { + System.err.println("Usage: xwt [-s] [-v] [-l /] source-location [initial-template]"); + System.err.println(""); + System.err.println("Options:"); + // FEATURE: reintroduce + //System.err.println(" -s show rendering activity with red rectangles"); + System.err.println(" -v verbose logging"); + // FEATURE: reintroduce + //System.err.println(" -l serve logs via HTTP on 127.0.0.1:/"); + System.err.println(""); + System.err.println("Source-location is one of the following:"); + System.err.println(" - the path to an xwar file"); + System.err.println(" - the path to a directory to be used as an xwar"); + System.err.println(" - the http url of an xwar"); + System.err.println(""); + System.err.println("Initial-template is the resource name of the template to load; defaults to 'main'"); + Runtime.getRuntime().exit(-1); + } /** common entry point */ - public static void main(String[] args) { - try { - int startargs = 0; - while (true) { - if (startargs > args.length - 1) { - System.err.println("Usage: xwt [-s] [-v] [-l /] source-location [initial-template]"); - System.err.println(""); - System.err.println("Options:"); - System.err.println(" -s show rendering activity with red rectangles"); - System.err.println(" -v verbose logging"); - System.err.println(" -l serve logs via HTTP on 127.0.0.1:/"); - System.err.println(""); - System.err.println("Source-location is one of the following:"); - System.err.println(" - the path to an xwar file"); - System.err.println(" - the path to a directory to be used as an xwar"); - System.err.println(" - the http url of an xwar"); - System.err.println(""); - System.err.println("Initial-template is the resource name of the template to load; defaults to 'main'"); - Runtime.getRuntime().exit(-1); - } - else if (args[startargs].equals("-s")) showRenders = true; - else if (args[startargs].equals("-v")) Log.verbose = true; - else if (args[startargs].equals("-l")) startargs++; - else break; - startargs++; - } - /* FIXME - final String instancename = args.length > startargs + 1 ? args[startargs + 1] : "main"; - - Platform.forceLoad(); - if (Log.on) for(int i=0; i startargs) { - if (args[startargs].startsWith("http://")) { - if (Log.on) Log.log(Main.class, "downloading xwar"); - initialRR = Res.stringToRes("file:" + args[startargs] + "!"); - origin = args[startargs]; - initialTemplate = "org.xwt.builtin.splash"; + public static void main(String[] args) throws Exception { + int startargs = 0; + while (true) { + if (startargs > args.length - 1) printUsage(); + else if (args[startargs].equals("-v")) Log.verbose = true; + else if (args[startargs].equals("-l")) startargs++; + else break; + startargs++; + } - } else { - if (Log.on) Log.log(Main.class, "loading xwar from local filesystem"); + Platform.forceLoad(); + if (Log.on) for(int i=0; i startargs + 1 ? args[startargs + 1] : "main"; + initialTemplateName = initialTemplateName.replace('/', '.'); + origin = args[startargs]; + + if (origin.startsWith("http://") || origin.startsWith("https://")) { + originHost = origin.substring(origin.indexOf('/') + 2); + originHost = originHost.substring(0, originHost.indexOf('/') == -1 ? originHost.length() : originHost.indexOf('/')); + if (originHost.indexOf('@') != -1) originHost = originHost.substring(originHost.indexOf('@') + 1); + originAddr = InetAddress.getByName(originHost); + } else { + // HACK because MSIE turns \'s into /'s in file URLs... argh!! + if (Platform.platform.getClass().getName().endsWith("Win32")) origin = origin.replace('/', '\\'); + if (!new File(origin).isDirectory()) origin += "!"; + origin = "file:" + origin; + } - // HACK because MSIE turns \'s into /'s in URLs... argh!! - if (Platform.platform.getClass().getName().endsWith("Win32")) - args[startargs] = args[startargs].replace('/', '\\'); + // FIXME put the splash screen back in + if (Log.on) Log.log(Main.class, "loading xwar"); - File f = new File(args[startargs]); - origin = "file:" + f.getAbsolutePath(); - if (f.isDirectory()) { - initialRR = Res.stringToRes("file:" + args[startargs]); - Surface.scarAllSurfacesFromNowOn = true; - } else { - initialRR = Res.stringToRes("file:" + args[startargs] + "!"); - initialTemplate = "org.xwt.builtin.splash"; - } + Res rr = Res.stringToRes(origin); + Template.getTemplate(((Res)rr.get(initialTemplateName)).addExtension(".xwt")).apply(new Box(), null, 0, 0, rr); - if (args.length > startargs + 1) initialTemplate = args[startargs + 1]; - } - } - - if (Log.on) Log.log(Main.class, "instantiating " + initialTemplate); - final String initialTemplate_f = initialTemplate; - final Res initialRR_f = initialRR; - ThreadMessage.newthread(new JS.Callable() { - public Object call(JS.Array args) throws JS.Exn { - Box b = new Box(); - try { - Template t = Template.buildTemplate(Res.stringToRes("file:.").getInputStream(), "RESOURCE"); - t.apply(b, (Vec)null, (Vec)null, (JS.Callable)null, 0, 0, initialRR_f); - //FIXME - //Template.getTemplate(initialTemplate_f, null).apply(b, (Vec)null, (Vec)null, (JS.Callable)null, 0, 0, initialRR_f); - doneInitializing = true; - if (Surface.allSurfaces.size() == 0) { - Log.log(this, "exiting because all surfaces are gone"); - Platform.exit(); - } - } catch (Exception e) { - Log.log(Main.class, e); - } - return null; - } - }); - - // gcj-win32 exit()'s when the original thread dies, so we have to deadlock ourselves - //if (Log.on) Log.log(Main.class, "main thread blocking on new semaphore"); - //new org.xwt.util.Semaphore().block(); - Platform.running(); - */ - } catch (Throwable e) { - e.printStackTrace(); - Platform.criticalAbort("exception in Main.main(): " + e); - } + Message.Q.startQ(); } } diff --git a/src/org/xwt/Message.java b/src/org/xwt/Message.java index ba856cb..8162f0c 100644 --- a/src/org/xwt/Message.java +++ b/src/org/xwt/Message.java @@ -33,7 +33,10 @@ public interface Message { /** true iff latency-sensitive UI work is being done; signals the networking code to yield */ public static volatile boolean working = false; - private Q() { start(); } + private Q() { } + + /** invoked by Main */ + public static void startQ() { singleton.start(); } /** pending events */ private static Queue events = new Queue(50); diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java index 850e1dc..accf069 100644 --- a/src/org/xwt/Platform.java +++ b/src/org/xwt/Platform.java @@ -264,8 +264,6 @@ public class Platform { protected Surface _createSurface(Box b, boolean framed) { return null; } public static Surface createSurface(Box b, boolean framed, boolean refreshable) { Surface ret = platform._createSurface(b, framed); - b.width = b.height < Surface.scarPicture.getWidth() ? Surface.scarPicture.getWidth() : b.width; - b.height = b.height < Surface.scarPicture.getHeight() ? Surface.scarPicture.getHeight() : b.height; ret.setInvisible(false); Object titlebar = b.get("titlebar", true); diff --git a/src/org/xwt/Res.java b/src/org/xwt/Res.java index 3f70589..20858e6 100644 --- a/src/org/xwt/Res.java +++ b/src/org/xwt/Res.java @@ -94,10 +94,11 @@ public abstract class Res extends JS { private Res parent; Zip(Res parent) { this.parent = parent; } public InputStream getInputStream(String path) throws IOException { + if (path.startsWith("/")) path = path.substring(1); ZipInputStream zis = new ZipInputStream(parent.getInputStream()); ZipEntry ze = zis.getNextEntry(); while(ze != null && !ze.getName().equals(path)) ze = zis.getNextEntry(); - if (ze == null) throw new JS.Exn("zip file not found in archive"); + if (ze == null) throw new JS.Exn("requested file not found in archive"); return zis; } } @@ -108,7 +109,7 @@ public abstract class Res extends JS { Object key; Ref(Res parent, Object key) { this.parent = parent; this.key = key; } public Res addExtension(String extension) { - return (key instanceof String && ((String)key).endsWith(extension)) ? this : new Ref(this, extension); + return (key instanceof String && ((String)key).endsWith(extension)) ? this : new Ref(parent, key + extension); } public InputStream getInputStream(String path) throws IOException { return parent.getInputStream("/" + key + path); diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java index e1cb141..922f2e3 100644 --- a/src/org/xwt/Surface.java +++ b/src/org/xwt/Surface.java @@ -19,9 +19,6 @@ import java.util.*; */ public abstract class Surface extends PixelBuffer { - /** Dirty regions on the screen which need to be rebuilt using Surface.blit() */ - DirtyList screenDirtyRegions = new DirtyList(); - public int getWidth() { return root == null ? 0 : root.width; } public int getHeight() { return root == null ? 0 : root.height; } @@ -36,46 +33,53 @@ public abstract class Surface extends PixelBuffer { /** When set to true, render() should abort as soon as possible and restart the rendering process */ static 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 */ + /** the scar image drawn on the bottom right hand corner */ + static Box scarBox = null; + + 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 + // 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 */ + 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 + + /** Dirty regions on the backbuffer which need to be rebuilt using Box.render() */ + private DirtyList dirtyRegions = new DirtyList(); // 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 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) { } @@ -240,46 +244,49 @@ public abstract class Surface extends PixelBuffer { protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? Boolean.TRUE : Boolean.FALSE, root); } public static void Refresh() { Message.Q.refresh(); } - - // Other Methods /////////////////////////////////////////////////////////////////////////////// - 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 /////////////////////////////////////////////////////////////////////////////// + /** wrapper for setSize() which makes sure to dirty the place where the scar used to be */ void setSize() { - root.width = Math.max(root.width, scarPicture.getWidth()); - root.height = Math.max(root.height, scarPicture.getHeight()); - dirty(hscar, root.height - vscar - scarPicture.getHeight(), scarPicture.getWidth(), scarPicture.getHeight()); + scarBox.dirty(); + root.width = Math.max(root.width, scarBox.minwidth); + root.height = Math.max(root.height, scarBox.minheight); setSize(root.width, root.height); + scarBox.x = 0; + scarBox.y = root.height - scarBox.minheight; } /** Indicates that the Surface is no longer needed */ public final void dispose(boolean quitIfAllSurfacesGone) { - if (root == null) return; if (Log.on) Log.log(this, "disposing " + this); allSurfaces.removeElement(this); _dispose(); - - // quit when all windows are closed - if (allSurfaces.size() == 0 && quitIfAllSurfacesGone && Main.doneInitializing) { + if (allSurfaces.size() == 0) { if (Log.on) Log.log(this, "exiting because last surface was destroyed"); System.exit(0); } } 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(false); - } else { - root.remove(); + scarBox = new Box(); + try { + scarBox.put("image", ((Res)Main.builtin.get("org/xwt/builtin/scar.png")).getInputStream()); + } catch (Exception e) { + Log.log(this, e); } + scarBox.surface = 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 @@ -289,6 +296,11 @@ public abstract class Surface extends PixelBuffer { Refresh(); } + public void paintRegion(int x, int y, int w, int h) { + root.render(0, 0, x, y, w, h, this); + scarBox.render(0, 0, x, y, w, h, this); + } + /** runs the prerender() and render() pipelines in the root Box to regenerate the backbuffer, then blits it to the screen */ public synchronized void render() { @@ -304,54 +316,32 @@ public abstract class Surface extends PixelBuffer { } while(abort); Box.sizePosChangesSinceLastRender = 0; - int[][] dirt = backbufferDirtyRegions.flush(); + 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 > 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); + paintRegion(x, y, w, 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 +408,19 @@ 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; - } - 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(); } - } - public static final int hscar = 0; - public static final 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); + + } } diff --git a/src/org/xwt/js/CompiledFunctionImpl.java b/src/org/xwt/js/CompiledFunctionImpl.java index 9fe5435..87c527c 100644 --- a/src/org/xwt/js/CompiledFunctionImpl.java +++ b/src/org/xwt/js/CompiledFunctionImpl.java @@ -77,7 +77,8 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { Object ret = cx.stack.pop(); if (cx.stack.size() > size) // this should never happen - throw new Error("ERROR: stack grew by " + (cx.stack.size() - size) + " elements during call at " + sourceName + ":" + firstLine); + throw new Error("ERROR: stack grew by " + (cx.stack.size() - size) + + " elements during call at " + sourceName + ":" + firstLine); return ret; } catch(Error e) { // Unwind the stack @@ -331,20 +332,26 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { Object old = t.pop(); Object key = t.pop(); Object obj = t.peek(); - if (obj instanceof org.xwt.Box && val instanceof CompiledFunction) { - if (curOP == ASSIGN_ADD) { - ((org.xwt.Box)obj).addTrap(key, val); - } else { - ((org.xwt.Box)obj).delTrap(key, val); + if (val instanceof CompiledFunction) { + if (obj instanceof JS.Scope) { + JS.Scope parent = (JS.Scope)obj; + while(parent.getParentScope() != null) parent = parent.getParentScope(); + if (parent instanceof org.xwt.Box) { + if (curOP == ASSIGN_ADD) { + ((org.xwt.Box)parent).addTrap(key, val); + } else { + ((org.xwt.Box)parent).delTrap(key, val); + } + // skip over the "normal" implementation of +=/-= + pc += ((Integer)arg[pc]).intValue() - 1; + break; + } } - // skip over the "normal" implementation of +=/-= - pc += ((Integer)arg[pc]).intValue() - 1; - } else { - // use the "normal" implementation - t.push(key); - t.push(old); - t.push(arg); } + // use the "normal" implementation + t.push(key); + t.push(old); + t.push(arg); break; }