X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fplat%2FJava2.java;h=b91eeba66b1de7702b6d082cb947ac65bbbfeebd;hp=f63317e6e6535cc579b92b9b092bb2d1fbb983a7;hb=05d23fde131a7d19b378c632c6cc6b7924d8ab4d;hpb=385312ed5ca70d71c767aa81fc2b4dd8f1ccdd79 diff --git a/src/org/ibex/plat/Java2.java b/src/org/ibex/plat/Java2.java index f63317e..b91eeba 100644 --- a/src/org/ibex/plat/Java2.java +++ b/src/org/ibex/plat/Java2.java @@ -1,38 +1,27 @@ -// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2000-2005 the Contributors, as shown in the revision logs. +// Licensed under the GNU General Public License version 2 ("the License"). +// You may not use this file except in compliance with the License. + package org.ibex.plat; import java.awt.*; import java.awt.event.*; import java.awt.image.*; +import java.awt.geom.*; import java.net.*; import java.util.*; import org.ibex.util.*; -import org.ibex.*; import java.lang.reflect.*; - +import org.ibex.graphics.*; +import org.ibex.core.*; +import org.ibex.net.*; /** Platform class for most reasonable Java1.2+ Java2s */ public class Java2 extends AWT { - private boolean isJava14 = false; - + protected String getDescriptiveName() { return "Java 1.2+ JVM"; } public Java2() { // disable the focus manager so we can intercept the tab key - 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.info(this, "Exception while trying to enable AWT Dynamic Layout"); - Log.info(this, e); - } - } javax.swing.FocusManager.setCurrentManager(new javax.swing.FocusManager() { public void processKeyEvent(Component focusedComponent, KeyEvent anEvent) { } public void focusPreviousComponent(Component aComponent) { } @@ -40,67 +29,58 @@ public class Java2 extends AWT { }); } - /** this is done with reflection in case a new version of the plugin comes out that doesn't let us pull the sun.plugin.* trick */ - protected synchronized org.ibex.HTTP.Proxy _detectProxy() { - return (org.ibex.HTTP.Proxy)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() { - public Object run() { - try { - org.ibex.HTTP.Proxy pi = new org.ibex.HTTP.Proxy(); - - Class PluginProxyHandler = Class.forName("sun.plugin.protocol.PluginProxyHandler"); - Method getDefaultProxyHandler = PluginProxyHandler.getMethod("getDefaultProxyHandler", new Class[] { }); - Object proxyHandler = getDefaultProxyHandler.invoke(null, new Object[] { }); - - Class ProxyHandler = Class.forName("sun.plugin.protocol.ProxyHandler"); - Method getProxyInfo = ProxyHandler.getMethod("getProxyInfo", new Class[] { URL.class }); - Object proxyInfo = getProxyInfo.invoke(proxyHandler, new Object[] { new URL("http://www.ibex.org") }); - - Class ProxyInfo = Class.forName("sun.plugin.protocol.ProxyInfo"); - - if (((Boolean)ProxyInfo.getMethod("isSocksUsed", new Class[] { }).invoke(proxyInfo, new Object[] { })).booleanValue()) { - pi.socksProxyHost = - (String)ProxyInfo.getMethod("getSocksProxy", new Class[] { }).invoke(proxyInfo, new Object[] { }); - pi.socksProxyPort = - ((Integer)ProxyInfo.getMethod("getSocksPort", new Class[] { }).invoke(proxyInfo, new Object[] { })).intValue(); - } - - if (((Boolean)ProxyInfo.getMethod("isProxyUsed", new Class[] { }).invoke(proxyInfo, new Object[] { })).booleanValue()) { - pi.httpProxyHost = - (String)ProxyInfo.getMethod("getProxy", new Class[] { }).invoke(proxyInfo, new Object[] { }); - pi.httpProxyPort = - ((Integer)ProxyInfo.getMethod("getPort", new Class[] { }).invoke(proxyInfo, new Object[] { })).intValue(); - } - - if (pi.httpProxyHost != null || pi.socksProxyHost != null) return pi; - else return null; - - } catch (Throwable e) { - if (Log.on) Log.info(this, "No proxy information found in Java Plugin classes"); - return null; + /** this is done with reflection in case a new plugin comes out that doesn't let us pull the sun.plugin.* trick */ + protected synchronized org.ibex.net.HTTP.Proxy _detectProxy() { + return (org.ibex.net.HTTP.Proxy)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() { + public Object run() { try { + org.ibex.net.HTTP.Proxy pi = new org.ibex.net.HTTP.Proxy(); + + Class PluginProxyHandler = Class.forName("sun.plugin.protocol.PluginProxyHandler"); + Method getDefaultProxyHandler = PluginProxyHandler.getMethod("getDefaultProxyHandler", new Class[] { }); + Object proxyHandler = getDefaultProxyHandler.invoke(null, new Object[] { }); + + Class ProxyHandler = Class.forName("sun.plugin.protocol.ProxyHandler"); + Method getProxyInfo = ProxyHandler.getMethod("getProxyInfo", new Class[] { URL.class }); + Object proxyInfo = getProxyInfo.invoke(proxyHandler, new Object[] { new URL("http://www.ibex.org") }); + + Class ProxyInfo = Class.forName("sun.plugin.protocol.ProxyInfo"); + + if (((Boolean)ProxyInfo.getMethod("isSocksUsed", + new Class[] { }).invoke(proxyInfo, new Object[] { })).booleanValue()) { + pi.socksProxyHost = + (String)ProxyInfo.getMethod("getSocksProxy", + new Class[] { }).invoke(proxyInfo, new Object[] { }); + pi.socksProxyPort = + ((Integer)ProxyInfo.getMethod("getSocksPort", + new Class[] { }).invoke(proxyInfo, new Object[] { })).intValue(); } + + if (((Boolean)ProxyInfo.getMethod("isProxyUsed", + new Class[] { }).invoke(proxyInfo, new Object[] { })).booleanValue()) { + pi.httpProxyHost = + (String)ProxyInfo.getMethod("getProxy", + new Class[] { }).invoke(proxyInfo, new Object[] { }); + pi.httpProxyPort = + ((Integer)ProxyInfo.getMethod("getPort", + new Class[] { }).invoke(proxyInfo, new Object[] { })).intValue(); + } + + if (pi.httpProxyHost != null || pi.socksProxyHost != null) return pi; + else return null; + + } catch (Throwable e) { + if (Log.on) Log.info(this, "No proxy information found in Java Plugin classes"); + return null; + } }}); } protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) { return new Java2PixelBuffer(w, h); } + protected Surface __createSurface(final Box root, final boolean framed) { return new Java2Surface(root, framed); } protected Surface _createSurface(final Box root, final boolean framed) { return (Surface)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() { - 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, Boolean.valueOf(framed) }); - } catch (Exception e) { - Log.info(this, e); - throw new LinkageError("error: " + e); - } - } else { - return new Java2Surface(root, framed); - } - } - }); - } + public Object run() { return __createSurface(root, framed); } }); } + // Inner Classes ////////////////////////////////////////////////////////////////// @@ -108,62 +88,19 @@ public class Java2 extends AWT { Toolkit.getDefaultToolkit().createCustomCursor(new BufferedImage(2, 2, BufferedImage.TYPE_INT_ARGB), new Point(1, 1), "invisible"); - protected static class Java2Surface extends AWTSurface { - + public static class Java2Surface extends AWTSurface { public Java2Surface(Box root, boolean framed) { super(root, framed); } - protected void _setMinimized(boolean b) { if (frame == null) Log.info(this, "JDK 1.2 can only minimize frames, not windows"); else if (b) frame.setState(java.awt.Frame.ICONIFIED); else frame.setState(java.awt.Frame.NORMAL); } - public void syncCursor() { if (cursor.equals("invisible")) window.setCursor(invisibleCursor); else super.syncCursor(); } } - protected static class Java14Surface extends Java2Surface implements WindowStateListener, MouseWheelListener { - public Java14Surface(Box root, boolean framed) { - super(root, true); - // JDK1.4 doesn't like java.lang.Window's... - if (!framed) ((Frame)window).setUndecorated(true); - window.addWindowStateListener(this); - window.addMouseWheelListener(this); - window.setVisible(true); - } - - protected void makeVisible() { } - - protected void _setMaximized(boolean m) { - if (frame == null) { - if (Log.on) Log.info(this, "JDK 1.4 can only maximize frames, not windows"); - return; - } - frame.setExtendedState(m ? Frame.MAXIMIZED_BOTH : (minimized ? Frame.ICONIFIED : Frame.NORMAL)); - } - protected void _setMinimized(boolean m) { - if (frame == null) { - if (Log.on) Log.info(this, "JDK 1.4 can only minimize frames, not windows"); - return; - } - frame.setExtendedState(m ? Frame.ICONIFIED : (maximized ? Frame.MAXIMIZED_BOTH : Frame.NORMAL)); - } - public void windowStateChanged(WindowEvent e) { - if (e.getOldState() != e.getNewState()) { - if ((e.getNewState() & Frame.MAXIMIZED_BOTH) != 0) Maximized(true); - else if (((e.getOldState() & Frame.MAXIMIZED_BOTH) != 0) && (e.getNewState() & Frame.MAXIMIZED_BOTH) == 0) - Maximized(false); - } - } - - public void mouseWheelMoved(MouseWheelEvent m) { - // TODO: Uncomment this once Scroll is implemented in the core - //if(m.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) { Scroll(m.getUnitsToScroll()); } - } - } - protected static class Java2PixelBuffer extends AWTPixelBuffer { private static ColorModel cm = Toolkit.getDefaultToolkit().getColorModel(); private static Hashtable emptyHashtable = new Hashtable(); @@ -175,22 +112,31 @@ public class Java2 extends AWT { private SampleModel sm = null; private DataBuffer buf = null; - // this doens't seem to work on Windows - public void drawGlyph(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) { - AWTPicture src = (AWTPicture)source; - src.init(); - Graphics2D g2 = (Graphics2D)i.getGraphics(); - g2.setComposite(AlphaComposite.DstOut); - g2.setClip(cx1, cy1, cx2 - cx1, cy2 - cy1); - g2.drawImage(src.i, dx, dy, null); - g2.setComposite(AlphaComposite.DstOver); - g2.setColor(new Color((rgb & 0x00FF0000) >> 16, (rgb & 0x0000FF00) >> 8, (rgb & 0x000000FF))); - g2.fillRect(dx, dy, cx2 - dx, cy2 - dy); - g2.drawImage(i, 0, 0, null); - g2.setClip(0, 0, i.getWidth(null), i.getHeight(null)); + private static int[] xs = new int[65535]; + private static int[] ys = new int[65535]; + private static GeneralPath gp = new GeneralPath(); + + public void fill(org.ibex.graphics.Polygon p, org.ibex.graphics.Paint paint) { fillStroke(p, paint, true, false); } + public void stroke(org.ibex.graphics.Polygon p, org.ibex.graphics.Paint paint) { fillStroke(p, paint, false, true); } + public void fillStroke(org.ibex.graphics.Polygon p, org.ibex.graphics.Paint paint, boolean fill, boolean stroke) { + if (g == null) g = getGraphics(); + ((Graphics2D)g).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); + int argb = ((org.ibex.graphics.Paint.SingleColorPaint)paint).color; + g.setColor(new java.awt.Color((argb & 0x00FF0000) >> 16, (argb & 0x0000FF00) >> 8, (argb & 0x000000FF))); + gp.reset(); + gp.setWindingRule(GeneralPath.WIND_EVEN_ODD); + for(int j=0; j