2003/09/19 05:01:38

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

diff --git a/src/org/xwt/plat/Java2.java b/src/org/xwt/plat/Java2.java
index 6c2ac6f..40ae9c3 100644 (file)
--- a/src/org/xwt/plat/Java2.java
+++ b/src/org/xwt/plat/Java2.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.plat;
 
 import java.awt.*;
@@ -17,22 +17,30 @@ import java.lang.reflect.*;
 public class Java2 extends AWT {
 
     private boolean isJava14 = false;
-    protected boolean _supressDirtyOnResize() { return isJava14 ? false : true; }
+    protected boolean _supressDirtyOnResize() {
+        return false;
+        //return (isJava14 && !System.getProperty("os.name", "").equals("Mac OS X"))? false : true;
+    }
 
     public Java2() {
         // disable the focus manager so we can intercept the tab key
-       double version = Double.parseDouble(System.getProperty("java.version", ""));
-       if (version >= 1.4) {
-           isJava14 = true;
-           try {
-               Toolkit t = java.awt.Toolkit.getDefaultToolkit();
-               Method m = java.awt.Toolkit.class.getMethod("setDynamicLayout", new Class[] { Boolean.class });
-               m.invoke(t, new Object[] { Boolean.TRUE });
-           } catch (Exception e) {
-               Log.log(this, "Exception while trying to enable AWT Dynamic Layout");
-               Log.log(this, e);
-           }
-       }
+        String versionString = System.getProperty("java.version", "");
+        int secondDecimal = versionString.substring(versionString.indexOf('.') + 1).indexOf('.');
+        if (secondDecimal != -1) versionString = versionString.substring(0, secondDecimal);
+        /*
+        double version = Double.parseDouble(versionString);
+        if (version >= 1.4) {
+            isJava14 = true;
+            try {
+                Toolkit t = java.awt.Toolkit.getDefaultToolkit();
+                Method m = java.awt.Toolkit.class.getMethod("setDynamicLayout", new Class[] { Boolean.class });
+                m.invoke(t, new Object[] { Boolean.TRUE });
+            } catch (Exception e) {
+                Log.log(this, "Exception while trying to enable AWT Dynamic Layout");
+                Log.log(this, e);
+            }
+        }
+        */
         javax.swing.FocusManager.setCurrentManager(new javax.swing.FocusManager() {
                 public void processKeyEvent(Component focusedComponent, KeyEvent anEvent) { }
                 public void focusPreviousComponent(Component aComponent) { }
@@ -101,7 +109,21 @@ public class Java2 extends AWT {
     protected DoubleBuffer _createDoubleBuffer(int w, int h, Surface owner) { return new Java2DoubleBuffer(w, h); }
     protected Surface _createSurface(final Box root, final boolean framed) {
         return (Surface)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() {
-                public Object run() { return isJava14 ? new Java14Surface(root, framed) : new Java2Surface(root, framed); }
+                public Object run() {
+                    if (isJava14) {
+                        try {
+                             // weaken the binding here to avoid link errors on 1.3.x
+                             Class java14SurfaceClass = Class.forName(Java2.class.getName() + "$Java14Surface");
+                             Constructor ctor = java14SurfaceClass.getConstructor(new Class[] { Box.class, Boolean.TYPE });
+                             return (Surface)ctor.newInstance(new Object[] { root, new Boolean(framed) });
+                        } catch (Exception e) {
+                            Log.log(this, e);
+                            throw new LinkageError("error: " + e);
+                        }
+                    } else {
+                        return new Java2Surface(root, framed);
+                    }
+                }
             });
     }
 
@@ -118,11 +140,11 @@ public class Java2 extends AWT {
         public void blit(DoubleBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2) {
             if (ourGraphics == null) {
                 ourGraphics = window.getGraphics();
-
+                
                 // sometimes jdk1.4 doesn't set the clip properly when we're in the middle of a resize
-                ourGraphics.setClip(insets.left, insets.top, width + insets.left, height + insets.top);
+                ourGraphics.setClip(insets.left, insets.top, root.width + insets.left, root.height + insets.top);
             }
-            _doDrawImage(ourGraphics, ((AWTDoubleBuffer)s).i, dx + insets.left, dy + insets.top, dx2 + insets.left, dy2 + insets.top,
+            _doDrawImage(window.getGraphics(), ((AWTDoubleBuffer)s).i, dx + insets.left, dy + insets.top, dx2 + insets.left, dy2 + insets.top,
                          sx, sy, sx + (dx2 - dx), sy + (dy2 - dy), null);
         }
 
@@ -260,9 +282,11 @@ public class Java2 extends AWT {
             });
     }
 
-    protected String getDescriptiveName() { return "Java 1.2+ JVM"; }
+    protected String getDescriptiveName() { return isJava14 ? "Java 1.4+ JVM" : "Java 1.2+ JVM"; }
 
     protected void _newBrowserWindow(String url) {
+        /*
+          FIXME
         if (Main.applet == null) {
             if (Log.on) Log.log(this, "Main.applet is null; cannot invoke showDocument()");
             return;
@@ -273,6 +297,7 @@ public class Java2 extends AWT {
         } catch (MalformedURLException e) {
             if (Log.on) Log.log(this, e);
         }
+        */
     }
 
 }