X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.java;h=0260252a6b90a13f3c53706fcee982404f117369;hb=b5fa5227a80e97611a8433a275c18a6f695bf32b;hp=fd237ecc0376d741a2067f4e2cb3d371d027abd1;hpb=027607da259f292060d80e0ed90d2b0e896acd86;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index fd237ec..0260252 100644
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -84,6 +84,14 @@ public class Win32 extends GCJ {
         int maxDescent;
     }
 
+        /** Called once XWT is initialized and the application is running. On Win32, we need to block the main thread
+        *       on a semaphore because if the main thread exits, the whole application quits. */
+        protected void _running() {
+                // gcj-win32 exit()'s when the original thread dies, so we have to deadlock ourselves
+                if (Log.on) Log.log(Main.class, "main thread blocking on new semaphore");
+                new org.xwt.util.Semaphore().block();
+        }
+
     /** takes a parsed font and finds the closest platform-specific font */
     static native Win32Font mapFont(Platform.ParsedFont pf);
 
@@ -96,7 +104,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);
@@ -107,6 +115,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); }
@@ -122,7 +131,7 @@ public class Win32 extends GCJ {
 
     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");
@@ -136,9 +145,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;
         }
 
@@ -146,9 +155,14 @@ 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;
             String protocol, host;
-            if (s.indexOf('=') == -1) {
+            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 {
@@ -199,7 +213,7 @@ public class Win32 extends GCJ {
         boolean captured = false;
 
         public int hwnd = -1;
-        public int hdc = -1;
+        public int hdc = 0;
 
         public int current_cursor = default_cursor;
 
@@ -245,7 +259,7 @@ public class Win32 extends GCJ {
 
     // Win32Picture ////////////////////////////////////////////////////////////////////////////
 
-    public static class Win32Picture implements Picture {
+    public static class Win32Picture extends Picture {
         int w = 0, h = 0;
         int[] data = null;
 
@@ -277,7 +291,7 @@ public class Win32 extends GCJ {
 
     // Win32DoubleBuffer //////////////////////////////////////////////////////////////////////////
 
-    public static class Win32DoubleBuffer implements DoubleBuffer {
+    public static class Win32DoubleBuffer extends DoubleBuffer {
 
         int w = 0;
         int h = 0;