X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.java;h=f9172d0053c6d5b898026a1612760e533cf4b8db;hb=36c7cba0672b0b0ac61f484a918a34969100ca92;hp=65f79ecc39f15b2337483e706e327bf03efac30a;hpb=bcc8b1b4cf4e4801d218151e6a7f9961972d91c1;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index 65f79ec..f9172d0 100644
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -117,6 +117,57 @@ public class Win32 extends GCJ {
     protected native String _getClipBoard();
     protected native void _setClipBoard(String s);
 
+    private native void __detectProxy(String[] container);
+
+    protected synchronized HTTP.ProxyInfo _detectProxy() {
+
+        String[] container = new String[] { null, null, null };
+        if (Log.on) Log.log(this, "accessing Win32 registry");
+        __detectProxy(container);
+        if (container[2] == null && container[0] == null) {
+            if (Log.on) Log.log(this, "no proxy settings in the Win32 registry");
+            return null;
+        }
+        
+        if (Log.on) Log.log(this, "PAC Script URL: " + container[2]);
+        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();
+        if (container[2] != null) {
+            ret.proxyAutoConfigFunction = HTTP.ProxyInfo.getProxyAutoConfigFunction(container[2]);
+            if (ret.proxyAutoConfigFunction != null) return ret;
+        }
+
+        if (container[0] = null) return null;
+        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(':'));
+            int port = Integer.parseInt(s.substring(s.indexOf(':') + 1));
+            if (protocol.equals("http")) {
+                ret.httpProxyHost = host;
+                ret.httpProxyPort = port;
+            } else if (protocol.equals("https")) {
+                ret.httpsProxyHost = host;
+                ret.httpsProxyPort = port;
+            } else if (protocol.equals("socks")) {
+                ret.socksProxyHost = host;
+                ret.socksProxyPort = port;
+            }
+        } catch (NumberFormatException nfe) { }
+
+        if (container[1] != null) {
+            st = new StringTokenizer(container[1], ";", false);
+            ret.excluded = new String[st.countTokens()];
+            for(int i=0; st.hasMoreTokens(); i++) ret.excluded[i] = st.nextToken();
+        }
+        return ret;
+    }
+
     protected native boolean _newBrowserWindow_(String url);
     protected void _newBrowserWindow(String url) {
         if (!_newBrowserWindow_(url))
@@ -150,11 +201,7 @@ public class Win32 extends GCJ {
         public native void natInit(boolean framed);
         public Win32Surface(Box b, final boolean framed) {
             super(b);
-            if (Log.on) Log.log(this, "before, hwnd = " + hwnd);
-            if (Log.on) Log.log(this, "before, hdc = " + hdc);
             natInit(framed);
-            if (Log.on) Log.log(this, "after, hwnd = " + hwnd);
-            if (Log.on) Log.log(this, "after, hdc = " + hdc);
             hwndToWin32SurfaceMap.put(new Integer(hwnd), this);
         }