src/macosx/classes/sun/lwawt/LWWindowPeer.java
Print this page
*** 35,44 ****
--- 35,45 ----
import sun.awt.*;
import sun.java2d.*;
import sun.java2d.loops.Blit;
import sun.java2d.loops.CompositeType;
+ import sun.java2d.pipe.Region;
import sun.util.logging.PlatformLogger;
public class LWWindowPeer
extends LWContainerPeer<Window, JComponent>
implements WindowPeer, FramePeer, DialogPeer, FullScreenCapable
*** 107,116 ****
--- 108,119 ----
private static LWWindowPeer grabbingWindow;
private volatile boolean skipNextFocusChange;
+ private static final Color nonOpaqueBackground = new Color(0, 0, 0, 0);
+
/**
* Current modal blocker or null.
*
* Synchronization: peerTreeLock.
*/
*** 167,186 ****
}
setAlwaysOnTop(getTarget().isAlwaysOnTop());
updateMinimumSize();
final float opacity = getTarget().getOpacity();
if (opacity < 1.0f) {
setOpacity(opacity);
}
setOpaque(getTarget().isOpaque());
updateInsets(platformWindow.getInsets());
if (getSurfaceData() == null) {
! replaceSurfaceData();
}
}
// Just a helper method
public PlatformWindow getPlatformWindow() {
--- 170,194 ----
}
setAlwaysOnTop(getTarget().isAlwaysOnTop());
updateMinimumSize();
+ final Shape shape = getTarget().getShape();
+ if (shape != null) {
+ applyShape(Region.getInstance(shape, null));
+ }
+
final float opacity = getTarget().getOpacity();
if (opacity < 1.0f) {
setOpacity(opacity);
}
setOpaque(getTarget().isOpaque());
updateInsets(platformWindow.getInsets());
if (getSurfaceData() == null) {
! replaceSurfaceData(false);
}
}
// Just a helper method
public PlatformWindow getPlatformWindow() {
*** 278,288 ****
// unsupported, and 1 corresponds to a SingleBufferStrategy which
// doesn't depend on the peer. Screen is considered as a separate
// "buffer", that's why numBuffers - 1
assert numBuffers > 1;
! replaceSurfaceData(numBuffers - 1, caps);
} catch (InvalidPipeException z) {
throw new AWTException(z.toString());
}
}
--- 286,296 ----
// unsupported, and 1 corresponds to a SingleBufferStrategy which
// doesn't depend on the peer. Screen is considered as a separate
// "buffer", that's why numBuffers - 1
assert numBuffers > 1;
! replaceSurfaceData(numBuffers - 1, caps, false);
} catch (InvalidPipeException z) {
throw new AWTException(z.toString());
}
}
*** 418,440 ****
@Override
public final void setOpaque(final boolean isOpaque) {
if (this.isOpaque != isOpaque) {
this.isOpaque = isOpaque;
! getPlatformWindow().setOpaque(isOpaque);
! replaceSurfaceData();
! repaintPeer();
}
}
public final boolean isOpaque() {
return isOpaque;
}
@Override
public void updateWindow() {
! flushOffscreenGraphics();
}
@Override
public void repositionSecurityWarning() {
throw new RuntimeException("not implemented");
--- 426,461 ----
@Override
public final void setOpaque(final boolean isOpaque) {
if (this.isOpaque != isOpaque) {
this.isOpaque = isOpaque;
! updateOpaque();
}
}
public final boolean isOpaque() {
return isOpaque;
}
+ private void updateOpaque() {
+ getPlatformWindow().setOpaque(!isTranslucent());
+ replaceSurfaceData(false);
+ repaintPeer();
+ }
+
@Override
public void updateWindow() {
! }
!
! public final boolean isTranslucent() {
! return !isOpaque() || isShaped();
! }
!
! @Override
! final void applyShapeImpl(final Region shape) {
! super.applyShapeImpl(shape);
! updateOpaque();
}
@Override
public void repositionSecurityWarning() {
throw new RuntimeException("not implemented");
*** 597,607 ****
private void clearBackground(final int w, final int h) {
final Graphics g = getOnscreenGraphics(getForeground(), getBackground(),
getFont());
if (g != null) {
try {
! g.clearRect(0, 0, w, h);
} finally {
g.dispose();
}
}
}
--- 618,639 ----
private void clearBackground(final int w, final int h) {
final Graphics g = getOnscreenGraphics(getForeground(), getBackground(),
getFont());
if (g != null) {
try {
! if (g instanceof Graphics2D) {
! ((Graphics2D) g).setComposite(AlphaComposite.Src);
! }
! if (isTranslucent()) {
! g.setColor(nonOpaqueBackground);
! g.fillRect(0, 0, w, h);
! }
! if (g instanceof SunGraphics2D) {
! SG2DConstraint((SunGraphics2D) g, getRegion());
! }
! g.setColor(getBackground());
! g.fillRect(0, 0, w, h);
} finally {
g.dispose();
}
}
}
*** 904,957 ****
AWTAccessor.getComponentAccessor().setGraphicsConfiguration(getTarget(), newGC);
}
});
}
- /**
- * This method returns a back buffer Graphics to render all the
- * peers to. After the peer is painted, the back buffer contents
- * should be flushed to the screen. All the target painting
- * (Component.paint() method) should be done directly to the screen.
- */
- protected final Graphics getOffscreenGraphics(Color fg, Color bg, Font f) {
- final Image bb = getBackBuffer();
- if (bb == null) {
- return null;
- }
- if (fg == null) {
- fg = SystemColor.windowText;
- }
- if (bg == null) {
- bg = SystemColor.window;
- }
- if (f == null) {
- f = DEFAULT_FONT;
- }
- final Graphics2D g = (Graphics2D) bb.getGraphics();
- if (g != null) {
- g.setColor(fg);
- g.setBackground(bg);
- g.setFont(f);
- }
- return g;
- }
-
/*
* May be called by delegate to provide SD to Java2D code.
*/
public SurfaceData getSurfaceData() {
synchronized (surfaceDataLock) {
return surfaceData;
}
}
private void replaceSurfaceData() {
! replaceSurfaceData(backBufferCount, backBufferCaps);
}
private void replaceSurfaceData(int newBackBufferCount,
! BufferCapabilities newBackBufferCaps) {
synchronized (surfaceDataLock) {
final SurfaceData oldData = getSurfaceData();
surfaceData = platformWindow.replaceSurfaceData();
// TODO: volatile image
// VolatileImage oldBB = backBuffer;
--- 936,965 ----
AWTAccessor.getComponentAccessor().setGraphicsConfiguration(getTarget(), newGC);
}
});
}
/*
* May be called by delegate to provide SD to Java2D code.
*/
public SurfaceData getSurfaceData() {
synchronized (surfaceDataLock) {
return surfaceData;
}
}
private void replaceSurfaceData() {
! replaceSurfaceData(true);
! }
!
! private void replaceSurfaceData(boolean blit) {
! replaceSurfaceData(backBufferCount, backBufferCaps, blit);
}
private void replaceSurfaceData(int newBackBufferCount,
! BufferCapabilities newBackBufferCaps,
! boolean blit) {
synchronized (surfaceDataLock) {
final SurfaceData oldData = getSurfaceData();
surfaceData = platformWindow.replaceSurfaceData();
// TODO: volatile image
// VolatileImage oldBB = backBuffer;
*** 960,988 ****
backBufferCaps = newBackBufferCaps;
final Rectangle size = getSize();
if (getSurfaceData() != null && oldData != getSurfaceData()) {
clearBackground(size.width, size.height);
}
blitSurfaceData(oldData, getSurfaceData());
if (oldData != null && oldData != getSurfaceData()) {
// TODO: drop oldData for D3D/WGL pipelines
// This can only happen when this peer is being created
oldData.flush();
}
// TODO: volatile image
// backBuffer = (VolatileImage)delegate.createBackBuffer();
backBuffer = (BufferedImage) platformWindow.createBackBuffer();
if (backBuffer != null) {
Graphics g = backBuffer.getGraphics();
try {
Rectangle r = getBounds();
- g.setColor(getBackground());
if (g instanceof Graphics2D) {
((Graphics2D) g).setComposite(AlphaComposite.Src);
}
g.fillRect(0, 0, r.width, r.height);
if (oldBB != null) {
// Draw the old back buffer to the new one
g.drawImage(oldBB, 0, 0, null);
oldBB.flush();
--- 968,1006 ----
backBufferCaps = newBackBufferCaps;
final Rectangle size = getSize();
if (getSurfaceData() != null && oldData != getSurfaceData()) {
clearBackground(size.width, size.height);
}
+
+ if (blit) {
blitSurfaceData(oldData, getSurfaceData());
+ }
if (oldData != null && oldData != getSurfaceData()) {
// TODO: drop oldData for D3D/WGL pipelines
// This can only happen when this peer is being created
oldData.flush();
}
// TODO: volatile image
// backBuffer = (VolatileImage)delegate.createBackBuffer();
+
+ if (oldBB != null) {
backBuffer = (BufferedImage) platformWindow.createBackBuffer();
if (backBuffer != null) {
Graphics g = backBuffer.getGraphics();
try {
Rectangle r = getBounds();
if (g instanceof Graphics2D) {
((Graphics2D) g).setComposite(AlphaComposite.Src);
}
+ g.setColor(nonOpaqueBackground);
+ g.fillRect(0, 0, r.width, r.height);
+ if (g instanceof SunGraphics2D) {
+ SG2DConstraint((SunGraphics2D) g, getRegion());
+ }
+ g.setColor(getBackground());
g.fillRect(0, 0, r.width, r.height);
if (oldBB != null) {
// Draw the old back buffer to the new one
g.drawImage(oldBB, 0, 0, null);
oldBB.flush();
*** 991,1000 ****
--- 1009,1019 ----
g.dispose();
}
}
}
}
+ }
private void blitSurfaceData(final SurfaceData src, final SurfaceData dst) {
//TODO blit. proof-of-concept
if (src != dst && src != null && dst != null
&& !(dst instanceof NullSurfaceData)
*** 1003,1013 ****
final Rectangle size = getSize();
final Blit blit = Blit.locate(src.getSurfaceType(),
CompositeType.Src,
dst.getSurfaceType());
if (blit != null) {
! blit.Blit(src, dst, ((Graphics2D) getGraphics()).getComposite(),
getRegion(), 0, 0, 0, 0, size.width, size.height);
}
}
}
--- 1022,1032 ----
final Rectangle size = getSize();
final Blit blit = Blit.locate(src.getSurfaceType(),
CompositeType.Src,
dst.getSurfaceType());
if (blit != null) {
! blit.Blit(src, dst, AlphaComposite.Src,
getRegion(), 0, 0, 0, 0, size.width, size.height);
}
}
}