From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 06:50:28 +0000 (+0000)
Subject: 2002/09/15 23:36:01
X-Git-Tag: RC3~1539
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=0474dacf886aee03e0081e9ae64e4e4c6721f2a5

2002/09/15 23:36:01

darcs-hash:20040130065028-2ba56-fcc63b49e795712ae30625023f98a0b9a5bd7bd7.gz
---

diff --git a/CHANGES b/CHANGES
index 428b73c..768add5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -406,4 +406,6 @@
 
 15-Sep megacz HTTP.java: fixed end-of-header detection
 
+15-Sep megacz Platform.java: disable 2d acceleration on Mac OS X 10.2
+
 
diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 5406ea9..0963cd5 100644
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -54,6 +54,7 @@ public class Platform {
             String vendor = System.getProperty("java.vendor", "");
             String version = System.getProperty("java.version", "");
             String os_name = System.getProperty("os.name", "");
+            String os_version = System.getProperty("os.version", "");
             String platform_class = null;
             
             //if (os_name.startsWith("Mac OS X")) platform_class = "MacOSX";
@@ -65,6 +66,10 @@ public class Platform {
             else if (version.startsWith("1.4")) platform_class = "Java14";
             else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java12";
 
+	    // 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) {
                 platform = (Platform)Class.forName("org.xwt.plat." + platform_class).newInstance();
                 platform.init();
@@ -81,7 +86,7 @@ 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);
+            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) {