X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=4426ca9cd50b321f05504d1ac62be064847f136c;hb=cf3587e2fd5966b7ebfd721d9413674224d1ad2a;hp=a7949b2365ffdcec960f40e20b7a2121b64e0650;hpb=e58686eae8a823ed64ed0ec92c2274c41d90ec93;p=org.ibex.core.git

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index a7949b2..4426ca9 100644
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.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 java.lang.reflect.*;
@@ -57,7 +57,7 @@ public class Platform {
             String os_version = System.getProperty("os.version", "");
             String platform_class = null;
             
-            if (os_name.startsWith("Darwin")) platform_class = "Carbon";
+            if (os_name.startsWith("Darwin")) platform_class = "Darwin";
             else if (vendor.startsWith("Free Software Foundation")) {
                 if (os_name.startsWith("Window")) platform_class = "Win32";
                 else platform_class = "X11";
@@ -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) {
@@ -175,8 +177,8 @@ 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() { System.exit(0); }
@@ -209,7 +211,24 @@ public class Platform {
 
     /** returns an InputStream to the builtin xwar */
     protected InputStream _getBuiltinInputStream() {
-	return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+        try {
+            return new FileInputStream("builtin.xwar");
+        } catch (Exception e) {
+            Log.log(this, e);
+            return null;
+        }
+        //return this.getClass().getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+    }
+
+    /** returns an InputStream to the builtin xwar */
+    protected InputStream _getFreetypeInputStream() {
+        try {
+            return new FileInputStream("freetype.mips");
+        } catch (Exception e) {
+            Log.log(this, e);
+            return null;
+        }
+        //return this.getClass().getClassLoader().getResourceAsStream("org/xwt/freetype.mips");
     }
 
     /** returns the value of the environment variable key, or null if no such key exists */
@@ -304,7 +323,10 @@ public class Platform {
 
     /** returns an InputStream to the builtin xwar */
     public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); }
-	
+        
+    /** returns an InputStream to the freetype mips binary */
+    public static InputStream getFreetypeInputStream() { return platform._getFreetypeInputStream(); }
+        
     /** creates and returns a picture */
     public static Picture createPicture(ImageDecoder i) { return platform._createPicture(i.getData(), i.getWidth(), i.getHeight()); }
 
@@ -345,12 +367,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()");
@@ -370,26 +392,26 @@ public class Platform {
     /** this method invokes the platform _createSurface() method and then enforces a few post-call invariants */
     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;
+        ret.setInvisible(false);
 
         Object titlebar = b.get("titlebar", true);
         if (titlebar != null) ret.setTitleBarText(titlebar.toString());
 
         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;
             Surface.allSurfaces.addElement(ret);
-            ret.dirty(0, 0, ret.width, ret.height);
+            ret.dirty(0, 0, b.width, b.height);
             ret.Refresh();
         }
         return ret;
@@ -414,7 +436,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 //////////////////////////////////////////////////////