protected int _getScreenWidth() { return Toolkit.getDefaultToolkit().getScreenSize().width; }
protected int _getScreenHeight() { return Toolkit.getDefaultToolkit().getScreenSize().height; }
protected Surface _createSurface(Box b, boolean framed) { return new AWTSurface(b, framed); }
- 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 false; }
protected void postInit() {
+ System.setProperty("com.apple.mrj.application.live-resize", "true");
+ System.setProperty("com.apple.mrj.application.growbox.intrudes", "false");
if (Log.on) Log.log(Platform.class, " color depth = " + Toolkit.getDefaultToolkit().getColorModel().getPixelSize() + "bpp");
}
final Semaphore s = new Semaphore();
FileDialogHelper fd = new FileDialogHelper(suggestedFileName, s, write);
s.block();
- return fd.getDirectory() + File.separatorChar + fd.getFile();
+ return fd.getDirectory() == null ? null : (fd.getDirectory() + File.separatorChar + fd.getFile());
}
g.drawImage(((AWTPicture)source).i, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null);
}
- public void drawString(String font, String text, int x, int y, int argb) {
- // FEATURE: use an LRU cache for Color objects
- g.setColor(new Color((argb & 0x00FF0000) >> 16, (argb & 0x0000FF00) >> 8, (argb & 0x000000FF)));
- g.setFont(getFont(font));
- g.drawString(text, x, y + 2);
- }
-
public void fillRect(int x, int y, int x2, int y2, int argb) {
// FEATURE: use an LRU cache for Color objects
- g.setColor(new Color((argb & 0x00FF0000) >> 16, (argb & 0x0000FF00) >> 8, (argb & 0x000000FF)));
- g.fillRect(x, y, x2 - x, y2 - y);
}
+ // FIXME: try to use os acceleration
+ public void fillTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int argb) {
+ g.setColor(new Color((argb & 0x00FF0000) >> 16, (argb & 0x0000FF00) >> 8, (argb & 0x000000FF)));
+ if (x1 == x3 && x2 == x4) {
+ g.fillRect(x1, y1, x4 - x1, y2 - y1);
+ } else for(int y=y1; y<y2; y++) {
+ int _x1 = (int)Math.floor((y - y1) * (x3 - x1) / (y2 - y1) + x1);
+ int _y1 = (int)Math.floor(y);
+ int _x2 = (int)Math.ceil((y - y1) * (x4 - x2) / (y2 - y1) + x2);
+ int _y2 = (int)Math.floor(y) + 1;
+ if (_x1 > _x2) { int _x0 = _x1; _x1 = _x2; _x2 = _x0; }
+ g.fillRect(_x1, _y1, _x2 - _x1, _y2 - _y1);
+ }
+ }
}
- protected static class AWTSurface extends Surface
+ protected static class AWTSurface extends Surface.DoubleBufferedSurface
implements MouseListener, MouseMotionListener, KeyListener, ComponentListener, WindowListener {
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(((AWTPixelBuffer)s).i, dx + insets.left, dy + insets.top, dx2 + insets.left, dy2 + insets.top,
+ insets = (frame == null ? window : frame).getInsets();
+ 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);
}
public void toBack() { if (window != null) window.toBack(); }
public void toFront() { if (window != null) window.toFront(); }
- public void setLocation(int x, int y) { window.setLocation(x, y); }
+ public void setLocation() { window.setLocation(root.x, root.y); }
public void setTitleBarText(String s) { if (frame != null) frame.setTitle(s); }
public void setIcon(Picture i) { if (frame != null) frame.setIconImage(((AWTPicture)i).i); }
public void setSize(int width, int height) { window.setSize(width + (insets.left + insets.right), height + (insets.top + insets.bottom)); }
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); }
+ public void componentMoved(ComponentEvent e) { PosChange(window.getLocation().x + insets.left, window.getLocation().y + insets.top); }
public void componentResized(ComponentEvent e) {
// we have to periodically do this; I don't know why
case KeyEvent.VK_F3: return "f3";
case KeyEvent.VK_F4: return "f4";
case KeyEvent.VK_F5: return "f5";
- case KeyEvent.VK_F6: return "f6";
+ case KeyEvent.VK_F6: return "f6";
case KeyEvent.VK_F7: return "f7";
case KeyEvent.VK_F8: return "f8";
case KeyEvent.VK_F9: return "f9";
}
}
- protected ImageDecoder _decodeJPEG(InputStream is, String name) {
+ protected Picture _decodeJPEG(InputStream is, String name) {
try {
- Image i = Toolkit.getDefaultToolkit().createImage(org.xwt.Resources.isToByteArray(is));
+ Image i = Toolkit.getDefaultToolkit().createImage(InputStreamToByteArray.convert(is));
MediaTracker mediatracker = new MediaTracker(new Canvas());
mediatracker.addImage(i, 1);
try { mediatracker.waitForAll(); } catch (InterruptedException e) { }
Log.log(this, "PixelGrabber reported an error while decoding JPEG image " + name);
return null;
}
- return new ImageDecoder() {
- public int getWidth() { return width; }
- public int getHeight() { return height; }
- public int[] getData() { return data; }
- };
+ return Platform.createPicture(data, width, height);
} catch (Exception e) {
Log.log(this, "Exception caught while decoding JPEG image " + name);
Log.log(this, e);
return null;
}
}
-
- // Font Handling Stuff //////////////////////////////////////////////////////////
-
- 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<awtfonts.length; i++) {
- fontList[i * 4] = awtfonts[i] + "*";
- fontList[i * 4 + 1] = awtfonts[i] + "*b";
- fontList[i * 4 + 2] = awtfonts[i] + "*i";
- fontList[i * 4 + 3] = awtfonts[i] + "*bi";
- }
- */
- fontList = new String[] { };
- }
-
- private static Hash fontCache = new Hash();
- private static ParsedFont pf = new ParsedFont();
- private static MetricatedFont getFont(String font) {
- MetricatedFont ret = (MetricatedFont)fontCache.get(font);
- if (ret == null) {
- pf.parse(font);
- if (pf.name.equals("tty")) pf.name = "monospace";
-
- // Java's fonts tend to be, on average, two points smaller than Win32/X11 fonts. This is most acute in
- // the proxy password dialog on Linux
- ret = new MetricatedFont(pf.name, (pf.bold ? Font.BOLD : 0) | (pf.italic ? Font.ITALIC : 0), pf.size + 2);
-
- fontCache.put(font, ret);
- }
- return ret;
- }
-
- private static class MetricatedFont extends Font {
- public FontMetrics metrics = null;
- public MetricatedFont(String name, int size, int style) {
- super(name, size, style);
- metrics = Toolkit.getDefaultToolkit().getFontMetrics(this);
- }
- }
-
}