X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FAWT.java;h=6e013528ff0752dede0397e9456c0f24e4cad7b8;hb=c6069948906645d974f46bdb96617a9a6a504636;hp=7849cf7d23db7b44e0b8d39aeb648f2d8373b43e;hpb=1d78b2dbeba31c5814824035a8da36a01d928be6;p=org.ibex.core.git diff --git a/src/org/xwt/plat/AWT.java b/src/org/xwt/plat/AWT.java index 7849cf7..6e01352 100644 --- a/src/org/xwt/plat/AWT.java +++ b/src/org/xwt/plat/AWT.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 org.xwt.*; @@ -10,13 +10,12 @@ import java.awt.*; import java.awt.datatransfer.*; import java.awt.image.*; import java.awt.event.*; -import java.applet.*; /** Platform subclass for all VM's providing AWT 1.1 functionality */ -public class AWT extends Platform { +public class AWT extends JVM { protected String getDescriptiveName() { return "Generic JDK 1.1+ with AWT"; } - protected DoubleBuffer _createDoubleBuffer(int w, int h, Surface owner) { return new AWTDoubleBuffer(w, h); } + protected PixelBuffer _createDoubleBuffer(int w, int h, Surface owner) { return new AWTDoubleBuffer(w, h); } protected Picture _createPicture(int[] b, int w, int h) { return new AWTPicture(b, w, h); } protected int _getScreenWidth() { return Toolkit.getDefaultToolkit().getScreenSize().width; } protected int _getScreenHeight() { return Toolkit.getDefaultToolkit().getScreenSize().height; } @@ -24,7 +23,7 @@ public class AWT extends Platform { protected int _stringWidth(String font, String text) { return getFont(font).metrics.stringWidth(text); } protected int _getMaxAscent(String font) { return getFont(font).metrics.getMaxAscent(); } protected int _getMaxDescent(String font) { return getFont(font).metrics.getMaxDescent(); } - protected boolean _supressDirtyOnResize() { return true; } + protected boolean _supressDirtyOnResize() { return false; } protected void postInit() { if (Log.on) Log.log(Platform.class, " color depth = " + Toolkit.getDefaultToolkit().getColorModel().getPixelSize() + "bpp"); @@ -138,7 +137,7 @@ public class AWT extends Platform { } } - protected static class AWTDoubleBuffer extends DoubleBuffer { + protected static class AWTPixelBuffer extends DoubleBuffer { protected Image i = null; protected Graphics g = null; @@ -146,9 +145,9 @@ public class AWT extends Platform { /** JDK1.1 platforms require that a component be associated with each off-screen buffer */ static Component component = null; - protected AWTDoubleBuffer() { } - public AWTDoubleBuffer(int w, int h) { - synchronized(AWTDoubleBuffer.class) { + protected AWTPixelBuffer() { } + public AWTPixelBuffer(int w, int h) { + synchronized(AWTPixelBuffer.class) { if (component == null) { component = new Frame(); component.setVisible(false); @@ -190,9 +189,9 @@ public class AWT extends Platform { protected static class AWTSurface extends Surface implements MouseListener, MouseMotionListener, KeyListener, ComponentListener, WindowListener { - public void blit(DoubleBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2) { + public void blit(PixelBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2) { if (ourGraphics == null) ourGraphics = window.getGraphics(); - ourGraphics.drawImage(((AWTDoubleBuffer)s).i, dx + insets.left, dy + insets.top, dx2 + insets.left, dy2 + insets.top, + ourGraphics.drawImage(((AWTPixelBuffer)s).i, dx + insets.left, dy + insets.top, dx2 + insets.left, dy2 + insets.top, sx, sy, sx + (dx2 - dx), sy + (dy2 - dy), null); } @@ -233,9 +232,9 @@ public class AWT extends Platform { Rectangle r = gr.getClipBounds(); // ugly hack for Java1.4 dynamicLayout on Win32 -- this catches expansions during smooth resize - int newwidth = Math.max(r.x - insets.left + r.width, width); - int newheight = Math.max(r.y - insets.top + r.height, height); - if (newwidth > width || newheight > height) + int newwidth = Math.max(r.x - insets.left + r.width, root.width); + int newheight = Math.max(r.y - insets.top + r.height, root.height); + if (newwidth > root.width || newheight > root.height) componentResized(window.getWidth() - insets.left - insets.right, window.getHeight() - insets.top - insets.bottom); Dirty(r.x - insets.left, r.y - insets.top, r.width, r.height); @@ -322,7 +321,7 @@ public class AWT extends Platform { public void windowClosed(WindowEvent e) { } public void windowClosing(WindowEvent e) { Close(); } public void windowIconified(WindowEvent e) { Minimized(true); } - public void windowDeiconified(WindowEvent e) { dirty(0, 0, width, height); Minimized(false); } + public void windowDeiconified(WindowEvent e) { dirty(0, 0, root.width, root.height); Minimized(false); } public void windowActivated(WindowEvent e) { Focused(true); } public void windowDeactivated(WindowEvent e) { Focused(false); } public void componentMoved(ComponentEvent e) { PosChange(window.getLocation().x + insets.left, window.getLocation().y + insets.top); } @@ -334,8 +333,8 @@ public class AWT extends Platform { } public void componentResized(int newwidth, int newheight) { - int oldwidth = width; - int oldheight = height; + int oldwidth = root.width; + int oldheight = root.height; SizeChange(newwidth, newheight); // we do this because JVMs which don't clear the background won't force repaints of these areas @@ -356,7 +355,7 @@ public class AWT extends Platform { // ugly hack for Java1.4 dynamicLayout on Win32 -- this catches contractions during smooth resize int newwidth = window.getWidth() - insets.left - insets.right; int newheight = window.getHeight() - insets.top - insets.bottom; - if (newwidth != width || newheight != height) componentResized(newwidth, newheight); + if (newwidth != root.width || newheight != root.height) componentResized(newwidth, newheight); Move(m.getX() - insets.left, m.getY() - insets.top); } @@ -442,6 +441,7 @@ public class AWT extends Platform { protected String[] _listFonts() { return fontList; } private static String[] fontList; static { + /* String[] awtfonts = Toolkit.getDefaultToolkit().getFontList(); fontList = new String[awtfonts.length * 4]; for(int i=0; i