2002/08/07 04:36:04

[org.ibex.core.git] / src / org / xwt / plat / Win32.java

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index a32d29b..6a74222 100644 (file)
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -39,6 +39,8 @@ public class Win32 extends GCJ {
     public static native String getTempPath();
     public static native void natInit();
 
+    protected native String _fileDialog(String suggestedFileName, boolean write);
+
     public Win32() { }
 
     public void init() {
@@ -94,7 +96,7 @@ public class Win32 extends GCJ {
         if (pf.name.equals("serif")) pf.name = "Times New Roman";
         else if (pf.name.equals("sansserif")) pf.name = "Arial";
         else if (pf.name.equals("monospace")) pf.name = "Courier New";
-        else if (pf.name.equals("dialog")) pf.name = "Arial";
+        else if (pf.name.equals("dialog")) pf.name = "MS Sans Serif";
         else if (pf.name.equals("tty")) pf.name = "FixedSys";
 
         ret = mapFont(pf);
@@ -105,6 +107,7 @@ public class Win32 extends GCJ {
 
     // Implementation of Platform methods /////////////////////////////////////////////////////////
 
+    protected native String _getEnv(String key);
     protected boolean _needsAutoClick() { return true; }
     protected String getDescriptiveName() { return "GCJ Win32 Binary"; }
     protected Surface _createSurface(Box b, boolean framed) { return new Win32Surface(b, framed); }
@@ -116,10 +119,11 @@ public class Win32 extends GCJ {
     protected native void _criticalAbort(String message);
     protected native String _getClipBoard();
     protected native void _setClipBoard(String s);
+    protected boolean _isCaseSensitive() { return false; }
 
     private native void __detectProxy(String[] container);
 
-    protected synchronized HTTP.ProxyInfo _detectProxy() {
+    protected synchronized Proxy _detectProxy() {
 
         String[] container = new String[] { null, null, null };
         if (Log.on) Log.log(this, "accessing Win32 registry");
@@ -133,9 +137,9 @@ public class Win32 extends GCJ {
         if (Log.on) Log.log(this, "Proxy Server String: " + container[0]);
         if (Log.on) Log.log(this, "Proxy Override String: " + container[1]);
 
-        HTTP.ProxyInfo ret = new HTTP.ProxyInfo();
+        Proxy ret = new Proxy();
         if (container[2] != null) {
-            ret.proxyAutoConfigFunction = HTTP.ProxyInfo.getProxyAutoConfigFunction(container[2]);
+            ret.proxyAutoConfigFunction = Proxy.getProxyAutoConfigFunction(container[2]);
             if (ret.proxyAutoConfigFunction != null) return ret;
         }
 
@@ -143,10 +147,20 @@ public class Win32 extends GCJ {
         StringTokenizer st = new StringTokenizer(container[0], ";", false);
         while(st.hasMoreTokens()) try {
             String s = st.nextToken().trim();
-            if (s.indexOf('=') == -1) continue;
-            if (s.indexOf(':') == -1) continue;
-            String protocol = s.substring(0, s.indexOf('='));
-            String host = s.substring(s.indexOf('=') + 1, s.indexOf(':'));
+            String protocol, host;
+            if (s.indexOf(':') == -1) {
+                continue;
+            } else if (s.indexOf("://") != -1) {
+                protocol = s.substring(0, s.indexOf("://"));
+                s = s.substring(s.indexOf("://") + 3);
+                host = s.substring(0, s.indexOf(':'));
+            } else if (s.indexOf('=') == -1) {
+                protocol = "http";
+                host = s.substring(0, s.indexOf(':'));
+            } else {
+                protocol = s.substring(0, s.indexOf('='));
+                host = s.substring(s.indexOf('=') + 1, s.indexOf(':'));
+            }
             int port = Integer.parseInt(s.substring(s.indexOf(':') + 1));
             if (protocol.equals("http")) {
                 ret.httpProxyHost = host;