X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=a64a5151bdf54ca8d007d7d560192396faec2d1e;hb=94ec4ca482d8f8b2f20796b9bd01613250be89ef;hp=e2c148c3759e3cc67b597bf8f1703b4ee2c83881;hpb=c6689b39ad4b2af85e942933599ccbba1ef9990d;p=org.ibex.core.git

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index e2c148c..a64a515 100644
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -65,8 +65,10 @@ public class Platform {
             else if (version.startsWith("1.1") && vendor.startsWith("Microsoft")) platform_class = "Microsoft";
             else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java2";
 
+            /*
         // Disable 2d hardware acceleration on Jaguar
         if (os_name.equals("Mac OS X") && os_version.equals("10.2"))
+            */
         System.setProperty("com.apple.hwaccel", "false");
 
             if (platform_class != null) {
@@ -86,7 +88,6 @@ public class Platform {
             if (Log.on) Log.log(Platform.class, "XWT VM detection:   vendor = " + vendor);
             if (Log.on) Log.log(Platform.class, "                   version = " + version);
             if (Log.on) Log.log(Platform.class, "                        os = " + os_name + " [version " + os_version + "]");
-            if (Log.on && Main.applet != null) Log.log(Platform.class, "                   browser = " + Main.applet.getParameter("browser"));
 
             if (platform_class == null) {
                 if (Log.on) Log.log(Platform.class, "Unable to detect JVM");
@@ -176,19 +177,11 @@ public class Platform {
             };
     }
 
-	/** Called once XWT is initialized and the application is running. */
-	protected void _running() {}
+        /** Called once XWT is initialized and the application is running. */
+        protected void _running() {}
     
     /** quits XWT */
-    protected void _exit() {
-        if (Main.applet == null) {
-            System.exit(0);
-        } else {
-            // just block ourselves forever
-            // FIXME
-            new Semaphore().block();
-        }
-    }
+    protected void _exit() { System.exit(0); }
 
     /** used to notify the user of very serious failures; usually used when logging is not working or unavailable */
     protected void _criticalAbort(String message) { _exit(); }
@@ -218,7 +211,7 @@ public class Platform {
 
     /** returns an InputStream to the builtin xwar */
     protected InputStream _getBuiltinInputStream() {
-	return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+        return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
     }
 
     /** returns the value of the environment variable key, or null if no such key exists */
@@ -313,7 +306,7 @@ public class Platform {
 
     /** returns an InputStream to the builtin xwar */
     public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); }
-	
+        
     /** creates and returns a picture */
     public static Picture createPicture(ImageDecoder i) { return platform._createPicture(i.getData(), i.getWidth(), i.getHeight()); }
 
@@ -354,12 +347,12 @@ public class Platform {
         platform._newBrowserWindow(url);
     }
 
-	/** Called once XWT is initialized and the application is running. */
-	public static void running() {
-		Log.log(Platform.class, "XWT is running");
-		platform._running();
-	}
-	
+        /** Called once XWT is initialized and the application is running. */
+        public static void running() {
+                Log.log(Platform.class, "XWT is running");
+                platform._running();
+        }
+        
     /** quits XWT */
     public static void exit() {
         Log.log(Platform.class, "exiting via Platform.exit()");
@@ -380,20 +373,20 @@ public class Platform {
     public static Surface createSurface(Box b, boolean framed, boolean refreshable) {
         Surface ret = platform._createSurface(b, framed);
         ret.setInvisible(b.invisible);
-        b.set(Box.size, 0, b.size(0) < Surface.scarPicture.getWidth() ? Surface.scarPicture.getWidth() : b.size(0));
-        b.set(Box.size, 1, b.size(1) < Surface.scarPicture.getHeight() ? Surface.scarPicture.getHeight() : b.size(1));
+        b.width = b.height < Surface.scarPicture.getWidth() ? Surface.scarPicture.getWidth() : b.width;
+        b.height = b.height < Surface.scarPicture.getHeight() ? Surface.scarPicture.getHeight() : b.height;
 
-        Object titlebar = b.get("titlebar", null, true);
+        Object titlebar = b.get("titlebar", true);
         if (titlebar != null) ret.setTitleBarText(titlebar.toString());
 
-        Object icon = b.get("icon", null, true);
+        Object icon = b.get("icon", true);
         if (icon != null && !"".equals(icon)) {
-            Picture pic = Box.getPicture(icon.toString());
+            Picture pic = ImageDecoder.getPicture(icon.toString());
             if (pic != null) ret.setIcon(pic);
             else if (Log.on) Log.log(Platform.class, "unable to load icon " + icon);
         }
 
-        ret.setLimits(b.dmin(0), b.dmin(1), b.dmax(0), b.dmax(1));
+        ret.setLimits(b.minwidth, b.minheight, b.maxwidth, b.maxheight);
 
         if (refreshable) {
             Surface.refreshableSurfaceWasCreated = true;
@@ -423,7 +416,7 @@ public class Platform {
     }
 
     public static synchronized ImageDecoder decodeJPEG(InputStream is, String name) {
-	return platform._decodeJPEG(is, name);
+        return platform._decodeJPEG(is, name);
     }
 
     // Helpful font parsing stuff //////////////////////////////////////////////////////