PageRenderTime 47ms CodeModel.GetById 20ms RepoModel.GetById 0ms app.codeStats 1ms

/patches/openjdk/6633275-shaped_translucent_windows.patch

https://bitbucket.org/xiaoqiangnk/icedtea6
Patch | 6255 lines | 6090 code | 165 blank | 0 comment | 0 complexity | eed296f75b0858bbc1642a0a31b1d178 MD5 | raw file
Possible License(s): GPL-2.0 
    

  1. diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk openjdk/jdk/make/sun/awt/FILES_c_windows.gmk
    2. 

  2. --- openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk	2011-02-16 00:40:21.000000000 +0000
    3. 

  3. +++ openjdk/jdk/make/sun/awt/FILES_c_windows.gmk	2011-02-16 01:27:24.988327481 +0000
    4. 

  4. @@ -1,5 +1,5 @@
    5. 

  5.  #
    6. 

  6. -# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    7. 

  7. +# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    8. 

  8.  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    9. 

  9.  #
    10. 

  10.  # This code is free software; you can redistribute it and/or modify it
    11. 

  11. @@ -104,7 +104,8 @@
    12. 

  12.          OGLVertexCache.c \
    13. 

  13.          WGLGraphicsConfig.c \
    14. 

  14.          WGLSurfaceData.c \
    15. 

  15. -        AccelGlyphCache.c
    16. 

  16. +        AccelGlyphCache.c \
    17. 

  17. +        rect.c
    18. 

  18.  
    19. 

  19.  FILES_cpp = \
    20. 

  20.  	CmdIDList.cpp \
    21. 

  21. diff -Nru openjdk.orig/jdk/make/sun/awt/make.depend openjdk/jdk/make/sun/awt/make.depend
    22. 

  22. --- openjdk.orig/jdk/make/sun/awt/make.depend	2011-02-16 00:40:21.000000000 +0000
    23. 

  23. +++ openjdk/jdk/make/sun/awt/make.depend	2011-02-16 01:27:25.000326551 +0000
    24. 

  24. @@ -16,7 +16,7 @@
    25. 

  25.  
    26. 

  26.  $(OBJDIR)/awt_AWTEvent.obj::	$(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Unicode.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    27. 

  27.  
    28. 

  28. -$(OBJDIR)/awt_BitmapUtil.obj::	../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    29. 

  29. +$(OBJDIR)/awt_BitmapUtil.obj::	../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h ../../../src/windows/native/sun/awt/utility/rect.h
    30. 

  30.  
    31. 

  31.  $(OBJDIR)/awt_Brush.obj::	$(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    32. 

  32.  
    33. 

  33. @@ -32,7 +32,7 @@
    34. 

  34.  
    35. 

  35.  $(OBJDIR)/awt_Color.obj::	$(CLASSHDRDIR)/sun_awt_windows_WColor.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Color.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    36. 

  36.  
    37. 

  37. -$(OBJDIR)/awt_Component.obj::	$(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Color.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_InputMethodEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_MouseWheelEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Insets.h $(CLASSHDRDIR)/java_awt_KeyboardFocusManager.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Toolkit.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WInputMethod.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPanelPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/jawt.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Cursor.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dimension.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_InputEvent.h ../../../src/windows/native/sun/windows/awt_InputTextInfor.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/awt_KeyboardFocusManager.h ../../../src/windows/native/sun/windows/awt_KeyEvent.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_MouseEvent.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Unicode.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    38. 

  38. +$(OBJDIR)/awt_Component.obj::	$(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Color.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_InputMethodEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_MouseWheelEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Insets.h $(CLASSHDRDIR)/java_awt_KeyboardFocusManager.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Toolkit.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WInputMethod.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPanelPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/jawt.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Cursor.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dimension.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_InputEvent.h ../../../src/windows/native/sun/windows/awt_InputTextInfor.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/awt_KeyboardFocusManager.h ../../../src/windows/native/sun/windows/awt_KeyEvent.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_MouseEvent.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Unicode.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h ../../../src/windows/native/sun/awt/utility/rect.h
    39. 

  39.  
    40. 

  40.  $(OBJDIR)/awt_Container.obj::	../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    41. 

  41.  
    42. 

  42. @@ -150,9 +150,9 @@
    43. 

  43.  
    44. 

  44.  $(OBJDIR)/awt_Window.obj::	$(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Container.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_ComponentEvent.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_FileDialog.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Insets.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFileDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_dlls.h ../../../src/windows/native/sun/windows/awt_FileDialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_IconCursor.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Panel.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PrintDialog.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Unicode.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    45. 

  45.  
    46. 

  46. -$(OBJDIR)/Blit.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_Blit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    47. 

  47. +$(OBJDIR)/Blit.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_Blit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h
    48. 

  48.  
    49. 

  49. -$(OBJDIR)/BlitBg.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_BlitBg.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    50. 

  50. +$(OBJDIR)/BlitBg.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_BlitBg.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h
    51. 

  51.  
    52. 

  52.  $(OBJDIR)/BufferedMaskBlit.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedMaskBlit.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedOpCodes.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntBgr.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    53. 

  53.  
    54. 

  54. @@ -246,11 +246,11 @@
    55. 

  55.  
    56. 

  56.  $(OBJDIR)/GDIRenderer.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_geom_PathIterator.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_windows_GDIRenderer.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Unicode.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    57. 

  57.  
    58. 

  58. -$(OBJDIR)/GDIWindowSurfaceData.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_windows_GDIWindowSurfaceData.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/Disposer.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/java2d/windows/WindowsFlags.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Unicode.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    59. 

  59. +$(OBJDIR)/GDIWindowSurfaceData.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_windows_GDIWindowSurfaceData.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/Disposer.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/java2d/windows/WindowsFlags.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Unicode.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h 
    60. 

  60.  
    61. 

  61.  $(OBJDIR)/gifdecoder.obj::	../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h
    62. 

  62.  
    63. 

  63. -$(OBJDIR)/GraphicsPrimitiveMgr.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_GraphicsPrimitiveMgr.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    64. 

  64. +$(OBJDIR)/GraphicsPrimitiveMgr.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_GraphicsPrimitiveMgr.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h
    65. 

  65.  
    66. 

  66.  $(OBJDIR)/Hashtable.obj::	$(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    67. 

  67.  
    68. 

  68. @@ -278,7 +278,7 @@
    69. 

  69.  
    70. 

  70.  $(OBJDIR)/IntRgbx.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/IntRgbx.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    71. 

  71.  
    72. 

  72. -$(OBJDIR)/MaskBlit.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_MaskBlit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    73. 

  73. +$(OBJDIR)/MaskBlit.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_MaskBlit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/awt/utility/rect.h
    74. 

  74.  
    75. 

  75.  $(OBJDIR)/MaskFill.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_MaskFill.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    76. 

  76.  
    77. 

  77. @@ -290,7 +290,7 @@
    78. 

  78.  
    79. 

  79.  $(OBJDIR)/OGLBufImgOps.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLBufImgOps.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
    80. 

  80.  
    81. 

  81. -$(OBJDIR)/OGLContext.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
    82. 

  82. +$(OBJDIR)/OGLContext.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h ../../../src/windows/native/sun/awt/utility/rect.h
    83. 

  83.  
    84. 

  84.  $(OBJDIR)/OGLFuncs.obj::	../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h
    85. 

  85.  
    86. 

  86. @@ -312,11 +312,11 @@
    87. 

  87.  
    88. 

  88.  $(OBJDIR)/ProcessPath.obj::	$(CLASSHDRDIR)/java_awt_geom_PathIterator.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/ProcessPath.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    89. 

  89.  
    90. 

  90. -$(OBJDIR)/Region.obj::	../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h
    91. 

  91. +$(OBJDIR)/Region.obj::	../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h
    92. 

  92.  
    93. 

  93.  $(OBJDIR)/RenderBuffer.obj::	$(CLASSHDRDIR)/sun_java2d_pipe_RenderBuffer.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h
    94. 

  94.  
    95. 

  95. -$(OBJDIR)/ScaledBlit.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_ScaledBlit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    96. 

  96. +$(OBJDIR)/ScaledBlit.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_ScaledBlit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/awt/utility/rect.h
    97. 

  97.  
    98. 

  98.  $(OBJDIR)/ShapeSpanIterator.obj::	$(CLASSHDRDIR)/java_awt_geom_PathIterator.h $(CLASSHDRDIR)/sun_java2d_pipe_ShapeSpanIterator.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/pipe/PathConsumer2D.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    99. 

  99.  
    100. 

  100. @@ -332,7 +332,7 @@
    101. 

  101.  
    102. 

  102.  $(OBJDIR)/Trace.obj::	../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h
    103. 

  103.  
    104. 

  104. -$(OBJDIR)/TransformHelper.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_loops_TransformHelper.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h
    105. 

  105. +$(OBJDIR)/TransformHelper.obj::	$(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_loops_TransformHelper.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/awt/utility/rect.h
    106. 

  106.  
    107. 

  107.  $(OBJDIR)/UnicowsLoader.obj::	../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
    108. 

  108.  
    109. 

  109. diff -Nru openjdk.orig/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile
    110. 

  110. --- openjdk.orig/jdk/make/sun/awt/Makefile	2011-02-16 00:40:21.000000000 +0000
    111. 

  111. +++ openjdk/jdk/make/sun/awt/Makefile	2011-02-16 01:27:24.996326861 +0000
    112. 

  112. @@ -1,5 +1,5 @@
    113. 

  113.  #
    114. 

  114. -# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
    115. 

  115. +# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
    116. 

  116.  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    117. 

  117.  #
    118. 

  118.  # This code is free software; you can redistribute it and/or modify it
    119. 

  119. @@ -224,6 +224,7 @@
    120. 

  120.  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/shell
    121. 

  121.  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/medialib
    122. 

  122.  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/debug
    123. 

  123. +vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/utility
    124. 

  124.  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d
    125. 

  125.  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops
    126. 

  126.  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe
    127. 

  127. diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers openjdk/jdk/make/sun/awt/mapfile-mawt-vers
    128. 

  128. --- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers	2011-02-16 00:40:21.000000000 +0000
    129. 

  129. +++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers	2011-02-16 01:27:25.000326551 +0000
    130. 

  130. @@ -291,6 +291,7 @@
    131. 

  131.  		Java_sun_awt_X11GraphicsConfig_createBackBuffer;
    132. 

  132.  		Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
    133. 

  133.  		Java_sun_awt_X11GraphicsConfig_swapBuffers;
    134. 

  134. +                Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
    135. 

  135.  		Java_sun_awt_X11GraphicsDevice_isDBESupported;
    136. 

  136.  		Java_sun_awt_X11GraphicsDevice_getDisplay;
    137. 

  137.  		Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
    138. 

  138. diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux openjdk/jdk/make/sun/awt/mapfile-vers-linux
    139. 

  139. --- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux	2011-02-16 00:40:21.000000000 +0000
    140. 

  140. +++ openjdk/jdk/make/sun/awt/mapfile-vers-linux	2011-02-16 01:27:25.000326551 +0000
    141. 

  141. @@ -406,6 +406,7 @@
    142. 

  142.  		Java_sun_awt_X11GraphicsConfig_getNumColors;
    143. 

  143.  		Java_sun_awt_X11GraphicsConfig_getXResolution;
    144. 

  144.  		Java_sun_awt_X11GraphicsConfig_getYResolution;
    145. 

  145. +                Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
    146. 

  146.  		Java_sun_awt_X11GraphicsDevice_isDBESupported;
    147. 

  147.  		Java_sun_awt_X11GraphicsDevice_getDisplay;
    148. 

  148.  		Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
    149. 

  149. diff -Nru openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers
    150. 

  150. --- openjdk.orig/jdk/make/sun/xawt/mapfile-vers	2011-02-16 00:40:21.000000000 +0000
    151. 

  151. +++ openjdk/jdk/make/sun/xawt/mapfile-vers	2011-02-16 01:27:25.000326551 +0000
    152. 

  152. @@ -216,6 +216,7 @@
    153. 

  153.          Java_sun_awt_X11GraphicsConfig_createBackBuffer;
    154. 

  154.  	Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
    155. 

  155.  	Java_sun_awt_X11GraphicsConfig_swapBuffers;
    156. 

  156. +	Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
    157. 

  157.          Java_java_awt_Insets_initIDs;
    158. 

  158.          Java_java_awt_KeyboardFocusManager_initIDs;
    159. 

  159.          Java_java_awt_Font_initIDs;
    160. 

  160. diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/awt/AWTUtilities.java openjdk/jdk/src/share/classes/com/sun/awt/AWTUtilities.java
    161. 

  161. --- openjdk.orig/jdk/src/share/classes/com/sun/awt/AWTUtilities.java	2011-02-16 00:40:21.000000000 +0000
    162. 

  162. +++ openjdk/jdk/src/share/classes/com/sun/awt/AWTUtilities.java	2011-02-16 01:27:25.000326551 +0000
    163. 

  163. @@ -26,17 +26,37 @@
    164. 

  164.  package com.sun.awt;
    165. 

  165.  
    166. 

  166.  import java.awt.*;
    167. 

  167. -import sun.awt.AWTAccessor;
    168. 

  168.  
    169. 

  169. +import sun.awt.AWTAccessor;
    170. 

  170. +import sun.awt.SunToolkit;
    171. 

  171.  
    172. 

  172.  /**
    173. 

  173.   * A collection of utility methods for AWT.
    174. 

  174.   *
    175. 

  175.   * The functionality provided by the static methods of the class includes:
    176. 

  176.   * <ul>
    177. 

  177. + * <li>Setting shapes on top-level windows
    178. 

  178. + * <li>Setting a constant alpha value for each pixel of a top-level window
    179. 

  179. + * <li>Making a window non-opaque, after that it paints only explicitly
    180. 

  180. + * painted pixels on the screen, with arbitrary alpha values for every pixel.
    181. 

  181.   * <li>Setting a 'mixing-cutout' shape for a component.
    182. 

  182.   * </ul>
    183. 

  183.   * <p>
    184. 

  184. + * A "top-level window" is an instance of the {@code Window} class (or its
    185. 

  185. + * descendant, such as {@code JFrame}).
    186. 

  186. + * <p>
    187. 

  187. + * Some of the mentioned features may not be supported by the native platform.
    188. 

  188. + * To determine whether a particular feature is supported, the user must use
    189. 

  189. + * the {@code isTranslucencySupported()} method of the class passing a desired
    190. 

  190. + * translucency kind (a member of the {@code Translucency} enum) as an
    191. 

  191. + * argument.
    192. 

  192. + * <p>
    193. 

  193. + * The per-pixel alpha feature also requires the user to create her/his
    194. 

  194. + * windows using a translucency-capable graphics configuration.
    195. 

  195. + * The {@code isTranslucencyCapable()} method must
    196. 

  196. + * be used to verify whether any given GraphicsConfiguration supports
    197. 

  197. + * the trasnlcency effects.
    198. 

  198. + * <p>
    199. 

  199.   * <b>WARNING</b>: This class is an implementation detail and only meant
    200. 

  200.   * for limited use outside of the core platform. This API may change
    201. 

  201.   * drastically between update release, and it may even be
    202. 

  202. @@ -50,6 +70,344 @@
    203. 

  203.      private AWTUtilities() {
    204. 

  204.      }
    205. 

  205.  
    206. 

  206. +    /** Kinds of translucency supported by the underlying system.
    207. 

  207. +     *  @see #isTranslucencySupported
    208. 

  208. +     */
    209. 

  209. +    public static enum Translucency {
    210. 

  210. +        /**
    211. 

  211. +         * Represents support in the underlying system for windows each pixel
    212. 

  212. +         * of which is guaranteed to be either completely opaque, with
    213. 

  213. +         * an alpha value of 1.0, or completely transparent, with an alpha
    214. 

  214. +         * value of 0.0.
    215. 

  215. +         */
    216. 

  216. +        PERPIXEL_TRANSPARENT,
    217. 

  217. +
    218. 

  218. +        /**
    219. 

  219. +         * Represents support in the underlying system for windows all of
    220. 

  220. +         * the pixels of which have the same alpha value between or including
    221. 

  221. +         * 0.0 and 1.0.
    222. 

  222. +         */
    223. 

  223. +        TRANSLUCENT,
    224. 

  224. +
    225. 

  225. +        /**
    226. 

  226. +         * Represents support in the underlying system for windows that
    227. 

  227. +         * contain or might contain pixels with arbitrary alpha values
    228. 

  228. +         * between and including 0.0 and 1.0.
    229. 

  229. +         */
    230. 

  230. +        PERPIXEL_TRANSLUCENT;
    231. 

  231. +    }
    232. 

  232. +
    233. 

  233. +
    234. 

  234. +    /**
    235. 

  235. +     * Returns whether the given level of translucency is supported by
    236. 

  236. +     * the underlying system.
    237. 

  237. +     *
    238. 

  238. +     * Note that this method may sometimes return the value
    239. 

  239. +     * indicating that the particular level is supported, but
    240. 

  240. +     * the native windowing system may still not support the
    241. 

  241. +     * given level of translucency (due to the bugs in
    242. 

  242. +     * the windowing system).
    243. 

  243. +     *
    244. 

  244. +     * @param translucencyKind a kind of translucency support
    245. 

  245. +     *                         (either PERPIXEL_TRANSPARENT,
    246. 

  246. +     *                         TRANSLUCENT, or PERPIXEL_TRANSLUCENT)
    247. 

  247. +     * @return whether the given translucency kind is supported
    248. 

  248. +     */
    249. 

  249. +    public static boolean isTranslucencySupported(Translucency translucencyKind) {
    250. 

  250. +        switch (translucencyKind) {
    251. 

  251. +            case PERPIXEL_TRANSPARENT:
    252. 

  252. +                return isWindowShapingSupported();
    253. 

  253. +            case TRANSLUCENT:
    254. 

  254. +                return isWindowOpacitySupported();
    255. 

  255. +            case PERPIXEL_TRANSLUCENT:
    256. 

  256. +                return isWindowTranslucencySupported();
    257. 

  257. +        }
    258. 

  258. +        return false;
    259. 

  259. +    }
    260. 

  260. +
    261. 

  261. +
    262. 

  262. +    /**
    263. 

  263. +     * Returns whether the windowing system supports changing the opacity
    264. 

  264. +     * value of top-level windows.
    265. 

  265. +     * Note that this method may sometimes return true, but the native
    266. 

  266. +     * windowing system may still not support the concept of
    267. 

  267. +     * translucency (due to the bugs in the windowing system).
    268. 

  268. +     */
    269. 

  269. +    private static boolean isWindowOpacitySupported() {
    270. 

  270. +        Toolkit curToolkit = Toolkit.getDefaultToolkit();
    271. 

  271. +        if (!(curToolkit instanceof SunToolkit)) {
    272. 

  272. +            return false;
    273. 

  273. +        }
    274. 

  274. +        return ((SunToolkit)curToolkit).isWindowOpacitySupported();
    275. 

  275. +    }
    276. 

  276. +
    277. 

  277. +    /**
    278. 

  278. +     * Set the opacity of the window. The opacity is at the range [0..1].
    279. 

  279. +     * Note that setting the opacity level of 0 may or may not disable
    280. 

  280. +     * the mouse event handling on this window. This is
    281. 

  281. +     * a platform-dependent behavior.
    282. 

  282. +     *
    283. 

  283. +     * In order for this method to enable the translucency effect,
    284. 

  284. +     * the isTranslucencySupported() method should indicate that the
    285. 

  285. +     * TRANSLUCENT level of translucency is supported.
    286. 

  286. +     *
    287. 

  287. +     * <p>Also note that the window must not be in the full-screen mode
    288. 

  288. +     * when setting the opacity value &lt; 1.0f. Otherwise
    289. 

  289. +     * the IllegalArgumentException is thrown.
    290. 

  290. +     *
    291. 

  291. +     * @param window the window to set the opacity level to
    292. 

  292. +     * @param opacity the opacity level to set to the window
    293. 

  293. +     * @throws NullPointerException if the window argument is null
    294. 

  294. +     * @throws IllegalArgumentException if the opacity is out of
    295. 

  295. +     *                                  the range [0..1]
    296. 

  296. +     * @throws IllegalArgumentException if the window is in full screen mode,
    297. 

  297. +     *                                  and the opacity is less than 1.0f
    298. 

  298. +     * @throws UnsupportedOperationException if the TRANSLUCENT translucency
    299. 

  299. +     *                                       kind is not supported
    300. 

  300. +     */
    301. 

  301. +    public static void setWindowOpacity(Window window, float opacity) {
    302. 

  302. +        if (window == null) {
    303. 

  303. +            throw new NullPointerException(
    304. 

  304. +                    "The window argument should not be null.");
    305. 

  305. +        }
    306. 

  306. +
    307. 

  307. +        AWTAccessor.getWindowAccessor().setOpacity(window, opacity);
    308. 

  308. +    }
    309. 

  309. +
    310. 

  310. +    /**
    311. 

  311. +     * Get the opacity of the window. If the opacity has not
    312. 

  312. +     * yet being set, this method returns 1.0.
    313. 

  313. +     *
    314. 

  314. +     * @param window the window to get the opacity level from
    315. 

  315. +     * @throws NullPointerException if the window argument is null
    316. 

  316. +     */
    317. 

  317. +    public static float getWindowOpacity(Window window) {
    318. 

  318. +        if (window == null) {
    319. 

  319. +            throw new NullPointerException(
    320. 

  320. +                    "The window argument should not be null.");
    321. 

  321. +        }
    322. 

  322. +
    323. 

  323. +        return AWTAccessor.getWindowAccessor().getOpacity(window);
    324. 

  324. +    }
    325. 

  325. +
    326. 

  326. +    /**
    327. 

  327. +     * Returns whether the windowing system supports changing the shape
    328. 

  328. +     * of top-level windows.
    329. 

  329. +     * Note that this method may sometimes return true, but the native
    330. 

  330. +     * windowing system may still not support the concept of
    331. 

  331. +     * shaping (due to the bugs in the windowing system).
    332. 

  332. +     */
    333. 

  333. +    public static boolean isWindowShapingSupported() {
    334. 

  334. +        Toolkit curToolkit = Toolkit.getDefaultToolkit();
    335. 

  335. +        if (!(curToolkit instanceof SunToolkit)) {
    336. 

  336. +            return false;
    337. 

  337. +        }
    338. 

  338. +        return ((SunToolkit)curToolkit).isWindowShapingSupported();
    339. 

  339. +    }
    340. 

  340. +
    341. 

  341. +    /**
    342. 

  342. +     * Returns an object that implements the Shape interface and represents
    343. 

  343. +     * the shape previously set with the call to the setWindowShape() method.
    344. 

  344. +     * If no shape has been set yet, or the shape has been reset to null,
    345. 

  345. +     * this method returns null.
    346. 

  346. +     *
    347. 

  347. +     * @param window the window to get the shape from
    348. 

  348. +     * @return the current shape of the window
    349. 

  349. +     * @throws NullPointerException if the window argument is null
    350. 

  350. +     */
    351. 

  351. +    public static Shape getWindowShape(Window window) {
    352. 

  352. +        if (window == null) {
    353. 

  353. +            throw new NullPointerException(
    354. 

  354. +                    "The window argument should not be null.");
    355. 

  355. +        }
    356. 

  356. +        return AWTAccessor.getWindowAccessor().getShape(window);
    357. 

  357. +    }
    358. 

  358. +
    359. 

  359. +    /**
    360. 

  360. +     * Sets a shape for the given window.
    361. 

  361. +     * If the shape argument is null, this methods restores
    362. 

  362. +     * the default shape making the window rectangular.
    363. 

  363. +     * <p>Note that in order to set a shape, the window must be undecorated.
    364. 

  364. +     * If the window is decorated, this method ignores the {@code shape}
    365. 

  365. +     * argument and resets the shape to null.
    366. 

  366. +     * <p>Also note that the window must not be in the full-screen mode
    367. 

  367. +     * when setting a non-null shape. Otherwise the IllegalArgumentException
    368. 

  368. +     * is thrown.
    369. 

  369. +     * <p>Depending on the platform, the method may return without
    370. 

  370. +     * effecting the shape of the window if the window has a non-null warning
    371. 

  371. +     * string ({@link Window#getWarningString()}). In this case the passed
    372. 

  372. +     * shape object is ignored.
    373. 

  373. +     *
    374. 

  374. +     * @param window the window to set the shape to
    375. 

  375. +     * @param shape the shape to set to the window
    376. 

  376. +     * @throws NullPointerException if the window argument is null
    377. 

  377. +     * @throws IllegalArgumentException if the window is in full screen mode,
    378. 

  378. +     *                                  and the shape is not null
    379. 

  379. +     * @throws UnsupportedOperationException if the PERPIXEL_TRANSPARENT
    380. 

  380. +     *                                       translucency kind is not supported
    381. 

  381. +     */
    382. 

  382. +    public static void setWindowShape(Window window, Shape shape) {
    383. 

  383. +        if (window == null) {
    384. 

  384. +            throw new NullPointerException(
    385. 

  385. +                    "The window argument should not be null.");
    386. 

  386. +        }
    387. 

  387. +        AWTAccessor.getWindowAccessor().setShape(window, shape);
    388. 

  388. +    }
    389. 

  389. +
    390. 

  390. +    private static boolean isWindowTranslucencySupported() {
    391. 

  391. +        /*
    392. 

  392. +         * Per-pixel alpha is supported if all the conditions are TRUE:
    393. 

  393. +         *    1. The toolkit is a sort of SunToolkit
    394. 

  394. +         *    2. The toolkit supports translucency in general
    395. 

  395. +         *        (isWindowTranslucencySupported())
    396. 

  396. +         *    3. There's at least one translucency-capable
    397. 

  397. +         *        GraphicsConfiguration
    398. 

  398. +         */
    399. 

  399. +
    400. 

  400. +        Toolkit curToolkit = Toolkit.getDefaultToolkit();
    401. 

  401. +        if (!(curToolkit instanceof SunToolkit)) {
    402. 

  402. +            return false;
    403. 

  403. +        }
    404. 

  404. +
    405. 

  405. +        if (!((SunToolkit)curToolkit).isWindowTranslucencySupported()) {
    406. 

  406. +            return false;
    407. 

  407. +        }
    408. 

  408. +
    409. 

  409. +        GraphicsEnvironment env =
    410. 

  410. +            GraphicsEnvironment.getLocalGraphicsEnvironment();
    411. 

  411. +
    412. 

  412. +        // If the default GC supports translucency return true.
    413. 

  413. +        // It is important to optimize the verification this way,
    414. 

  414. +        // see CR 6661196 for more details.
    415. 

  415. +        if (isTranslucencyCapable(env.getDefaultScreenDevice()
    416. 

  416. +                    .getDefaultConfiguration()))
    417. 

  417. +        {
    418. 

  418. +            return true;
    419. 

  419. +        }
    420. 

  420. +
    421. 

  421. +        // ... otherwise iterate through all the GCs.
    422. 

  422. +        GraphicsDevice[] devices = env.getScreenDevices();
    423. 

  423. +
    424. 

  424. +        for (int i = 0; i < devices.length; i++) {
    425. 

  425. +            GraphicsConfiguration[] configs = devices[i].getConfigurations();
    426. 

  426. +            for (int j = 0; j < configs.length; j++) {
    427. 

  427. +                if (isTranslucencyCapable(configs[j])) {
    428. 

  428. +                    return true;
    429. 

  429. +                }
    430. 

  430. +            }
    431. 

  431. +        }
    432. 

  432. +
    433. 

  433. +        return false;
    434. 

  434. +    }
    435. 

  435. +
    436. 

  436. +    /**
    437. 

  437. +     * Enables the per-pixel alpha support for the given window.
    438. 

  438. +     * Once the window becomes non-opaque (the isOpaque is set to false),
    439. 

  439. +     * the drawing sub-system is starting to respect the alpha value of each
    440. 

  440. +     * separate pixel. If a pixel gets painted with alpha color component
    441. 

  441. +     * equal to zero, it becomes visually transparent, if the alpha of the
    442. 

  442. +     * pixel is equal to 255, the pixel is fully opaque. Interim values
    443. 

  443. +     * of the alpha color component make the pixel semi-transparent (i.e.
    444. 

  444. +     * translucent).
    445. 

  445. +     * <p>Note that in order for the window to support the per-pixel alpha
    446. 

  446. +     * mode, the window must be created using the GraphicsConfiguration
    447. 

  447. +     * for which the {@link #isTranslucencyCapable}
    448. 

  448. +     * method returns true.
    449. 

  449. +     * <p>Also note that some native systems enable the per-pixel translucency
    450. 

  450. +     * mode for any window created using the translucency-compatible
    451. 

  451. +     * graphics configuration. However, it is highly recommended to always
    452. 

  452. +     * invoke the setWindowOpaque() method for these windows, at least for
    453. 

  453. +     * the sake of cross-platform compatibility reasons.
    454. 

  454. +     * <p>Also note that the window must not be in the full-screen mode
    455. 

  455. +     * when making it non-opaque. Otherwise the IllegalArgumentException
    456. 

  456. +     * is thrown.
    457. 

  457. +     * <p>If the window is a {@code Frame} or a {@code Dialog}, the window must
    458. 

  458. +     * be undecorated prior to enabling the per-pixel translucency effect (see
    459. 

  459. +     * {@link Frame#setUndecorated()} and/or {@link Dialog#setUndecorated()}).
    460. 

  460. +     * If the window becomes decorated through a subsequent call to the
    461. 

  461. +     * corresponding {@code setUndecorated()} method, the per-pixel
    462. 

  462. +     * translucency effect will be disabled and the opaque property reset to
    463. 

  463. +     * {@code true}.
    464. 

  464. +     * <p>Depending on the platform, the method may return without
    465. 

  465. +     * effecting the opaque property of the window if the window has a non-null
    466. 

  466. +     * warning string ({@link Window#getWarningString()}). In this case
    467. 

  467. +     * the passed 'isOpaque' value is ignored.
    468. 

  468. +     *
    469. 

  469. +     * @param window the window to set the shape to
    470. 

  470. +     * @param isOpaque whether the window must be opaque (true),
    471. 

  471. +     *                 or translucent (false)
    472. 

  472. +     * @throws NullPointerException if the window argument is null
    473. 

  473. +     * @throws IllegalArgumentException if the window uses
    474. 

  474. +     *                                  a GraphicsConfiguration for which the
    475. 

  475. +     *                                  {@code isTranslucencyCapable()}
    476. 

  476. +     *                                  method returns false
    477. 

  477. +     * @throws IllegalArgumentException if the window is in full screen mode,
    478. 

  478. +     *                                  and the isOpaque is false
    479. 

  479. +     * @throws IllegalArgumentException if the window is decorated and the
    480. 

  480. +     * isOpaque argument is {@code false}.
    481. 

  481. +     * @throws UnsupportedOperationException if the PERPIXEL_TRANSLUCENT
    482. 

  482. +     *                                       translucency kind is not supported
    483. 

  483. +     */
    484. 

  484. +    public static void setWindowOpaque(Window window, boolean isOpaque) {
    485. 

  485. +        if (window == null) {
    486. 

  486. +            throw new NullPointerException(
    487. 

  487. +                    "The window argument should not be null.");
    488. 

  488. +        }
    489. 

  489. +        if (!isOpaque && !isTranslucencySupported(Translucency.PERPIXEL_TRANSLUCENT)) {
    490. 

  490. +            throw new UnsupportedOperationException(
    491. 

  491. +                    "The PERPIXEL_TRANSLUCENT translucency kind is not supported");
    492. 

  492. +        }
    493. 

  493. +        AWTAccessor.getWindowAccessor().setOpaque(window, isOpaque);
    494. 

  494. +    }
    495. 

  495. +
    496. 

  496. +    /**
    497. 

  497. +     * Returns whether the window is opaque or translucent.
    498. 

  498. +     *
    499. 

  499. +     * @param window the window to set the shape to
    500. 

  500. +     * @return whether the window is currently opaque (true)
    501. 

  501. +     *         or translucent (false)
    502. 

  502. +     * @throws NullPointerException if the window argument is null
    503. 

  503. +     */
    504. 

  504. +    public static boolean isWindowOpaque(Window window) {
    505. 

  505. +        if (window == null) {
    506. 

  506. +            throw new NullPointerException(
    507. 

  507. +                    "The window argument should not be null.");
    508. 

  508. +        }
    509. 

  509. +
    510. 

  510. +        return AWTAccessor.getWindowAccessor().isOpaque(window);
    511. 

  511. +    }
    512. 

  512. +
    513. 

  513. +    /**
    514. 

  514. +     * Verifies whether a given GraphicsConfiguration supports
    515. 

  515. +     * the PERPIXEL_TRANSLUCENT kind of translucency.
    516. 

  516. +     * All windows that are intended to be used with the {@link #setWindowOpaque}
    517. 

  517. +     * method must be created using a GraphicsConfiguration for which this method
    518. 

  518. +     * returns true.
    519. 

  519. +     * <p>Note that some native systems enable the per-pixel translucency
    520. 

  520. +     * mode for any window created using a translucency-capable
    521. 

  521. +     * graphics configuration. However, it is highly recommended to always
    522. 

  522. +     * invoke the setWindowOpaque() method for these windows, at least
    523. 

  523. +     * for the sake of cross-platform compatibility reasons.
    524. 

  524. +     *
    525. 

  525. +     * @param gc GraphicsConfiguration
    526. 

  526. +     * @throws NullPointerException if the gc argument is null
    527. 

  527. +     * @return whether the given GraphicsConfiguration supports
    528. 

  528. +     *         the translucency effects.
    529. 

  529. +     */
    530. 

  530. +    public static boolean isTranslucencyCapable(GraphicsConfiguration gc) {
    531. 

  531. +        if (gc == null) {
    532. 

  532. +            throw new NullPointerException("The gc argument should not be null");
    533. 

  533. +        }
    534. 

  534. +        /*
    535. 

  535. +        return gc.isTranslucencyCapable();
    536. 

  536. +        */
    537. 

  537. +        Toolkit curToolkit = Toolkit.getDefaultToolkit();
    538. 

  538. +        if (!(curToolkit instanceof SunToolkit)) {
    539. 

  539. +            return false;
    540. 

  540. +        }
    541. 

  541. +        return ((SunToolkit)curToolkit).isTranslucencyCapable(gc);
    542. 

  542. +    }
    543. 

  543. +
    544. 

  544.      /**
    545. 

  545.       * Sets a 'mixing-cutout' shape for the given component.
    546. 

  546.       *
    547. 

  547. diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/Component.java openjdk/jdk/src/share/classes/java/awt/Component.java
    548. 

  548. --- openjdk.orig/jdk/src/share/classes/java/awt/Component.java	2011-02-16 00:40:21.000000000 +0000
    549. 

  549. +++ openjdk/jdk/src/share/classes/java/awt/Component.java	2011-02-16 02:00:18.147235768 +0000
    550. 

  550. @@ -1,5 +1,5 @@
    551. 

  551.  /*
    552. 

  552. - * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
    553. 

  553. + * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
    554. 

  554.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    555. 

  555.   *
    556. 

  556.   * This code is free software; you can redistribute it and/or modify it
    557. 

  557. @@ -806,18 +806,27 @@
    558. 

  558.              }
    559. 

  559.      }
    560. 

  560.  
    561. 

  561. -    static {
    562. 

  562. -        AWTAccessor.setComponentAccessor(new AWTAccessor.ComponentAccessor() {
    563. 

  563. -                public AccessControlContext getAccessControlContext(Component comp) {
    564. 

  564. -                    return comp.getAccessControlContext();
    565. 

  565. -                }
    566. 

  566. -
    567. 

  567. -            });
    568. 

  568. -    }
    569. 

  569. -
    570. 

  570. +    // Whether this Component has had the background erase flag
    571. 

  571. +    // specified via SunToolkit.disableBackgroundErase(). This is
    572. 

  572. +    // needed in order to make this function work on X11 platforms,
    573. 

  573. +    // where currently there is no chance to interpose on the creation
    574. 

  574. +    // of the peer and therefore the call to XSetBackground.
    575. 

  575. +    transient boolean backgroundEraseDisabled;
    576. 

  576.  
    577. 

  577.      static {
    578. 

  578.          AWTAccessor.setComponentAccessor(new AWTAccessor.ComponentAccessor() {
    579. 

  579. +            public AccessControlContext getAccessControlContext(Component comp) {
    580. 

  580. +                return comp.getAccessControlContext();
    581. 

  581. +            }
    582. 

  582. +            public void setBackgroundEraseDisabled(Component comp, boolean disabled) {
    583. 

  583. +                comp.backgroundEraseDisabled = disabled;
    584. 

  584. +            }
    585. 

  585. +            public boolean getBackgroundEraseDisabled(Component comp) {
    586. 

  586. +                return comp.backgroundEraseDisabled;
    587. 

  587. +            }
    588. 

  588. +            public Rectangle getBounds(Component comp) {
    589. 

  589. +                return new Rectangle(comp.x, comp.y, comp.width, comp.height);
    590. 

  590. +            }
    591. 

  591.              public void setMixingCutoutShape(Component comp, Shape shape) {
    592. 

  592.                  Region region = shape == null ?  null :
    593. 

  593.                      Region.getInstance(shape, null);
    594. 

  594. @@ -7454,7 +7463,7 @@
    595. 

  595.              // sometimes most recent focus owner may be null, but focus owner is not
    596. 

  596.              // e.g. we reset most recent focus owner if user removes focus owner
    597. 

  597.              focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
    598. 

  598. -            if (focusOwner != null && getContainingWindow(focusOwner) != window) {
    599. 

  599. +            if (focusOwner != null && focusOwner.getContainingWindow() != window) {
    600. 

  600.                  focusOwner = null;
    601. 

  601.              }
    602. 

  602.          }
    603. 

  603. @@ -8685,30 +8694,8 @@
    604. 

  604.       *         null, if component is not a part of window hierarchy
    605. 

  605.       */
    606. 

  606.      Window getContainingWindow() {
    607. 

  607. -        return getContainingWindow(this);
    608. 

  608. +        return SunToolkit.getContainingWindow(this);
    609. 

  609.      }
    610. 

  610. -    /**
    611. 

  611. -     * Returns the <code>Window</code> ancestor of the component <code>comp</code>.
    612. 

  612. -     * @return Window ancestor of the component or component by itself if it is Window;
    613. 

  613. -     *         null, if component is not a part of window hierarchy
    614. 

  614. -     */
    615. 

  615. -    static Window getContainingWindow(Component comp) {
    616. 

  616. -        while (comp != null && !(comp instanceof Window)) {
    617. 

  617. -            comp = comp.getParent();
    618. 

  618. -        }
    619. 

  619. -
    620. 

  620. -        return (Window)comp;
    621. 

  621. -    }
    622. 

  622. -
    623. 

  623. -
    624. 

  624. -
    625. 

  625. -
    626. 

  626. -
    627. 

  627. -
    628. 

  628. -
    629. 

  629. -
    630. 

  630. -
    631. 

  631. -
    632. 

  632.  
    633. 

  633.      /**
    634. 

  634.       * Initialize JNI field and method IDs
    635. 

  635. @@ -9823,4 +9810,29 @@
    636. 

  636.      }
    637. 

  637.  
    638. 

  638.      // ****************** END OF MIXING CODE ********************************
    639. 

  639. +
    640. 

  640. +    private static boolean doesClassImplement(Class cls, String interfaceName) {
    641. 

  641. +        if (cls == null) return false;
    642. 

  642. +
    643. 

  643. +        for (Class c : cls.getInterfaces()) {
    644. 

  644. +            if (c.getName().equals(interfaceName)) {
    645. 

  645. +                return true;
    646. 

  646. +            }
    647. 

  647. +        }
    648. 

  648. +        return doesClassImplement(cls.getSuperclass(), interfaceName);
    649. 

  649. +    }
    650. 

  650. +
    651. 

  651. +    /**
    652. 

  652. +     * Checks that the given object implements the given interface.
    653. 

  653. +     * @param obj Object to be checked
    654. 

  654. +     * @param interfaceName The name of the interface. Must be fully-qualified interface name.
    655. 

  655. +     * @return true, if this object implements the given interface,
    656. 

  656. +     *         false, otherwise, or if obj or interfaceName is null
    657. 

  657. +     */
    658. 

  658. +    static boolean doesImplement(Object obj, String interfaceName) {
    659. 

  659. +        if (obj == null) return false;
    660. 

  660. +        if (interfaceName == null) return false;
    661. 

  661. +
    662. 

  662. +        return doesClassImplement(obj.getClass(), interfaceName);
    663. 

  663. +    }
    664. 

  664.  }
    665. 

  665. diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/Container.java openjdk/jdk/src/share/classes/java/awt/Container.java
    666. 

  666. --- openjdk.orig/jdk/src/share/classes/java/awt/Container.java	2011-02-16 00:40:21.000000000 +0000
    667. 

  667. +++ openjdk/jdk/src/share/classes/java/awt/Container.java	2011-02-16 01:27:25.004326241 +0000
    668. 

  668. @@ -1,5 +1,5 @@
    669. 

  669.  /*
    670. 

  670. - * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
    671. 

  671. + * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
    672. 

  672.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    673. 

  673.   *
    674. 

  674.   * This code is free software; you can redistribute it and/or modify it
    675. 

  675. @@ -167,6 +167,9 @@
    676. 

  676.      transient int listeningBoundsChildren;
    677. 

  677.      transient int descendantsCount;
    678. 

  678.  
    679. 

  679. +    /* Non-opaque window support -- see Window.setLayersOpaque */
    680. 

  680. +    transient Color preserveBackgroundColor = null;
    681. 

  681. +
    682. 

  682.      /**
    683. 

  683.       * JDK 1.1 serialVersionUID
    684. 

  684.       */
    685. 

  685. diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java openjdk/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java
    686. 

  686. --- openjdk.orig/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java	2011-02-16 00:40:21.000000000 +0000
    687. 

  687. +++ openjdk/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java	2011-02-16 01:27:25.004326241 +0000
    688. 

  688. @@ -480,7 +480,7 @@
    689. 

  689.                  // that a Component outside of the focused Window receives a
    690. 

  690.                  // FOCUS_GAINED event. We synthesize a WINDOW_GAINED_FOCUS
    691. 

  691.                  // event in that case.
    692. 

  692. -                final Window newFocusedWindow = Component.getContainingWindow(newFocusOwner);
    693. 

  693. +                final Window newFocusedWindow = SunToolkit.getContainingWindow(newFocusOwner);
    694. 

  694.                  final Window currentFocusedWindow = getGlobalFocusedWindow();
    695. 

  695.                  if (newFocusedWindow != null &&
    696. 

  696.                      newFocusedWindow != currentFocusedWindow)
    697. 

  697. diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/GraphicsConfiguration.java openjdk/jdk/src/share/classes/java/awt/GraphicsConfiguration.java
    698. 

  698. --- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsConfiguration.java	2011-01-20 23:54:13.000000000 +0000
    699. 

  699. +++ openjdk/jdk/src/share/classes/java/awt/GraphicsConfiguration.java	2011-02-16 01:27:25.004326241 +0000
    700. 

  700. @@ -1,5 +1,5 @@
    701. 

  701.  /*
    702. 

  702. - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    703. 

  703. + * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    704. 

  704.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    705. 

  705.   *
    706. 

  706.   * This code is free software; you can redistribute it and/or modify it
    707. 

  707. @@ -428,4 +428,20 @@
    708. 

  708.          }
    709. 

  709.          return defaultImageCaps;
    710. 

  710.      }
    711. 

  711. +
    712. 

  712. +    /**
    713. 

  713. +     * Returns whether this GraphicsConfiguration supports
    714. 

  714. +     * the {@link GraphicsDevice.WindowTranslucency#PERPIXEL_TRANSLUCENT
    715. 

  715. +     * PERPIXEL_TRANSLUCENT} kind of translucency.
    716. 

  716. +     *
    717. 

  717. +     * @param gc GraphicsConfiguration
    718. 

  718. +     * @throws NullPointerException if the gc argument is null
    719. 

  719. +     * @return whether the given GraphicsConfiguration supports
    720. 

  720. +     *         the translucency effects.
    721. 

  721. +     * @see Window#setBackground(Color)
    722. 

  722. +     */
    723. 

  723. +    /*public */boolean isTranslucencyCapable() {
    724. 

  724. +        // Overridden in subclasses
    725. 

  725. +        return false;
    726. 

  726.      }
    727. 

  727. +}
    728. 

  728. diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/GraphicsDevice.java openjdk/jdk/src/share/classes/java/awt/GraphicsDevice.java
    729. 

  729. --- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsDevice.java	2011-02-16 00:40:21.000000000 +0000
    730. 

  730. +++ openjdk/jdk/src/share/classes/java/awt/GraphicsDevice.java	2011-02-16 01:27:25.004326241 +0000
    731. 

  731. @@ -1,5 +1,5 @@
    732. 

  732.  /*
    733. 

  733. - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    734. 

  734. + * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    735. 

  735.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    736. 

  736.   *
    737. 

  737.   * This code is free software; you can redistribute it and/or modify it
    738. 

  738. @@ -27,7 +27,10 @@
    739. 

  739.  package java.awt;
    740. 

  740.  
    741. 

  741.  import java.awt.image.ColorModel;
    742. 

  742. +
    743. 

  743. +import sun.awt.AWTAccessor;
    744. 

  744.  import sun.awt.AppContext;
    745. 

  745. +import sun.awt.SunToolkit;
    746. 

  746.  
    747. 

  747.  /**
    748. 

  748.   * The <code>GraphicsDevice</code> class describes the graphics devices
    749. 

  749. @@ -109,6 +112,31 @@
    750. 

  750.       */
    751. 

  751.      public final static int TYPE_IMAGE_BUFFER           = 2;
    752. 

  752.  
    753. 

  753. +    /** Kinds of translucency supported by the underlying system.
    754. 

  754. +     *  @see #isTranslucencySupported
    755. 

  755. +     */
    756. 

  756. +    /*public */static enum WindowTranslucency {
    757. 

  757. +        /**
    758. 

  758. +         * Represents support in the underlying system for windows each pixel
    759. 

  759. +         * of which is guaranteed to be either completely opaque, with
    760. 

  760. +         * an alpha value of 1.0, or completely transparent, with an alpha
    761. 

  761. +         * value of 0.0.
    762. 

  762. +         */
    763. 

  763. +        PERPIXEL_TRANSPARENT,
    764. 

  764. +        /**
    765. 

  765. +         * Represents support in the underlying system for windows all of
    766. 

  766. +         * the pixels of which have the same alpha value between or including
    767. 

  767. +         * 0.0 and 1.0.
    768. 

  768. +         */
    769. 

  769. +        TRANSLUCENT,
    770. 

  770. +        /**
    771. 

  771. +         * Represents support in the underlying system for windows that
    772. 

  772. +         * contain or might contain pixels with arbitrary alpha values
    773. 

  773. +         * between and including 0.0 and 1.0.
    774. 

  774. +         */
    775. 

  775. +        PERPIXEL_TRANSLUCENT;
    776. 

  776. +    }
    777. 

  777. +
    778. 

  778.      /**
    779. 

  779.       * Returns the type of this <code>GraphicsDevice</code>.
    780. 

  780.       * @return the type of this <code>GraphicsDevice</code>, which can
    781. 

  781. @@ -235,6 +263,21 @@
    782. 

  782.       * @since 1.4
    783. 

  783.       */
    784. 

  784.      public void setFullScreenWindow(Window w) {
    785. 

  785. +        if (w != null) {
    786. 

  786. +            //XXX: The actions should be documented in some non-update release.
    787. 

  787. +            /*
    788. 

  788. +            if (w.getShape() != null) {
    789. 

  789. +                w.setShape(w, null);
    790. 

  790. +            }
    791. 

  791. +            if (!w.isOpaque()) {
    792. 

  792. +                w.setOpaque(false);
    793. 

  793. +            }
    794. 

  794. +            if (w.getOpacity() < 1.0f) {
    795. 

  795. +                w.setOpacity(1.0f);
    796. 

  796. +            }
    797. 

  797. +            */
    798. 

  798. +        }
    799. 

  799. +
    800. 

  800.          if (fullScreenWindow != null && windowedModeBounds != null) {
    801. 

  801.              // if the window went into fs mode before it was realized it may
    802. 

  802.              // have (0,0) dimensions
    803. 

  803. @@ -424,4 +467,94 @@
    804. 

  804.      public int getAvailableAcceleratedMemory() {
    805. 

  805.          return -1;
    806. 

  806.      }
    807. 

  807. +
    808. 

  808. +    /**
    809. 

  809. +     * Returns whether the given level of translucency is supported
    810. 

  810. +     * this graphics device.
    811. 

  811. +     *
    812. 

  812. +     * @param translucencyKind a kind of translucency support
    813. 

  813. +     * @return whether the given translucency kind is supported
    814. 

  814. +     */
    815. 

  815. +    /*public */boolean isWindowTranslucencySupported(WindowTranslucency translucencyKind) {
    816. 

  816. +        switch (translucencyKind) {
    817. 

  817. +            case PERPIXEL_TRANSPARENT:
    818. 

  818. +                return isWindowShapingSupported();
    819. 

  819. +            case TRANSLUCENT:
    820. 

  820. +                return isWindowOpacitySupported();
    821. 

  821. +            case PERPIXEL_TRANSLUCENT:
    822. 

  822. +                return isWindowPerpixelTranslucencySupported();
    823. 

  823. +        }
    824. 

  824. +        return false;
    825. 

  825. +    }
    826. 

  826. +
    827. 

  827. +    /**
    828. 

  828. +     * Returns whether the windowing system supports changing the shape
    829. 

  829. +     * of top-level windows.
    830. 

  830. +     * Note that this method may sometimes return true, but the native
    831. 

  831. +     * windowing system may still not support the concept of
    832. 

  832. +     * shaping (due to the bugs in the windowing system).
    833. 

  833. +     */
    834. 

  834. +    static boolean isWindowShapingSupported() {
    835. 

  835. +        Toolkit curToolkit = Toolkit.getDefaultToolkit();
    836. 

  836. +        if (!(curToolkit instanceof SunToolkit)) {
    837. 

  837. +            return false;
    838. 

  838. +        }
    839. 

  839. +        return ((SunToolkit)curToolkit).isWindowShapingSupported();
    840. 

  840. +    }
    841. 

  841. +
    842. 

  842. +    /**
    843. 

  843. +     * Returns whether the windowing system supports changing the opacity
    844. 

  844. +     * value of top-level windows.
    845. 

  845. +     * Note that this method may sometimes return true, but the native
    846. 

  846. +     * windowing system may still not support the concept of
    847. 

  847. +     * translucency (due to the bugs in the windowing system).
    848. 

  848. +     */
    849. 

  849. +    static boolean isWindowOpacitySupported() {
    850. 

  850. +        Toolkit curToolkit = Toolkit.getDefaultToolkit();
    851. 

  851. +        if (!(curToolkit instanceof SunToolkit)) {
    852. 

  852. +            return false;
    853. 

  853. +        }
    854. 

  854. +        return ((SunToolkit)curToolkit).isWindowOpacitySupported();
    855. 

  855. +    }
    856. 

  856. +
    857. 

  857. +    boolean isWindowPerpixelTranslucencySupported() {
    858. 

  858. +        /*
    859. 

  859. +         * Per-pixel alpha is supported if all the conditions are TRUE:
    860. 

  860. +         *    1. The toolkit is a sort of SunToolkit
    861. 

  861. +         *    2. The toolkit supports translucency in general
    862. 

  862. +         *        (isWindowTranslucencySupported())
    863. 

  863. +         *    3. There's at least one translucency-capable
    864. 

  864. +         *        GraphicsConfiguration
    865. 

  865. +         */
    866. 

  866. +        Toolkit curToolkit = Toolkit.getDefaultToolkit();
    867. 

  867. +        if (!(curToolkit instanceof SunToolkit)) {
    868. 

  868. +            return false;
    869. 

  869. +        }
    870. 

  870. +        if (!((SunToolkit)curToolkit).isWindowTranslucencySupported()) {
    871. 

  871. +            return false;
    872. 

  872. +        }
    873. 

  873. +
    874. 

  874. +        // TODO: cache translucency capable GC
    875. 

  875. +        return getTranslucencyCapableGC() != null;
    876. 

  876. +    }
    877. 

  877. +
    878. 

  878. +    GraphicsConfiguration getTranslucencyCapableGC() {
    879. 

  879. +        // If the default GC supports translucency return true.
    880. 

  880. +        // It is important to optimize the verification this way,
    881. 

  881. +        // see CR 6661196 for more details.
    882. 

  882. +        GraphicsConfiguration defaultGC = getDefaultConfiguration();
    883. 

  883. +        if (defaultGC.isTranslucencyCapable()) {
    884. 

  884. +            return defaultGC;
    885. 

  885. +        }
    886. 

  886. +
    887. 

  887. +        // ... otherwise iterate through all the GCs.
    888. 

  888. +        GraphicsConfiguration[] configs = getConfigurations();
    889. 

  889. +        for (int j = 0; j < configs.length; j++) {
    890. 

  890. +            if (configs[j].isTranslucencyCapable()) {
    891. 

  891. +                return configs[j];
    892. 

  892. +            }
    893. 

  893. +        }
    894. 

  894. +
    895. 

  895. +        return null;
    896. 

  896. +    }
    897. 

  897.  }
    898. 

  898. diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/KeyboardFocusManager.java openjdk/jdk/src/share/classes/java/awt/KeyboardFocusManager.java
    899. 

  899. --- openjdk.orig/jdk/src/share/classes/java/awt/KeyboardFocusManager.java	2011-02-16 00:40:21.000000000 +0000
    900. 

  900. +++ openjdk/jdk/src/share/classes/java/awt/KeyboardFocusManager.java	2011-02-16 01:27:25.004326241 +0000
    901. 

  901. @@ -2210,7 +2210,7 @@
    902. 

  902.                                                    boolean temporary, boolean focusedWindowChangeAllowed,
    903. 

  903.                                                    long time)
    904. 

  904.      {
    905. 

  905. -        Window parentWindow = Component.getContainingWindow(heavyweight);
    906. 

  906. +        Window parentWindow = SunToolkit.getContainingWindow(heavyweight);
    907. 

  907.          if (parentWindow == null || !parentWindow.syncLWRequests) {
    908. 

  908.              return false;
    909. 

  909.          }
    910. 

  910. @@ -2544,7 +2544,7 @@
    911. 

  911.                  (HeavyweightFocusRequest.CLEAR_GLOBAL_FOCUS_OWNER);
    912. 

  912.  
    913. 

  913.              Component activeWindow = ((hwFocusRequest != null)
    914. 

  914. -                ? Component.getContainingWindow(hwFocusRequest.heavyweight)
    915. 

  915. +                ? SunToolkit.getContainingWindow(hwFocusRequest.heavyweight)
    916. 

  916.                  : nativeFocusedWindow);
    917. 

  917.              while (activeWindow != null &&
    918. 

  918.                     !((activeWindow instanceof Frame) ||
    919. 

  919. @@ -3015,8 +3015,8 @@
    920. 

  920.      }
    921. 

  921.  
    922. 

  922.      private static boolean focusedWindowChanged(Component to, Component from) {
    923. 

  923. -        Window wto = Component.getContainingWindow(to);
    924. 

  924. -        Window wfrom = Component.getContainingWindow(from);
    925. 

  925. +        Window wto = SunToolkit.getContainingWindow(to);
    926. 

  926. +        Window wfrom = SunToolkit.getContainingWindow(from);
    927. 

  927.          if (wto == null && wfrom == null) {
    928. 

  928.              return true;
    929. 

  929.          }
    930. 

  930. @@ -3030,8 +3030,8 @@
    931. 

  931.      }
    932. 

  932.  
    933. 

  933.      private static boolean isTemporary(Component to, Component from) {
    934. 

  934. -        Window wto = Component.getContainingWindow(to);
    935. 

  935. -        Window wfrom = Component.getContainingWindow(from);
    936. 

  936. +        Window wto = SunToolkit.getContainingWindow(to);
    937. 

  937. +        Window wfrom = SunToolkit.getContainingWindow(from);
    938. 

  938.          if (wto == null && wfrom == null) {
    939. 

  939.              return false;
    940. 

  940.          }
    941. 

  941. diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/peer/WindowPeer.java openjdk/jdk/src/share/classes/java/awt/peer/WindowPeer.java
    942. 

  942. --- openjdk.orig/jdk/src/share/classes/java/awt/peer/WindowPeer.java	2011-01-20 23:54:15.000000000 +0000
    943. 

  943. +++ openjdk/jdk/src/share/classes/java/awt/peer/WindowPeer.java	2011-02-16 01:27:25.004326241 +0000
    944. 

  944. @@ -1,5 +1,5 @@
    945. 

  945.  /*
    946. 

  946. - * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
    947. 

  947. + * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
    948. 

  948.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    949. 

  949.   *
    950. 

  950.   * This code is free software; you can redistribute it and/or modify it
    951. 

  951. @@ -27,6 +27,8 @@
    952. 

  952.  
    953. 

  953.  import java.awt.*;
    954. 

  954.  
    955. 

  955. +import java.awt.image.BufferedImage;
    956. 

  956. +
    957. 

  957.  /**
    958. 

  958.   * The peer interfaces are intended only for use in porting
    959. 

  959.   * the AWT. They are not intended for use by application
    960. 

  960. @@ -43,4 +45,26 @@
    961. 

  961.      void setModalBlocked(Dialog blocker, boolean blocked);
    962. 

  962.      void updateMinimumSize();
    963. 

  963.      void updateIconImages();
    964. 

  964. +
    965. 

  965. +    /**
    966. 

  966. +     * Sets the level of opacity for the window.
    967. 

  967. +     *
    968. 

  968. +     * @see Window#setOpacity(float)
    969. 

  969. +     */
    970. 

  970. +    void setOpacity(float opacity);
    971. 

  971. +
    972. 

  972. +    /**
    973. 

  973. +     * Enables the per-pixel alpha support for the window.
    974. 

  974. +     *
    975. 

  975. +     * @see Window#setBackground(Color)
    976. 

  976. +     */
    977. 

  977. +    void setOpaque(boolean isOpaque);
    978. 

  978. +
    979. 

  979. +    /**
    980. 

  980. +     * Updates the native part of non-opaque window using
    981. 

  981. +     * the given image with color+alpha values for each pixel.
    982. 

  982. +     *
    983. 

  983. +     * @see Window#setBackground(Color)
    984. 

  984. +     */
    985. 

  985. +    void updateWindow(BufferedImage backBuffer);
    986. 

  986.  }
    987. 

  987. diff -Nru openjdk.orig/jdk/src/share/classes/java/awt/Window.java openjdk/jdk/src/share/classes/java/awt/Window.java
    988. 

  988. --- openjdk.orig/jdk/src/share/classes/java/awt/Window.java	2011-01-20 23:54:14.000000000 +0000
    989. 

  989. +++ openjdk/jdk/src/share/classes/java/awt/Window.java	2011-02-16 01:27:25.004326241 +0000
    990. 

  990. @@ -1,5 +1,5 @@
    991. 

  991.  /*
    992. 

  992. - * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
    993. 

  993. + * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
    994. 

  994.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    995. 

  995.   *
    996. 

  996.   * This code is free software; you can redistribute it and/or modify it
    997. 

  997. @@ -28,6 +28,7 @@
    998. 

  998.  import java.awt.event.*;
    999. 

  999.  import java.awt.im.InputContext;
    1000. 

  1000.  import java.awt.image.BufferStrategy;
    1001. 

  1001. +import java.awt.image.BufferedImage;
    1002. 

  1002.  import java.awt.peer.ComponentPeer;
    1003. 

  1003.  import java.awt.peer.WindowPeer;
    1004. 

  1004.  import java.beans.PropertyChangeListener;
    1005. 

  1005. @@ -50,6 +51,7 @@
    1006. 

  1006.  import java.util.logging.Logger;
    1007. 

  1007.  import java.util.concurrent.atomic.AtomicBoolean;
    1008. 

  1008.  import javax.accessibility.*;
    1009. 

  1009. +import sun.awt.AWTAccessor;
    1010. 

  1010.  import sun.awt.AppContext;
    1011. 

  1011.  import sun.awt.CausedFocusEvent;
    1012. 

  1012.  import sun.awt.SunToolkit;
    1013. 

  1013. @@ -291,6 +293,25 @@
    1014. 

  1014.       */
    1015. 

  1015.      transient boolean isInShow = false;
    1016. 

  1016.  
    1017. 

  1017. +    /*
    1018. 

  1018. +     * Opacity level of the window
    1019. 

  1019. +     *
    1020. 

  1020. +     * @see #setOpacity(float)
    1021. 

  1021. +     * @see #getOpacity()
    1022. 

  1022. +     * @since 1.7
    1023. 

  1023. +     */
    1024. 

  1024. +    private float opacity = 1.0f;
    1025. 

  1025. +
    1026. 

  1026. +    /*
    1027. 

  1027. +     * The shape assigned to this window. This field is set to null if
    1028. 

  1028. +     * no shape is set (rectangular window).
    1029. 

  1029. +     *
    1030. 

  1030. +     * @see #getShape()
    1031. 

  1031. +     * @see #setShape(Shape)
    1032. 

  1032. +     * @since 1.7
    1033. 

  1033. +     */
    1034. 

  1034. +    private Shape shape = null;
    1035. 

  1035. +
    1036. 

  1036.      private static final String base = "win";
    1037. 

  1037.      private static int nameCounter = 0;
    1038. 

  1038.  
    1039. 

  1039. @@ -661,9 +682,9 @@
    1040. 

  1040.              }
    1041. 

  1041.              if (peer == null) {
    1042. 

  1042.                  peer = getToolkit().createWindow(this);
    1043. 

  1043. -            }
    1044. 

  1044. -            synchronized (allWindows) {
    1045. 

  1045. -                allWindows.add(this);
    1046. 

  1046. +                synchronized (allWindows) {
    1047. 

  1047. +                    allWindows.add(this);
    1048. 

  1048. +                }
    1049. 

  1049.              }
    1050. 

  1050.              super.addNotify();
    1051. 

  1051.          }
    1052. 

  1052. @@ -2765,6 +2786,8 @@
    1053. 

  1053.           if(aot) {
    1054. 

  1054.               setAlwaysOnTop(aot); // since 1.5; subject to permission check
    1055. 

  1055.           }
    1056. 

  1056. +         shape = (Shape)f.get("shape", null);
    1057. 

  1057. +         opacity = (Float)f.get("opacity", 1.0f);
    1058. 

  1058.  
    1059. 

  1059.           deserializeResources(s);
    1060. 

  1060.      }
    1061. 

  1061. @@ -3184,6 +3207,225 @@
    1062. 

  1062.      }
    1063. 

  1063.  
    1064. 

  1064.  
    1065. 

  1065. +    // ******************** SHAPES & TRANSPARENCY CODE ********************
    1066. 

  1066. +
    1067. 

  1067. +    /**
    1068. 

  1068. +     * JavaDoc
    1069. 

  1069. +     */
    1070. 

  1070. +    /*public */float getOpacity() {
    1071. 

  1071. +        synchronized (getTreeLock()) {
    1072. 

  1072. +            return opacity;
    1073. 

  1073. +        }
    1074. 

  1074. +    }
    1075. 

  1075. +
    1076. 

  1076. +    /**
    1077. 

  1077. +     * JavaDoc
    1078. 

  1078. +     */
    1079. 

  1079. +    /*public */void setOpacity(float opacity) {
    1080. 

  1080. +        synchronized (getTreeLock()) {
    1081. 

  1081. +            if (opacity < 0.0f || opacity > 1.0f) {
    1082. 

  1082. +                throw new IllegalArgumentException(
    1083. 

  1083. +                    "The value of opacity should be in the range [0.0f .. 1.0f].");
    1084. 

  1084. +            }
    1085. 

  1085. +            GraphicsConfiguration gc = getGraphicsConfiguration();
    1086. 

  1086. +            GraphicsDevice gd = gc.getDevice();
    1087. 

  1087. +            if (!gd.isWindowTranslucencySupported(GraphicsDevice.WindowTranslucency.TRANSLUCENT)) {
    1088. 

  1088. +                throw new UnsupportedOperationException(
    1089. 

  1089. +                        "TRANSLUCENT translucency is not supported.");
    1090. 

  1090. +            }
    1091. 

  1091. +            if ((gc.getDevice().getFullScreenWindow() == this) && (opacity < 1.0f)) {
    1092. 

  1092. +                throw new IllegalArgumentException(
    1093. 

  1093. +                    "Setting opacity for full-screen window is not supported.");
    1094. 

  1094. +            }
    1095. 

  1095. +            this.opacity = opacity;
    1096. 

  1096. +            WindowPeer peer = (WindowPeer)getPeer();
    1097. 

  1097. +            if (peer != null) {
    1098. 

  1098. +                peer.setOpacity(opacity);
    1099. 

  1099. +            }
    1100. 

  1100. +        }
    1101. 

  1101. +    }
    1102. 

  1102. +
    1103. 

  1103. +    /**
    1104. 

  1104. +     * JavaDoc
    1105. 

  1105. +     */
    1106. 

  1106. +    /*public */Shape getShape() {
    1107. 

  1107. +        synchronized (getTreeLock()) {
    1108. 

  1108. +            return shape;
    1109. 

  1109. +        }
    1110. 

  1110. +    }
    1111. 

  1111. +
    1112. 

  1112. +    /**
    1113. 

  1113. +     * JavaDoc
    1114. 

  1114. +     *
    1115. 

  1115. +     * @param window the window to set the shape to
    1116. 

  1116. +     * @param shape the shape to set to the window
    1117. 

  1117. +     * @throws IllegalArgumentException if the window is in full screen mode,
    1118. 

  1118. +     *                                  and the shape is not null
    1119. 

  1119. +     */
    1120. 

  1120. +    /*public */void setShape(Shape shape) {
    1121. 

  1121. +        synchronized (getTreeLock()) {
    1122. 

  1122. +            GraphicsConfiguration gc = getGraphicsConfiguration();
    1123. 

  1123. +            GraphicsDevice gd = gc.getDevice();
    1124. 

  1124. +            if (!gd.isWindowTranslucencySupported(
    1125. 

  1125. +                    GraphicsDevice.WindowTranslucency.PERPIXEL_TRANSPARENT))
    1126. 

  1126. +            {
    1127. 

  1127. +                throw new UnsupportedOperationException(
    1128. 

  1128. +                        "PERPIXEL_TRANSPARENT translucency is not supported.");
    1129. 

  1129. +            }
    1130. 

  1130. +            if ((gc.getDevice().getFullScreenWindow() == this) && (shape != null)) {
    1131. 

  1131. +                throw new IllegalArgumentException(
    1132. 

  1132. +                    "Setting shape for full-screen window is not supported.");
    1133. 

  1133. +            }
    1134. 

  1134. +            this.shape = shape;
    1135. 

  1135. +            WindowPeer peer = (WindowPeer)getPeer();
    1136. 

  1136. +            if (peer != null) {
    1137. 

  1137. +                peer.applyShape(shape == null ? null : Region.getInstance(shape, null));
    1138. 

  1138. +            }
    1139. 

  1139. +        }
    1140. 

  1140. +    }
    1141. 

  1141. +
    1142. 

  1142. +    /**
    1143. 

  1143. +     * JavaDoc
    1144. 

  1144. +     */
    1145. 

  1145. +/*
    1146. 

  1146. +    @Override
    1147. 

  1147. +    public void setBackground(Color bgColor) {
    1148. 

  1148. +        int alpha = bgColor.getAlpha();
    1149. 

  1149. +        if (alpha < 255) { // non-opaque window
    1150. 

  1150. +            GraphicsConfiguration gc = getGraphicsConfiguration();
    1151. 

  1151. +            GraphicsDevice gd = gc.getDevice();
    1152. 

  1152. +            if (gc.getDevice().getFullScreenWindow() == this) {
    1153. 

  1153. +                throw new IllegalArgumentException(
    1154. 

  1154. +                    "Making full-screen window non opaque is not supported.");
    1155. 

  1155. +            }
    1156. 

  1156. +            if (!gc.isTranslucencyCapable()) {
    1157. 

  1157. +                GraphicsConfiguration capableGC = gd.getTranslucencyCapableGC();
    1158. 

  1158. +                if (capableGC == null) {
    1159. 

  1159. +                    throw new IllegalArgumentException(
    1160. 

  1160. +                        "PERPIXEL_TRANSLUCENT translucency is not supported");
    1161. 

  1161. +                }
    1162. 

  1162. +                // TODO: change GC
    1163. 

  1163. +            }
    1164. 

  1164. +            setLayersOpaque(this, false);
    1165. 

  1165. +        }
    1166. 

  1166. +
    1167. 

  1167. +        super.setBackground(bgColor);
    1168. 

  1168. +
    1169. 

  1169. +        WindowPeer peer = (WindowPeer)getPeer();
    1170. 

  1170. +        if (peer != null) {
    1171. 

  1171. +            peer.setOpaque(alpha == 255);
    1172. 

  1172. +        }
    1173. 

  1173. +    }
    1174. 

  1174. +*/
    1175. 

  1175. +
    1176. 

  1176. +    private transient boolean opaque = true;
    1177. 

  1177. +
    1178. 

  1178. +    void setOpaque(boolean opaque) {
    1179. 

  1179. +        synchronized (getTreeLock()) {
    1180. 

  1180. +            GraphicsConfiguration gc = getGraphicsConfiguration();
    1181. 

  1181. +            if (!opaque && !com.sun.awt.AWTUtilities.isTranslucencyCapable(gc)) {
    1182. 

  1182. +            throw new IllegalArgumentException(
    1183. 

  1183. +                    "The window must use a translucency-compatible graphics configuration");
    1184. 

  1184. +            }
    1185. 

  1185. +            if (!com.sun.awt.AWTUtilities.isTranslucencySupported(
    1186. 

  1186. +                    com.sun.awt.AWTUtilities.Translucency.PERPIXEL_TRANSLUCENT))
    1187. 

  1187. +            {
    1188. 

  1188. +                throw new UnsupportedOperationException(
    1189. 

  1189. +                        "PERPIXEL_TRANSLUCENT translucency is not supported.");
    1190. 

  1190. +            }
    1191. 

  1191. +            if ((gc.getDevice().getFullScreenWindow() == this) && !opaque) {
    1192. 

  1192. +                throw new IllegalArgumentException(
    1193. 

  1193. +                    "Making full-screen window non opaque is not supported.");
    1194. 

  1194. +            }
    1195. 

  1195. +            setLayersOpaque(this, opaque);
    1196. 

  1196. +            this.opaque = opaque;
    1197. 

  1197. +            WindowPeer peer = (WindowPeer)getPeer();
    1198. 

  1198. +            if (peer != null) {
    1199. 

  1199. +                peer.setOpaque(opaque);
    1200. 

  1200. +            }
    1201. 

  1201. +        }
    1202. 

  1202. +    }
    1203. 

  1203. +
    1204. 

  1204. +    private void updateWindow(BufferedImage backBuffer) {
    1205. 

  1205. +        synchronized (getTreeLock()) {
    1206. 

  1206. +            WindowPeer peer = (WindowPeer)getPeer();
    1207. 

  1207. +            if (peer != null) {
    1208. 

  1208. +                peer.updateWindow(backBuffer);
    1209. 

  1209. +            }
    1210. 

  1210. +        }
    1211. 

  1211. +    }
    1212. 

  1212. +
    1213. 

  1213. +    private static final Color TRANSPARENT_BACKGROUND_COLOR = new Color(0, 0, 0, 0);
    1214. 

  1214. +
    1215. 

  1215. +    private static void setLayersOpaque(Component component, boolean isOpaque) {
    1216. 

  1216. +        // Shouldn't use instanceof to avoid loading Swing classes
    1217. 

  1217. +        //    if it's a pure AWT application.
    1218. 

  1218. +        if (Component.doesImplement(component, "javax.swing.RootPaneContainer")) {
    1219. 

  1219. +            javax.swing.RootPaneContainer rpc = (javax.swing.RootPaneContainer)component;
    1220. 

  1220. +            javax.swing.JRootPane root = rpc.getRootPane();
    1221. 

  1221. +            javax.swing.JLayeredPane lp = root.getLayeredPane();
    1222. 

  1222. +            Container c = root.getContentPane();
    1223. 

  1223. +            javax.swing.JComponent content =
    1224. 

  1224. +                (c instanceof javax.swing.JComponent) ? (javax.swing.JComponent)c : null;
    1225. 

  1225. +            javax.swing.JComponent gp =
    1226. 

  1226. +                (rpc.getGlassPane() instanceof javax.swing.JComponent) ?
    1227. 

  1227. +                (javax.swing.JComponent)rpc.getGlassPane() : null;
    1228. 

  1228. +            if (gp != null) {
    1229. 

  1229. +                gp.setDoubleBuffered(isOpaque);
    1230. 

  1230. +            }
    1231. 

  1231. +            lp.setOpaque(isOpaque);
    1232. 

  1232. +            root.setOpaque(isOpaque);
    1233. 

  1233. +            root.setDoubleBuffered(isOpaque); //XXX: the "white rect" workaround
    1234. 

  1234. +            if (content != null) {
    1235. 

  1235. +                content.setOpaque(isOpaque);
    1236. 

  1236. +                content.setDoubleBuffered(isOpaque); //XXX: the "white rect" workaround
    1237. 

  1237. +
    1238. 

  1238. +                // Iterate down one level to see whether we have a JApplet
    1239. 

  1239. +                // (which is also a RootPaneContainer) which requires processing
    1240. 

  1240. +                int numChildren = content.getComponentCount();
    1241. 

  1241. +                if (numChildren > 0) {
    1242. 

  1242. +                    Component child = content.getComponent(0);
    1243. 

  1243. +                    // It's OK to use instanceof here because we've
    1244. 

  1244. +                    // already loaded the RootPaneContainer class by now
    1245. 

  1245. +                    if (child instanceof javax.swing.RootPaneContainer) {
    1246. 

  1246. +                        setLayersOpaque(child, isOpaque);
    1247. 

  1247. +                    }
    1248. 

  1248. +                }
    1249. 

  1249. +            }
    1250. 

  1250. +        }
    1251. 

  1251. +
    1252. 

  1252. +        Color bg = component.getBackground();
    1253. 

  1253. +        boolean hasTransparentBg = TRANSPARENT_BACKGROUND_COLOR.equals(bg);
    1254. 

  1254. +
    1255. 

  1255. +        Container container = null;
    1256. 

  1256. +        if (component instanceof Container) {
    1257. 

  1257. +            container = (Container) component;
    1258. 

  1258. +        }
    1259. 

  1259. +
    1260. 

  1260. +        if (isOpaque) {
    1261. 

  1261. +            if (hasTransparentBg) {
    1262. 

  1262. +                // Note: we use the SystemColor.window color as the default.
    1263. 

  1263. +                // This color is used in the WindowPeer implementations to
    1264. 

  1264. +                // initialize the background color of the window if it is null.
    1265. 

  1265. +                // (This might not be the right thing to do for other
    1266. 

  1266. +                // RootPaneContainers we might be invoked with)
    1267. 

  1267. +                Color newColor = null;
    1268. 

  1268. +                if (container != null && container.preserveBackgroundColor != null) {
    1269. 

  1269. +                    newColor = container.preserveBackgroundColor;
    1270. 

  1270. +                } else {
    1271. 

  1271. +                    newColor = SystemColor.window;
    1272. 

  1272. +                }
    1273. 

  1273. +                component.setBackground(newColor);
    1274. 

  1274. +            }
    1275. 

  1275. +        } else {
    1276. 

  1276. +            if (!hasTransparentBg && container != null) {
    1277. 

  1277. +                container.preserveBackgroundColor = bg;
    1278. 

  1278. +            }
    1279. 

  1279. +            component.setBackground(TRANSPARENT_BACKGROUND_COLOR);
    1280. 

  1280. +        }
    1281. 

  1281. +    }
    1282. 

  1282. +
    1283. 

  1283. +
    1284. 

  1284.      // ************************** MIXING CODE *******************************
    1285. 

  1285.  
    1286. 

  1286.      // A window has a parent, but it does NOT have a container
    1287. 

  1287. @@ -3221,6 +3463,42 @@
    1288. 

  1288.  
    1289. 

  1289.      // ****************** END OF MIXING CODE ********************************
    1290. 

  1290.  
    1291. 

  1291. +    static {
    1292. 

  1292. +        AWTAccessor.setWindowAccessor(new AWTAccessor.WindowAccessor() {
    1293. 

  1293. +            public float getOpacity(Window window) {
    1294. 

  1294. +                return window.opacity;
    1295. 

  1295. +            }
    1296. 

  1296. +            public void setOpacity(Window window, float opacity) {
    1297. 

  1297. +                window.setOpacity(opacity);
    1298. 

  1298. +            }
    1299. 

  1299. +            public Shape getShape(Window window) {
    1300. 

  1300. +                return window.getShape();
    1301. 

  1301. +            }
    1302. 

  1302. +            public void setShape(Window window, Shape shape) {
    1303. 

  1303. +                window.setShape(shape);
    1304. 

  1304. +            }
    1305. 

  1305. +            public boolean isOpaque(Window window) {
    1306. 

  1306. +                /*
    1307. 

  1307. +                return window.getBackground().getAlpha() < 255;
    1308. 

  1308. +                */
    1309. 

  1309. +                synchronized (window.getTreeLock()) {
    1310. 

  1310. +                    return window.opaque;
    1311. 

  1311. +                }
    1312. 

  1312. +            }
    1313. 

  1313. +            public void setOpaque(Window window, boolean opaque) {
    1314. 

  1314. +                /*
    1315. 

  1315. +                Color bg = window.getBackground();
    1316. 

  1316. +                window.setBackground(new Color(bg.getRed(), bg.getGreen(), bg.getBlue(),
    1317. 

  1317. +                                               opaque ? 255 : 0));
    1318. 

  1318. +                */
    1319. 

  1319. +                window.setOpaque(opaque);
    1320. 

  1320. +            }
    1321. 

  1321. +            public void updateWindow(Window window, BufferedImage backBuffer) {
    1322. 

  1322. +                window.updateWindow(backBuffer);
    1323. 

  1323. +            }
    1324. 

  1324. +        }); // WindowAccessor
    1325. 

  1325. +    } // static
    1326. 

  1326. +
    1327. 

  1327.  } // class Window
    1328. 

  1328.  
    1329. 

  1329.  
    1330. 

  1330. diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/RepaintManager.java openjdk/jdk/src/share/classes/javax/swing/RepaintManager.java
    1331. 

  1331. --- openjdk.orig/jdk/src/share/classes/javax/swing/RepaintManager.java	2011-01-20 23:54:21.000000000 +0000
    1332. 

  1332. +++ openjdk/jdk/src/share/classes/javax/swing/RepaintManager.java	2011-02-16 01:27:25.008325931 +0000
    1333. 

  1333. @@ -1,5 +1,5 @@
    1334. 

  1334.  /*
    1335. 

  1335. - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
    1336. 

  1336. + * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    1337. 

  1337.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1338. 

  1338.   *
    1339. 

  1339.   * This code is free software; you can redistribute it and/or modify it
    1340. 

  1340. @@ -34,6 +34,7 @@
    1341. 

  1341.  import java.util.*;
    1342. 

  1342.  import java.applet.*;
    1343. 

  1343.  
    1344. 

  1344. +import sun.awt.AWTAccessor;
    1345. 

  1345.  import sun.awt.AppContext;
    1346. 

  1346.  import sun.awt.DisplayChangedListener;
    1347. 

  1347.  import sun.awt.SunToolkit;
    1348. 

  1348. @@ -681,6 +682,44 @@
    1349. 

  1349.          }
    1350. 

  1350.      }
    1351. 

  1351.  
    1352. 

  1352. +    private Map<Component,Rectangle>
    1353. 

  1353. +        updateWindows(Map<Component,Rectangle> dirtyComponents)
    1354. 

  1354. +    {
    1355. 

  1355. +        Toolkit toolkit = Toolkit.getDefaultToolkit();
    1356. 

  1356. +        if (!(toolkit instanceof SunToolkit &&
    1357. 

  1357. +              ((SunToolkit)toolkit).needUpdateWindow()))
    1358. 

  1358. +        {
    1359. 

  1359. +            return dirtyComponents;
    1360. 

  1360. +        }
    1361. 

  1361. +
    1362. 

  1362. +        Set<Window> windows = new HashSet<Window>();
    1363. 

  1363. +        Set<Component> dirtyComps = dirtyComponents.keySet();
    1364. 

  1364. +        for (Iterator<Component> it = dirtyComps.iterator(); it.hasNext();) {
    1365. 

  1365. +            Component dirty = it.next();
    1366. 

  1366. +            Window window = dirty instanceof Window ?
    1367. 

  1367. +                (Window)dirty :
    1368. 

  1368. +                SwingUtilities.getWindowAncestor(dirty);
    1369. 

  1369. +
    1370. 

  1370. +            if (window != null &&
    1371. 

  1371. +                !AWTAccessor.getWindowAccessor().isOpaque(window))
    1372. 

  1372. +            {
    1373. 

  1373. +                // if this component's toplevel is perpixel translucent, it will
    1374. 

  1374. +                // be repainted below
    1375. 

  1375. +                it.remove();
    1376. 

  1376. +                // add to the set of windows to update (so that we don't update
    1377. 

  1377. +                // the window many times for each component to be repainted that
    1378. 

  1378. +                // belongs to this window)
    1379. 

  1379. +                windows.add(window);
    1380. 

  1380. +            }
    1381. 

  1381. +        }
    1382. 

  1382. +
    1383. 

  1383. +        for (Window window : windows) {
    1384. 

  1384. +            AWTAccessor.getWindowAccessor().updateWindow(window, null);
    1385. 

  1385. +        }
    1386. 

  1386. +
    1387. 

  1387. +        return dirtyComponents;
    1388. 

  1388. +    }
    1389. 

  1389. +
    1390. 

  1390.      /**
    1391. 

  1391.       * Paint all of the components that have been marked dirty.
    1392. 

  1392.       *
    1393. 

  1393. @@ -714,6 +753,10 @@
    1394. 

  1394.          int localBoundsW = 0;
    1395. 

  1395.          Enumeration keys;
    1396. 

  1396.  
    1397. 

  1397. +        // the components belonging to perpixel-translucent windows will be
    1398. 

  1398. +        // removed from the list
    1399. 

  1399. +        tmpDirtyComponents = updateWindows(tmpDirtyComponents);
    1400. 

  1400. +
    1401. 

  1401.          roots = new ArrayList<Component>(count);
    1402. 

  1402.  
    1403. 

  1403.          for (Component dirty : tmpDirtyComponents.keySet()) {
    1404. 

  1404. diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java
    1405. 

  1405. --- openjdk.orig/jdk/src/share/classes/sun/awt/AWTAccessor.java	2011-02-16 00:40:21.000000000 +0000
    1406. 

  1406. +++ openjdk/jdk/src/share/classes/sun/awt/AWTAccessor.java	2011-02-16 01:43:59.459209438 +0000
    1407. 

  1407. @@ -59,10 +59,29 @@
    1408. 

  1408.       * An interface of accessor for the java.awt.Component class.
    1409. 

  1409.       */
    1410. 

  1410.      public interface ComponentAccessor {
    1411. 

  1411. -        // See 6797587
    1412. 

  1412. -        // Also see: 6776743, 6768307, and 6768332.
    1413. 

  1413. -        /**
    1414. 

  1414. +        /*
    1415. 

  1415. +         * Sets whether the native background erase for a component
    1416. 

  1416. +         * has been disabled via SunToolkit.disableBackgroundErase().
    1417. 

  1417. +         */
    1418. 

  1418. +        void setBackgroundEraseDisabled(Component comp, boolean disabled);
    1419. 

  1419. +        /*
    1420. 

  1420. +         * Indicates whether the native background erase for a
    1421. 

  1421. +         * component has been disabled via
    1422. 

  1422. +         * SunToolkit.disableBackgroundErase().
    1423. 

  1423. +         */
    1424. 

  1424. +        boolean getBackgroundEraseDisabled(Component comp);
    1425. 

  1425. +        /*
    1426. 

  1426. +         *
    1427. 

  1427. +         * Gets the bounds of this component in the form of a
    1428. 

  1428. +         * <code>Rectangle</code> object. The bounds specify this
    1429. 

  1429. +         * component's width, height, and location relative to
    1430. 

  1430. +         * its parent.
    1431. 

  1431. +         */
    1432. 

  1432. +        Rectangle getBounds(Component comp);
    1433. 

  1433. +        /*
    1434. 

  1434.           * Sets the shape of a lw component to cut out from hw components.
    1435. 

  1435. +         *
    1436. 

  1436. +         * See 6797587, 6776743, 6768307, and 6768332 for details
    1437. 

  1437.           */
    1438. 

  1438.          void setMixingCutoutShape(Component comp, Shape shape);
    1439. 

  1439.          /*
    1440. 

  1440. @@ -72,6 +91,41 @@
    1441. 

  1441.      }
    1442. 

  1442.  
    1443. 

  1443.      /*
    1444. 

  1444. +     * An interface of accessor for java.awt.Window class.
    1445. 

  1445. +     */
    1446. 

  1446. +    public interface WindowAccessor {
    1447. 

  1447. +        /*
    1448. 

  1448. +         * Get opacity level of the given window.
    1449. 

  1449. +         */
    1450. 

  1450. +        float getOpacity(Window window);
    1451. 

  1451. +        /*
    1452. 

  1452. +         * Set opacity level to the given window.
    1453. 

  1453. +         */
    1454. 

  1454. +        void setOpacity(Window window, float opacity);
    1455. 

  1455. +        /*
    1456. 

  1456. +         * Get a shape assigned to the given window.
    1457. 

  1457. +         */
    1458. 

  1458. +        Shape getShape(Window window);
    1459. 

  1459. +        /*
    1460. 

  1460. +         * Set a shape to the given window.
    1461. 

  1461. +         */
    1462. 

  1462. +        void setShape(Window window, Shape shape);
    1463. 

  1463. +        /*
    1464. 

  1464. +         * Identify whether the given window is opaque (true)
    1465. 

  1465. +         *  or translucent (false).
    1466. 

  1466. +         */
    1467. 

  1467. +        boolean isOpaque(Window window);
    1468. 

  1468. +        /*
    1469. 

  1469. +         * Set the opaque preoperty to the given window.
    1470. 

  1470. +         */
    1471. 

  1471. +        void setOpaque(Window window, boolean isOpaque);
    1472. 

  1472. +        /*
    1473. 

  1473. +         * Update the image of a non-opaque (translucent) window.
    1474. 

  1474. +         */
    1475. 

  1475. +        void updateWindow(Window window, BufferedImage backBuffer);
    1476. 

  1476. +    }
    1477. 

  1477. +
    1478. 

  1478. +    /*
    1479. 

  1479.       * An accessor for the AWTEvent class.
    1480. 

  1480.       */
    1481. 

  1481.      public interface AWTEventAccessor {
    1482. 

  1482. @@ -101,6 +155,14 @@
    1483. 

  1483.      /* The java.awt.Component class accessor object.
    1484. 

  1484.       */
    1485. 

  1485.      private static ComponentAccessor componentAccessor;
    1486. 

  1486. +    /*
    1487. 

  1487. +     * The java.awt.Window class accessor object.
    1488. 

  1488. +     */
    1489. 

  1489. +    private static WindowAccessor windowAccessor;
    1490. 

  1490. +
    1491. 

  1491. +    /*
    1492. 

  1492. +     * The java.awt.AWTEvent class accessor object.
    1493. 

  1493. +     */
    1494. 

  1494.      private static AWTEventAccessor awtEventAccessor;
    1495. 

  1495.  
    1496. 

  1496.      /*
    1497. 

  1497. @@ -137,4 +199,22 @@
    1498. 

  1498.          }
    1499. 

  1499.          return awtEventAccessor;
    1500. 

  1500.      }
    1501. 

  1501. +
    1502. 

  1502. +    /*
    1503. 

  1503. +     * Set an accessor object for the java.awt.Window class.
    1504. 

  1504. +     */
    1505. 

  1505. +    public static void setWindowAccessor(WindowAccessor wa) {
    1506. 

  1506. +        windowAccessor = wa;
    1507. 

  1507. +    }
    1508. 

  1508. +
    1509. 

  1509. +    /*
    1510. 

  1510. +     * Retrieve the accessor object for the java.awt.Window class.
    1511. 

  1511. +     */
    1512. 

  1512. +    public static WindowAccessor getWindowAccessor() {
    1513. 

  1513. +        if (windowAccessor == null) {
    1514. 

  1514. +            unsafe.ensureClassInitialized(Window.class);
    1515. 

  1515. +        }
    1516. 

  1516. +        return windowAccessor;
    1517. 

  1517. +    }
    1518. 

  1518. +
    1519. 

  1519.  }
    1520. 

  1520. diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/EmbeddedFrame.java openjdk/jdk/src/share/classes/sun/awt/EmbeddedFrame.java
    1521. 

  1521. --- openjdk.orig/jdk/src/share/classes/sun/awt/EmbeddedFrame.java	2011-01-20 23:54:24.000000000 +0000
    1522. 

  1522. +++ openjdk/jdk/src/share/classes/sun/awt/EmbeddedFrame.java	2011-02-16 01:27:25.008325931 +0000
    1523. 

  1523. @@ -1,5 +1,5 @@
    1524. 

  1524.  /*
    1525. 

  1525. - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
    1526. 

  1526. + * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
    1527. 

  1527.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1528. 

  1528.   *
    1529. 

  1529.   * This code is free software; you can redistribute it and/or modify it
    1530. 

  1530. @@ -579,5 +579,12 @@
    1531. 

  1531.          }
    1532. 

  1532.          public void updateMinimumSize() {
    1533. 

  1533.          }
    1534. 

  1534. -    }
    1535. 

  1535. +
    1536. 

  1536. +        public void setOpacity(float opacity) {
    1537. 

  1537. +        }
    1538. 

  1538. +        public void setOpaque(boolean isOpaque) {
    1539. 

  1539. +        }
    1540. 

  1540. +        public void updateWindow(BufferedImage backBuffer) {
    1541. 

  1541. +        }
    1542. 

  1542. +     }
    1543. 

  1543.  } // class EmbeddedFrame
    1544. 

  1544. diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/SunToolkit.java openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java
    1545. 

  1545. --- openjdk.orig/jdk/src/share/classes/sun/awt/SunToolkit.java	2011-02-16 00:40:21.000000000 +0000
    1546. 

  1546. +++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java	2011-02-16 01:27:25.008325931 +0000
    1547. 

  1547. @@ -1,5 +1,5 @@
    1548. 

  1548.  /*
    1549. 

  1549. - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    1550. 

  1550. + * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    1551. 

  1551.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1552. 

  1552.   *
    1553. 

  1553.   * This code is free software; you can redistribute it and/or modify it
    1554. 

  1554. @@ -32,14 +32,10 @@
    1555. 

  1555.  import java.awt.peer.*;
    1556. 

  1556.  import java.awt.event.WindowEvent;
    1557. 

  1557.  import java.awt.event.KeyEvent;
    1558. 

  1558. -import java.awt.im.spi.InputMethodDescriptor;
    1559. 

  1559.  import java.awt.image.*;
    1560. 

  1560. -import java.awt.geom.AffineTransform;
    1561. 

  1561.  import java.awt.TrayIcon;
    1562. 

  1562.  import java.awt.SystemTray;
    1563. 

  1563. -import java.io.*;
    1564. 

  1564.  import java.net.URL;
    1565. 

  1565. -import java.net.JarURLConnection;
    1566. 

  1566.  import java.util.*;
    1567. 

  1567.  import java.util.concurrent.TimeUnit;
    1568. 

  1568.  import java.util.concurrent.locks.Condition;
    1569. 

  1569. @@ -49,7 +45,6 @@
    1570. 

  1570.  import sun.misc.SoftCache;
    1571. 

  1571.  import sun.font.FontDesignMetrics;
    1572. 

  1572.  import sun.awt.im.InputContext;
    1573. 

  1573. -import sun.awt.im.SimpleInputMethodWindow;
    1574. 

  1574.  import sun.awt.image.*;
    1575. 

  1575.  import sun.security.action.GetPropertyAction;
    1576. 

  1576.  import sun.security.action.GetBooleanAction;
    1577. 

  1577. @@ -825,16 +820,31 @@
    1578. 

  1578.      }
    1579. 

  1579.  
    1580. 

  1580.      /**
    1581. 

  1581. -     * Disables erasing of background on the canvas before painting
    1582. 

  1582. -     * if this is supported by the current toolkit.
    1583. 

  1583. -     *
    1584. 

  1584. -     * @throws IllegalStateException if the canvas is not displayable
    1585. 

  1585. -     * @see java.awt.Component#isDisplayable
    1586. 

  1586. +     * Disables erasing of background on the canvas before painting if
    1587. 

  1587. +     * this is supported by the current toolkit. It is recommended to
    1588. 

  1588. +     * call this method early, before the Canvas becomes displayable,
    1589. 

  1589. +     * because some Toolkit implementations do not support changing
    1590. 

  1590. +     * this property once the Canvas becomes displayable.
    1591. 

  1591.       */
    1592. 

  1592.      public void disableBackgroundErase(Canvas canvas) {
    1593. 

  1593. -        if (!canvas.isDisplayable()) {
    1594. 

  1594. -            throw new IllegalStateException("Canvas must have a valid peer");
    1595. 

  1595. -        }
    1596. 

  1596. +        disableBackgroundEraseImpl(canvas);
    1597. 

  1597. +    }
    1598. 

  1598. +
    1599. 

  1599. +    /**
    1600. 

  1600. +     * Disables the native erasing of the background on the given
    1601. 

  1601. +     * component before painting if this is supported by the current
    1602. 

  1602. +     * toolkit. This only has an effect for certain components such as
    1603. 

  1603. +     * Canvas, Panel and Window. It is recommended to call this method
    1604. 

  1604. +     * early, before the Component becomes displayable, because some
    1605. 

  1605. +     * Toolkit implementations do not support changing this property
    1606. 

  1606. +     * once the Component becomes displayable.
    1607. 

  1607. +     */
    1608. 

  1608. +    public void disableBackgroundErase(Component component) {
    1609. 

  1609. +        disableBackgroundEraseImpl(component);
    1610. 

  1610. +    }
    1611. 

  1611. +
    1612. 

  1612. +    private void disableBackgroundEraseImpl(Component component) {
    1613. 

  1613. +        AWTAccessor.getComponentAccessor().setBackgroundEraseDisabled(component, true);
    1614. 

  1614.      }
    1615. 

  1615.  
    1616. 

  1616.      /**
    1617. 

  1617. @@ -1973,6 +1983,18 @@
    1618. 

  1618.          AWTAutoShutdown.getInstance().dumpPeers(aLog);
    1619. 

  1619.      }
    1620. 

  1620.  
    1621. 

  1621. +    /**
    1622. 

  1622. +     * Returns the <code>Window</code> ancestor of the component <code>comp</code>.
    1623. 

  1623. +     * @return Window ancestor of the component or component by itself if it is Window;
    1624. 

  1624. +     *         null, if component is not a part of window hierarchy
    1625. 

  1625. +     */
    1626. 

  1626. +    public static Window getContainingWindow(Component comp) {
    1627. 

  1627. +        while (comp != null && !(comp instanceof Window)) {
    1628. 

  1628. +            comp = comp.getParent();
    1629. 

  1629. +        }
    1630. 

  1630. +        return (Window)comp;
    1631. 

  1631. +    }
    1632. 

  1632. +
    1633. 

  1633.      private static Boolean sunAwtDisableMixing = null;
    1634. 

  1634.  
    1635. 

  1635.      /**
    1636. 

  1636. @@ -1996,6 +2018,73 @@
    1637. 

  1637.      public boolean isNativeGTKAvailable() {
    1638. 

  1638.          return false;
    1639. 

  1639.      }
    1640. 

  1640. +
    1641. 

  1641. +    // Cosntant alpha
    1642. 

  1642. +    public boolean isWindowOpacitySupported() {
    1643. 

  1643. +        return false;
    1644. 

  1644. +    }
    1645. 

  1645. +
    1646. 

  1646. +    // Shaping
    1647. 

  1647. +    public boolean isWindowShapingSupported() {
    1648. 

  1648. +        return false;
    1649. 

  1649. +    }
    1650. 

  1650. +
    1651. 

  1651. +    // Per-pixel alpha
    1652. 

  1652. +    public boolean isWindowTranslucencySupported() {
    1653. 

  1653. +        return false;
    1654. 

  1654. +    }
    1655. 

  1655. +
    1656. 

  1656. +    public boolean isTranslucencyCapable(GraphicsConfiguration gc) {
    1657. 

  1657. +        return false;
    1658. 

  1658. +    }
    1659. 

  1659. +
    1660. 

  1660. +    /**
    1661. 

  1661. +     * Returns whether or not a containing top level window for the passed
    1662. 

  1662. +     * component is
    1663. 

  1663. +     * {@link com.sun.awt.AWTUtilities.Translucency#PERPIXEL_TRANSLUCENT PERPIXEL_TRANSLUCENT}.
    1664. 

  1664. +     *
    1665. 

  1665. +     * @param c a Component which toplevel's to check
    1666. 

  1666. +     * @return {@code true}  if the passed component is not null and has a
    1667. 

  1667. +     * containing toplevel window which is opaque (so per-pixel translucency
    1668. 

  1668. +     * is not enabled), {@code false} otherwise
    1669. 

  1669. +     * @see com.sun.awt.AWTUtilities.Translucency#PERPIXEL_TRANSLUCENT
    1670. 

  1670. +     * @see com.sun.awt.AWTUtilities#isWindowOpaque(Window)
    1671. 

  1671. +     */
    1672. 

  1672. +    public static boolean isContainingTopLevelOpaque(Component c) {
    1673. 

  1673. +        Window w = getContainingWindow(c);
    1674. 

  1674. +        // return w != null && (w).isOpaque();
    1675. 

  1675. +        return w != null && com.sun.awt.AWTUtilities.isWindowOpaque(w);
    1676. 

  1676. +    }
    1677. 

  1677. +
    1678. 

  1678. +    /**
    1679. 

  1679. +     * Returns whether or not a containing top level window for the passed
    1680. 

  1680. +     * component is
    1681. 

  1681. +     * {@link com.sun.awt.AWTUtilities.Translucency#TRANSLUCENT TRANSLUCENT}.
    1682. 

  1682. +     *
    1683. 

  1683. +     * @param c a Component which toplevel's to check
    1684. 

  1684. +     * @return {@code true} if the passed component is not null and has a
    1685. 

  1685. +     * containing toplevel window which has opacity less than
    1686. 

  1686. +     * 1.0f (which means that it is translucent), {@code false} otherwise
    1687. 

  1687. +     * @see com.sun.awt.AWTUtilities.Translucency#TRANSLUCENT
    1688. 

  1688. +     * @see com.sun.awt.AWTUtilities#getWindowOpacity(Window)
    1689. 

  1689. +     */
    1690. 

  1690. +    public static boolean isContainingTopLevelTranslucent(Component c) {
    1691. 

  1691. +        Window w = getContainingWindow(c);
    1692. 

  1692. +        // return w != null && (w).getOpacity() < 1.0f;
    1693. 

  1693. +        return w != null && com.sun.awt.AWTUtilities.getWindowOpacity((Window)w) < 1.0f;
    1694. 

  1694. +    }
    1695. 

  1695. +
    1696. 

  1696. +    /**
    1697. 

  1697. +     * Returns whether the native system requires using the peer.updateWindow()
    1698. 

  1698. +     * method to update the contents of a non-opaque window, or if usual
    1699. 

  1699. +     * painting procedures are sufficient. The default return value covers
    1700. 

  1700. +     * the X11 systems. On MS Windows this method is overriden in WToolkit
    1701. 

  1701. +     * to return true.
    1702. 

  1702. +     */
    1703. 

  1703. +    public boolean needUpdateWindow() {
    1704. 

  1704. +        return false;
    1705. 

  1705. +    }
    1706. 

  1706. +
    1707. 

  1707.  } // class SunToolkit
    1708. 

  1708.  
    1709. 

  1709.  
    1710. 

  1710. diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/utility/rect.c openjdk/jdk/src/share/native/sun/awt/utility/rect.c
    1711. 

  1711. --- openjdk.orig/jdk/src/share/native/sun/awt/utility/rect.c	1970-01-01 01:00:00.000000000 +0100
    1712. 

  1712. +++ openjdk/jdk/src/share/native/sun/awt/utility/rect.c	2011-02-16 01:27:25.008325931 +0000
    1713. 

  1713. @@ -0,0 +1,102 @@
    1714. 

  1714. +/*
    1715. 

  1715. + * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
    1716. 

  1716. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1717. 

  1717. + *
    1718. 

  1718. + * This code is free software; you can redistribute it and/or modify it
    1719. 

  1719. + * under the terms of the GNU General Public License version 2 only, as
    1720. 

  1720. + * published by the Free Software Foundation.  Oracle designates this
    1721. 

  1721. + * particular file as subject to the "Classpath" exception as provided
    1722. 

  1722. + * by Oracle in the LICENSE file that accompanied this code.
    1723. 

  1723. + *
    1724. 

  1724. + * This code is distributed in the hope that it will be useful, but WITHOUT
    1725. 

  1725. + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1726. 

  1726. + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    1727. 

  1727. + * version 2 for more details (a copy is included in the LICENSE file that
    1728. 

  1728. + * accompanied this code).
    1729. 

  1729. + *
    1730. 

  1730. + * You should have received a copy of the GNU General Public License version
    1731. 

  1731. + * 2 along with this work; if not, write to the Free Software Foundation,
    1732. 

  1732. + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1733. 

  1733. + *
    1734. 

  1734. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1735. 

  1735. + * or visit www.oracle.com if you need additional information or have any
    1736. 

  1736. + * questions.
    1737. 

  1737. + */
    1738. 

  1738. +
    1739. 

  1739. +#include "utility/rect.h"
    1740. 

  1740. +
    1741. 

  1741. +#if defined(__cplusplus)
    1742. 

  1742. +extern "C" {
    1743. 

  1743. +#endif
    1744. 

  1744. +
    1745. 

  1745. +/**
    1746. 

  1746. + * bitsPerPixel must be 32 for now.
    1747. 

  1747. + * outBuf must be large enough to conatin all the rectangles.
    1748. 

  1748. + */
    1749. 

  1749. +int BitmapToYXBandedRectangles(int bitsPerPixel, int width, int height, unsigned char * buf, RECT_T * outBuf)
    1750. 

  1750. +{
    1751. 

  1751. +    //XXX: we might want to reuse the code in the splashscreen library,
    1752. 

  1752. +    // though we'd have to deal with the ALPHA_THRESHOLD and different
    1753. 

  1753. +    // image formats in this case.
    1754. 

  1754. +    int widthBytes = width * bitsPerPixel / 8;
    1755. 

  1755. +    int alignedWidth = (((widthBytes - 1) / 4) + 1) * 4;
    1756. 

  1756. +
    1757. 

  1757. +    RECT_T * out = outBuf;
    1758. 

  1758. +
    1759. 

  1759. +    RECT_T *pPrevLine = NULL, *pFirst = out, *pThis = pFirst;
    1760. 

  1760. +    int i, j, i0;
    1761. 

  1761. +    int length;
    1762. 

  1762. +
    1763. 

  1763. +    for (j = 0; j < height; j++) {
    1764. 

  1764. +        /* generate data for a scanline */
    1765. 

  1765. +
    1766. 

  1766. +        unsigned char *pSrc = (unsigned char *) buf + j * alignedWidth;
    1767. 

  1767. +        RECT_T *pLine = pThis;
    1768. 

  1768. +
    1769. 

  1769. +        i = 0;
    1770. 

  1770. +
    1771. 

  1771. +        do {
    1772. 

  1772. +            // pSrc[0,1,2] == B,G,R; pSrc[3] == Alpha
    1773. 

  1773. +            while (i < width && !pSrc[3]) {
    1774. 

  1774. +                pSrc += 4;
    1775. 

  1775. +                ++i;
    1776. 

  1776. +            }
    1777. 

  1777. +            if (i >= width)
    1778. 

  1778. +                break;
    1779. 

  1779. +            i0 = i;
    1780. 

  1780. +            while (i < width && pSrc[3]) {
    1781. 

  1781. +                pSrc += 4;
    1782. 

  1782. +                ++i;
    1783. 

  1783. +            }
    1784. 

  1784. +            RECT_SET(*pThis, i0, j, i - i0, 1);
    1785. 

  1785. +            ++pThis;
    1786. 

  1786. +        } while (i < width);
    1787. 

  1787. +
    1788. 

  1788. +        /*  check if the previous scanline is exactly the same, merge if so
    1789. 

  1789. +            (this is the only optimization we can use for YXBanded rectangles,
    1790. 

  1790. +            and win32 supports YXBanded only */
    1791. 

  1791. +
    1792. 

  1792. +        length = pThis - pLine;
    1793. 

  1793. +        if (pPrevLine && pLine - pPrevLine == length) {
    1794. 

  1794. +            for (i = 0; i < length && RECT_EQ_X(pPrevLine[i], pLine[i]); ++i) {
    1795. 

  1795. +            }
    1796. 

  1796. +            if (i == pLine - pPrevLine) {
    1797. 

  1797. +                // do merge
    1798. 

  1798. +                for (i = 0; i < length; i++) {
    1799. 

  1799. +                    RECT_INC_HEIGHT(pPrevLine[i]);
    1800. 

  1800. +                }
    1801. 

  1801. +                pThis = pLine;
    1802. 

  1802. +                continue;
    1803. 

  1803. +            }
    1804. 

  1804. +        }
    1805. 

  1805. +        /* or else use the generated scanline */
    1806. 

  1806. +
    1807. 

  1807. +        pPrevLine = pLine;
    1808. 

  1808. +    }
    1809. 

  1809. +
    1810. 

  1810. +    return pThis - pFirst;
    1811. 

  1811. +}
    1812. 

  1812. +
    1813. 

  1813. +#if defined(__cplusplus)
    1814. 

  1814. +}
    1815. 

  1815. +#endif
    1816. 

  1816. diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java
    1817. 

  1817. --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java	2011-01-20 23:54:40.000000000 +0000
    1818. 

  1818. +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java	2011-02-16 01:27:25.008325931 +0000
    1819. 

  1819. @@ -1,5 +1,5 @@
    1820. 

  1820.  /*
    1821. 

  1821. - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
    1822. 

  1822. + * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
    1823. 

  1823.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1824. 

  1824.   *
    1825. 

  1825.   * This code is free software; you can redistribute it and/or modify it
    1826. 

  1826. @@ -859,14 +859,14 @@
    1827. 

  1827.                      pw.println("\n\tlong pData;");
    1828. 

  1828.                      pw.println("\n\tpublic long getPData() { return pData; }");
    1829. 

  1829.  
    1830. 

  1830. -                    pw.println("\n\n\t" + stp.getJavaClassName() + "(long addr) {");
    1831. 

  1831. +                    pw.println("\n\n\tpublic " + stp.getJavaClassName() + "(long addr) {");
    1832. 

  1832.                      if (generateLog) {
    1833. 

  1833.                          pw.println("\t\tlog.finest(\"Creating\");");
    1834. 

  1834.                      }
    1835. 

  1835.                      pw.println("\t\tpData=addr;");
    1836. 

  1836.                      pw.println("\t\tshould_free_memory = false;");
    1837. 

  1837.                      pw.println("\t}");
    1838. 

  1838. -                    pw.println("\n\n\t" + stp.getJavaClassName() + "() {");
    1839. 

  1839. +                    pw.println("\n\n\tpublic " + stp.getJavaClassName() + "() {");
    1840. 

  1840.                      if (generateLog) {
    1841. 

  1841.                          pw.println("\t\tlog.finest(\"Creating\");");
    1842. 

  1842.                      }
    1843. 

  1843. diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt
    1844. 

  1844. --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt	2011-01-20 23:54:40.000000000 +0000
    1845. 

  1845. +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt	2011-02-16 01:27:25.008325931 +0000
    1846. 

  1846. @@ -750,6 +750,7 @@
    1847. 

  1847.      pixelStride int
    1848. 

  1848.      color_data pointer ColorData
    1849. 

  1849.      glxInfo pointer
    1850. 

  1850. +    isTranslucencySupported int
    1851. 

  1851.  
    1852. 

  1852.  AwtScreenData
    1853. 

  1853.      numConfigs int
    1854. 

  1854. diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java
    1855. 

  1855. --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java	2011-01-20 23:54:40.000000000 +0000
    1856. 

  1856. +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java	2011-02-16 01:27:25.008325931 +0000
    1857. 

  1857. @@ -1,5 +1,5 @@
    1858. 

  1858.  /*
    1859. 

  1859. - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
    1860. 

  1860. + * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
    1861. 

  1861.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1862. 

  1862.   *
    1863. 

  1863.   * This code is free software; you can redistribute it and/or modify it
    1864. 

  1864. @@ -268,6 +268,8 @@
    1865. 

  1865.      XAtom XA_NET_WM_WINDOW_TYPE = XAtom.get("_NET_WM_WINDOW_TYPE");
    1866. 

  1866.      XAtom XA_NET_WM_WINDOW_TYPE_DIALOG = XAtom.get("_NET_WM_WINDOW_TYPE_DIALOG");
    1867. 

  1867.  
    1868. 

  1868. +    XAtom XA_NET_WM_WINDOW_OPACITY = XAtom.get("_NET_WM_WINDOW_OPACITY");
    1869. 

  1869. +
    1870. 

  1870.  /* For _NET_WM_STATE ClientMessage requests */
    1871. 

  1871.      final static int _NET_WM_STATE_REMOVE      =0; /* remove/unset property */
    1872. 

  1872.      final static int _NET_WM_STATE_ADD         =1; /* add/set property      */
    1873. 

  1873. @@ -304,6 +306,12 @@
    1874. 

  1874.          boolean res = active() && checkProtocol(XA_NET_SUPPORTED, XA_NET_WM_STATE_MODAL);
    1875. 

  1875.          return res;
    1876. 

  1876.      }
    1877. 

  1877. +
    1878. 

  1878. +    boolean doOpacityProtocol() {
    1879. 

  1879. +        boolean res = active() && checkProtocol(XA_NET_SUPPORTED, XA_NET_WM_WINDOW_OPACITY);
    1880. 

  1880. +        return res;
    1881. 

  1881. +    }
    1882. 

  1882. +
    1883. 

  1883.      boolean isWMName(String name) {
    1884. 

  1884.          if (!active()) {
    1885. 

  1885.              return false;
    1886. 

  1886. diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
    1887. 

  1887. --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	2011-01-20 23:54:40.000000000 +0000
    1888. 

  1888. +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	2011-02-16 01:27:25.008325931 +0000
    1889. 

  1889. @@ -2181,4 +2181,35 @@
    1890. 

  1890.          return new XDesktopPeer();
    1891. 

  1891.      }
    1892. 

  1892.  
    1893. 

  1893. +    @Override
    1894. 

  1894. +    public boolean isWindowOpacitySupported() {
    1895. 

  1895. +        XNETProtocol net_protocol = XWM.getWM().getNETProtocol();
    1896. 

  1896. +
    1897. 

  1897. +        if (net_protocol == null) {
    1898. 

  1898. +            return false;
    1899. 

  1899. +        }
    1900. 

  1900. +
    1901. 

  1901. +        return net_protocol.doOpacityProtocol();
    1902. 

  1902. +    }
    1903. 

  1903. +
    1904. 

  1904. +    @Override
    1905. 

  1905. +    public boolean isWindowShapingSupported() {
    1906. 

  1906. +        return XlibUtil.isShapingSupported();
    1907. 

  1907. +    }
    1908. 

  1908. +
    1909. 

  1909. +    @Override
    1910. 

  1910. +    public boolean isWindowTranslucencySupported() {
    1911. 

  1911. +        //NOTE: it may not be supported. The actual check is being performed
    1912. 

  1912. +        //      at com.sun.awt.AWTUtilities(). In X11 we need to check
    1913. 

  1913. +        //      whether there's any translucency-capable GC available.
    1914. 

  1914. +        return true;
    1915. 

  1915. +    }
    1916. 

  1916. +
    1917. 

  1917. +    @Override
    1918. 

  1918. +    public boolean isTranslucencyCapable(GraphicsConfiguration gc) {
    1919. 

  1919. +        if (!(gc instanceof X11GraphicsConfig)) {
    1920. 

  1920. +            return false;
    1921. 

  1921. +        }
    1922. 

  1922. +        return ((X11GraphicsConfig)gc).isTranslucencyCapable();
    1923. 

  1923. +    }
    1924. 

  1924.  }
    1925. 

  1925. diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
    1926. 

  1926. --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java	2011-01-20 23:54:40.000000000 +0000
    1927. 

  1927. +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java	2011-02-16 01:27:25.008325931 +0000
    1928. 

  1928. @@ -1,5 +1,5 @@
    1929. 

  1929.  /*
    1930. 

  1930. - * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
    1931. 

  1931. + * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
    1932. 

  1932.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1933. 

  1933.   *
    1934. 

  1934.   * This code is free software; you can redistribute it and/or modify it
    1935. 

  1935. @@ -30,6 +30,8 @@
    1936. 

  1936.  import java.awt.event.FocusEvent;
    1937. 

  1937.  import java.awt.event.WindowEvent;
    1938. 

  1938.  
    1939. 

  1939. +import java.awt.image.BufferedImage;
    1940. 

  1940. +
    1941. 

  1941.  import java.awt.peer.ComponentPeer;
    1942. 

  1942.  import java.awt.peer.WindowPeer;
    1943. 

  1943.  
    1944. 

  1944. @@ -42,6 +44,7 @@
    1945. 

  1945.  import java.util.logging.Level;
    1946. 

  1946.  import java.util.logging.Logger;
    1947. 

  1947.  
    1948. 

  1948. +import sun.awt.AWTAccessor;
    1949. 

  1949.  import sun.awt.ComponentAccessor;
    1950. 

  1950.  import sun.awt.WindowAccessor;
    1951. 

  1951.  import sun.awt.DisplayChangedListener;
    1952. 

  1952. @@ -49,6 +52,8 @@
    1953. 

  1953.  import sun.awt.X11GraphicsDevice;
    1954. 

  1954.  import sun.awt.X11GraphicsEnvironment;
    1955. 

  1955.  
    1956. 

  1956. +import sun.java2d.pipe.Region;
    1957. 

  1957. +
    1958. 

  1958.  class XWindowPeer extends XPanelPeer implements WindowPeer,
    1959. 

  1959.                                                  DisplayChangedListener, MWMConstants {
    1960. 

  1960.  
    1961. 

  1961. @@ -269,6 +274,10 @@
    1962. 

  1962.  
    1963. 

  1963.          XWM.requestWMExtents(getWindow());
    1964. 

  1964.          updateIconImages();
    1965. 

  1965. +
    1966. 

  1966. +        updateShape();
    1967. 

  1967. +        updateOpacity();
    1968. 

  1968. +        // no need in updateOpaque() as it is no-op
    1969. 

  1969.      }
    1970. 

  1970.  
    1971. 

  1971.      public void updateIconImages() {
    1972. 

  1972. @@ -426,6 +435,22 @@
    1973. 

  1973.          return defaultIconInfo;
    1974. 

  1974.      }
    1975. 

  1975.  
    1976. 

  1976. +    private void updateShape() {
    1977. 

  1977. +        // Shape shape = ((Window)target).getShape();
    1978. 

  1978. +        Shape shape = AWTAccessor.getWindowAccessor().getShape((Window)target);
    1979. 

  1979. +        if (shape != null) {
    1980. 

  1980. +            applyShape(Region.getInstance(shape, null));
    1981. 

  1981. +        }
    1982. 

  1982. +    }
    1983. 

  1983. +
    1984. 

  1984. +    private void updateOpacity() {
    1985. 

  1985. +        // float opacity = ((Window)target).getOpacity();
    1986. 

  1986. +        float opacity = AWTAccessor.getWindowAccessor().getOpacity((Window)target);
    1987. 

  1987. +        if (opacity < 1.0f) {
    1988. 

  1988. +            setOpacity(opacity);
    1989. 

  1989. +        }
    1990. 

  1990. +    }
    1991. 

  1991. +
    1992. 

  1992.      public void updateMinimumSize() {
    1993. 

  1993.          //This function only saves minimumSize value in XWindowPeer
    1994. 

  1994.          //Setting WMSizeHints is implemented in XDecoratedPeer
    1995. 

  1995. @@ -2122,4 +2147,44 @@
    1996. 

  1996.          }
    1997. 

  1997.          super.handleButtonPressRelease(xev);
    1998. 

  1998.      }
    1999. 

  1999. +
    2000. 

  2000. +    public void print(Graphics g) {
    2001. 

  2001. +        // We assume we print the whole frame,
    2002. 

  2002. +        // so we expect no clip was set previously
    2003. 

  2003. +        Shape shape = AWTAccessor.getWindowAccessor().getShape((Window)target);
    2004. 

  2004. +        if (shape != null) {
    2005. 

  2005. +            g.setClip(shape);
    2006. 

  2006. +        }
    2007. 

  2007. +        super.print(g);
    2008. 

  2008. +    }
    2009. 

  2009. +
    2010. 

  2010. +    @Override
    2011. 

  2011. +    public void setOpacity(float opacity) {
    2012. 

  2012. +        final long maxOpacity = 0xffffffffl;
    2013. 

  2013. +        long iOpacity = (long)(opacity * maxOpacity);
    2014. 

  2014. +        if (iOpacity < 0) {
    2015. 

  2015. +            iOpacity = 0;
    2016. 

  2016. +        }
    2017. 

  2017. +        if (iOpacity > maxOpacity) {
    2018. 

  2018. +            iOpacity = maxOpacity;
    2019. 

  2019. +        }
    2020. 

  2020. +
    2021. 

  2021. +        XAtom netWmWindowOpacityAtom = XAtom.get("_NET_WM_WINDOW_OPACITY");
    2022. 

  2022. +
    2023. 

  2023. +        if (iOpacity == maxOpacity) {
    2024. 

  2024. +            netWmWindowOpacityAtom.DeleteProperty(getWindow());
    2025. 

  2025. +        } else {
    2026. 

  2026. +            netWmWindowOpacityAtom.setCard32Property(getWindow(), iOpacity);
    2027. 

  2027. +        }
    2028. 

  2028. +    }
    2029. 

  2029. +
    2030. 

  2030. +    @Override
    2031. 

  2031. +    public void setOpaque(boolean isOpaque) {
    2032. 

  2032. +        // no-op
    2033. 

  2033. +    }
    2034. 

  2034. +
    2035. 

  2035. +    @Override
    2036. 

  2036. +    public void updateWindow(BufferedImage backBuffer) {
    2037. 

  2037. +        // no-op
    2038. 

  2038. +    }
    2039. 

  2039.  }
    2040. 

  2040. diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java
    2041. 

  2041. --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java	2011-02-16 00:40:21.000000000 +0000
    2042. 

  2042. +++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsConfig.java	2011-02-16 01:27:25.008325931 +0000
    2043. 

  2043. @@ -1,5 +1,5 @@
    2044. 

  2044.  /*
    2045. 

  2045. - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    2046. 

  2046. + * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    2047. 

  2047.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2048. 

  2048.   *
    2049. 

  2049.   * This code is free software; you can redistribute it and/or modify it
    2050. 

  2050. @@ -458,4 +458,13 @@
    2051. 

  2051.              return 0x00; // UNDEFINED
    2052. 

  2052.          }
    2053. 

  2053.      }
    2054. 

  2054. +
    2055. 

  2055. +    /*
    2056. 

  2056. +    @Override
    2057. 

  2057. +    */
    2058. 

  2058. +    public boolean isTranslucencyCapable() {
    2059. 

  2059. +        return isTranslucencyCapable(getAData());
    2060. 

  2060. +    }
    2061. 

  2061. +
    2062. 

  2062. +    private native boolean isTranslucencyCapable(long x11ConfigData);
    2063. 

  2063.  }
    2064. 

  2064. diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
    2065. 

  2065. --- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	2011-01-20 23:54:42.000000000 +0000
    2066. 

  2066. +++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	2011-02-16 01:27:25.008325931 +0000
    2067. 

  2067. @@ -323,6 +323,48 @@
    2068. 

  2068.      return NULL;
    2069. 

  2069.  }
    2070. 

  2070.  
    2071. 

  2071. +/* Note: until we include the <X11/extensions/Xrender.h> explicitly
    2072. 

  2072. + * we have to define a couple of things ourselves.
    2073. 

  2073. + */
    2074. 

  2074. +typedef unsigned long   PictFormat;
    2075. 

  2075. +#define PictTypeIndexed             0
    2076. 

  2076. +#define PictTypeDirect              1
    2077. 

  2077. +
    2078. 

  2078. +typedef struct {
    2079. 

  2079. +    short   red;
    2080. 

  2080. +    short   redMask;
    2081. 

  2081. +    short   green;
    2082. 

  2082. +    short   greenMask;
    2083. 

  2083. +    short   blue;
    2084. 

  2084. +    short   blueMask;
    2085. 

  2085. +    short   alpha;
    2086. 

  2086. +    short   alphaMask;
    2087. 

  2087. +} XRenderDirectFormat;
    2088. 

  2088. +
    2089. 

  2089. +typedef struct {
    2090. 

  2090. +    PictFormat      id;
    2091. 

  2091. +    int         type;
    2092. 

  2092. +    int         depth;
    2093. 

  2093. +    XRenderDirectFormat direct;
    2094. 

  2094. +    Colormap        colormap;
    2095. 

  2095. +} XRenderPictFormat;
    2096. 

  2096. +
    2097. 

  2097. +#define PictFormatID        (1 << 0)
    2098. 

  2098. +#define PictFormatType      (1 << 1)
    2099. 

  2099. +#define PictFormatDepth     (1 << 2)
    2100. 

  2100. +#define PictFormatRed       (1 << 3)
    2101. 

  2101. +#define PictFormatRedMask   (1 << 4)
    2102. 

  2102. +#define PictFormatGreen     (1 << 5)
    2103. 

  2103. +#define PictFormatGreenMask (1 << 6)
    2104. 

  2104. +#define PictFormatBlue      (1 << 7)
    2105. 

  2105. +#define PictFormatBlueMask  (1 << 8)
    2106. 

  2106. +#define PictFormatAlpha     (1 << 9)
    2107. 

  2107. +#define PictFormatAlphaMask (1 << 10)
    2108. 

  2108. +#define PictFormatColormap  (1 << 11)
    2109. 

  2109. +
    2110. 

  2110. +typedef XRenderPictFormat *
    2111. 

  2111. +XRenderFindVisualFormatFunc (Display *dpy, _Xconst Visual *visual);
    2112. 

  2112. +
    2113. 

  2113.  static void
    2114. 

  2114.  getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
    2115. 

  2115.  
    2116. 

  2116. @@ -336,6 +378,9 @@
    2117. 

  2117.      int ind;
    2118. 

  2118.      char errmsg[128];
    2119. 

  2119.      int xinawareScreen;
    2120. 

  2120. +    void* xrenderLibHandle = NULL;
    2121. 

  2121. +    XRenderFindVisualFormatFunc *XRenderFindVisualFormat = NULL;
    2122. 

  2122. +    int major_opcode, first_event, first_error;
    2123. 

  2123.  
    2124. 

  2124.      if (usingXinerama) {
    2125. 

  2125.          xinawareScreen = 0;
    2126. 

  2126. @@ -418,6 +463,26 @@
    2127. 

  2127.      graphicsConfigs[0] = defaultConfig;
    2128. 

  2128.      nConfig = 1; /* reserve index 0 for default config */
    2129. 

  2129.  
    2130. 

  2130. +    // Only use the RENDER extension if it is available on the X server
    2131. 

  2131. +    if (XQueryExtension(awt_display, "RENDER",
    2132. 

  2132. +                        &major_opcode, &first_event, &first_error))
    2133. 

  2133. +    {
    2134. 

  2134. +        xrenderLibHandle = dlopen("libXrender.so.1", RTLD_LAZY | RTLD_GLOBAL);
    2135. 

  2135. +
    2136. 

  2136. +#ifndef __linux__ /* SOLARIS */
    2137. 

  2137. +        if (xrenderLibHandle == NULL) {
    2138. 

  2138. +            xrenderLibHandle = dlopen("/usr/sfw/lib/libXrender.so.1",
    2139. 

  2139. +                                      RTLD_LAZY | RTLD_GLOBAL);
    2140. 

  2140. +        }
    2141. 

  2141. +#endif
    2142. 

  2142. +
    2143. 

  2143. +        if (xrenderLibHandle != NULL) {
    2144. 

  2144. +            XRenderFindVisualFormat =
    2145. 

  2145. +                (XRenderFindVisualFormatFunc*)dlsym(xrenderLibHandle,
    2146. 

  2146. +                                                    "XRenderFindVisualFormat");
    2147. 

  2147. +        }
    2148. 

  2148. +    }
    2149. 

  2149. +
    2150. 

  2150.      for (i = 0; i < nTrue; i++) {
    2151. 

  2151.          if (XVisualIDFromVisual(pVITrue[i].visual) ==
    2152. 

  2152.              XVisualIDFromVisual(defaultConfig->awt_visInfo.visual) ||
    2153. 

  2153. @@ -431,6 +496,21 @@
    2154. 

  2154.          graphicsConfigs [ind]->awt_depth = pVITrue [i].depth;
    2155. 

  2155.          memcpy (&graphicsConfigs [ind]->awt_visInfo, &pVITrue [i],
    2156. 

  2156.                  sizeof (XVisualInfo));
    2157. 

  2157. +       if (XRenderFindVisualFormat != NULL) {
    2158. 

  2158. +            XRenderPictFormat *format = XRenderFindVisualFormat (awt_display,
    2159. 

  2159. +                    pVITrue [i].visual);
    2160. 

  2160. +            if (format &&
    2161. 

  2161. +                format->type == PictTypeDirect &&
    2162. 

  2162. +                format->direct.alphaMask)
    2163. 

  2163. +            {
    2164. 

  2164. +                graphicsConfigs [ind]->isTranslucencySupported = 1;
    2165. 

  2165. +            }
    2166. 

  2166. +        }
    2167. 

  2167. +    }
    2168. 

  2168. +
    2169. 

  2169. +    if (xrenderLibHandle != NULL) {
    2170. 

  2170. +        dlclose(xrenderLibHandle);
    2171. 

  2171. +        xrenderLibHandle = NULL;
    2172. 

  2172.      }
    2173. 

  2173.  
    2174. 

  2174.      for (i = 0; i < n8p; i++) {
    2175. 

  2175. @@ -1474,6 +1554,26 @@
    2176. 

  2176.  }
    2177. 

  2177.  
    2178. 

  2178.  /*
    2179. 

  2179. + * Class:     sun_awt_X11GraphicsConfig
    2180. 

  2180. + * Method:    isTranslucencyCapable
    2181. 

  2181. + * Signature: (J)V
    2182. 

  2182. + */
    2183. 

  2183. +JNIEXPORT jboolean JNICALL
    2184. 

  2184. +Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable
    2185. 

  2185. +    (JNIEnv *env, jobject this, jlong configData)
    2186. 

  2186. +{
    2187. 

  2187. +#ifdef HEADLESS
    2188. 

  2188. +    return JNI_FALSE;
    2189. 

  2189. +#else
    2190. 

  2190. +    AwtGraphicsConfigDataPtr aData = (AwtGraphicsConfigDataPtr)jlong_to_ptr(configData);
    2191. 

  2191. +    if (aData == NULL) {
    2192. 

  2192. +        return JNI_FALSE;
    2193. 

  2193. +    }
    2194. 

  2194. +    return (jboolean)aData->isTranslucencySupported;
    2195. 

  2195. +#endif
    2196. 

  2196. +}
    2197. 

  2197. +
    2198. 

  2198. +/*
    2199. 

  2199.   * Class:     sun_awt_X11GraphicsDevice
    2200. 

  2200.   * Method:    isDBESupported
    2201. 

  2201.   * Signature: ()Z
    2202. 

  2202. diff -Nru openjdk.orig/jdk/src/solaris/native/sun/awt/awt_p.h openjdk/jdk/src/solaris/native/sun/awt/awt_p.h
    2203. 

  2203. --- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_p.h	2011-01-20 23:54:42.000000000 +0000
    2204. 

  2204. +++ openjdk/jdk/src/solaris/native/sun/awt/awt_p.h	2011-02-16 01:27:25.008325931 +0000
    2205. 

  2205. @@ -1,5 +1,5 @@
    2206. 

  2206.  /*
    2207. 

  2207. - * Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
    2208. 

  2208. + * Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
    2209. 

  2209.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2210. 

  2210.   *
    2211. 

  2211.   * This code is free software; you can redistribute it and/or modify it
    2212. 

  2212. @@ -135,6 +135,7 @@
    2213. 

  2213.      int         pixelStride;     /* Used in X11SurfaceData.c */
    2214. 

  2214.      ColorData      *color_data;
    2215. 

  2215.      struct _GLXGraphicsConfigInfo *glxInfo;
    2216. 

  2216. +    int         isTranslucencySupported; /* Uses Xrender to find this out. */
    2217. 

  2217.  } AwtGraphicsConfigData;
    2218. 

  2218.  
    2219. 

  2219.  typedef AwtGraphicsConfigData* AwtGraphicsConfigDataPtr;
    2220. 

  2220. diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java
    2221. 

  2221. --- openjdk.orig/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java	2011-02-16 00:40:21.000000000 +0000
    2222. 

  2222. +++ openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsConfig.java	2011-02-16 01:27:25.008325931 +0000
    2223. 

  2223. @@ -1,5 +1,5 @@
    2224. 

  2224.  /*
    2225. 

  2225. - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    2226. 

  2226. + * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    2227. 

  2227.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2228. 

  2228.   *
    2229. 

  2229.   * This code is free software; you can redistribute it and/or modify it
    2230. 

  2230. @@ -339,4 +339,12 @@
    2231. 

  2231.          }
    2232. 

  2232.          // the rest of the flip actions are not supported
    2233. 

  2233.      }
    2234. 

  2234. +
    2235. 

  2235. +    /*
    2236. 

  2236. +    @Override
    2237. 

  2237. +    */
    2238. 

  2238. +    public boolean isTranslucencyCapable() {
    2239. 

  2239. +        //XXX: worth checking if 8-bit? Anyway, it doesn't hurt.
    2240. 

  2240. +        return true;
    2241. 

  2241. +    }
    2242. 

  2242.  }
    2243. 

  2243. diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java
    2244. 

  2244. --- openjdk.orig/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java	2011-02-16 00:40:21.000000000 +0000
    2245. 

  2245. +++ openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java	2011-02-16 01:27:25.012325621 +0000
    2246. 

  2246. @@ -1,5 +1,5 @@
    2247. 

  2247.  /*
    2248. 

  2248. - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    2249. 

  2249. + * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    2250. 

  2250.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2251. 

  2251.   *
    2252. 

  2252.   * This code is free software; you can redistribute it and/or modify it
    2253. 

  2253. @@ -379,4 +379,11 @@
    2254. 

  2254.      private static void dwmCompositionChanged(boolean enabled) {
    2255. 

  2255.          isDWMCompositionEnabled = enabled;
    2256. 

  2256.      }
    2257. 

  2257. +
    2258. 

  2258. +    /**
    2259. 

  2259. +     * Used to find out if the OS is Windows Vista or later.
    2260. 

  2260. +     *
    2261. 

  2261. +     * @return {@code true} if the OS is Vista or later, {@code false} otherwise
    2262. 

  2262. +     */
    2263. 

  2263. +    public static native boolean isVistaOS();
    2264. 

  2264.  }
    2265. 

  2265. diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java openjdk/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
    2266. 

  2266. --- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java	1970-01-01 01:00:00.000000000 +0100
    2267. 

  2267. +++ openjdk/jdk/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java	2011-02-16 01:27:25.012325621 +0000
    2268. 

  2268. @@ -0,0 +1,398 @@
    2269. 

  2269. +/*
    2270. 

  2270. + * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
    2271. 

  2271. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2272. 

  2272. + *
    2273. 

  2273. + * This code is free software; you can redistribute it and/or modify it
    2274. 

  2274. + * under the terms of the GNU General Public License version 2 only, as
    2275. 

  2275. + * published by the Free Software Foundation.  Oracle designates this
    2276. 

  2276. + * particular file as subject to the "Classpath" exception as provided
    2277. 

  2277. + * by Oracle in the LICENSE file that accompanied this code.
    2278. 

  2278. + *
    2279. 

  2279. + * This code is distributed in the hope that it will be useful, but WITHOUT
    2280. 

  2280. + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2281. 

  2281. + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2282. 

  2282. + * version 2 for more details (a copy is included in the LICENSE file that
    2283. 

  2283. + * accompanied this code).
    2284. 

  2284. + *
    2285. 

  2285. + * You should have received a copy of the GNU General Public License version
    2286. 

  2286. + * 2 along with this work; if not, write to the Free Software Foundation,
    2287. 

  2287. + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2288. 

  2288. + *
    2289. 

  2289. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2290. 

  2290. + * or visit www.oracle.com if you need additional information or have any
    2291. 

  2291. + * questions.
    2292. 

  2292. + */
    2293. 

  2293. +package sun.awt.windows;
    2294. 

  2294. +
    2295. 

  2295. +import java.awt.AlphaComposite;
    2296. 

  2296. +import java.awt.Color;
    2297. 

  2297. +import java.awt.Graphics2D;
    2298. 

  2298. +import java.awt.GraphicsConfiguration;
    2299. 

  2299. +import java.awt.Image;
    2300. 

  2300. +import java.awt.Window;
    2301. 

  2301. +import java.awt.image.BufferedImage;
    2302. 

  2302. +import java.awt.image.DataBufferInt;
    2303. 

  2303. +import java.awt.image.VolatileImage;
    2304. 

  2304. +import java.lang.ref.WeakReference;
    2305. 

  2305. +import java.security.AccessController;
    2306. 

  2306. +import sun.awt.image.BufImgSurfaceData;
    2307. 

  2307. +import sun.java2d.DestSurfaceProvider;
    2308. 

  2308. +import sun.java2d.InvalidPipeException;
    2309. 

  2309. +import sun.java2d.Surface;
    2310. 

  2310. +import sun.java2d.pipe.RenderQueue;
    2311. 

  2311. +import sun.java2d.pipe.hw.AccelGraphicsConfig;
    2312. 

  2312. +import sun.java2d.pipe.hw.AccelSurface;
    2313. 

  2313. +import sun.security.action.GetPropertyAction;
    2314. 

  2314. +
    2315. 

  2315. +import static java.awt.image.VolatileImage.*;
    2316. 

  2316. +import static java.awt.Transparency.*;
    2317. 

  2317. +import static sun.java2d.pipe.hw.AccelSurface.*;
    2318. 

  2318. +import static sun.java2d.pipe.hw.ContextCapabilities.*;
    2319. 

  2319. +
    2320. 

  2320. +/**
    2321. 

  2321. + * This class handles the updates of the non-opaque windows.
    2322. 

  2322. + * The window associated with the peer is updated either given an image or
    2323. 

  2323. + * the window is repainted to an internal buffer which is then used to update
    2324. 

  2324. + * the window.
    2325. 

  2325. + *
    2326. 

  2326. + * Note: this class does not attempt to be thread safe, it is expected to be
    2327. 

  2327. + * called from a single thread (EDT).
    2328. 

  2328. + */
    2329. 

  2329. +public abstract class TranslucentWindowPainter {
    2330. 

  2330. +
    2331. 

  2331. +    protected Window window;
    2332. 

  2332. +    protected WWindowPeer peer;
    2333. 

  2333. +
    2334. 

  2334. +    // REMIND: we probably would want to remove this later
    2335. 

  2335. +    private static final boolean forceOpt  =
    2336. 

  2336. +        Boolean.valueOf(AccessController.doPrivileged(
    2337. 

  2337. +            new GetPropertyAction("sun.java2d.twp.forceopt", "false")));
    2338. 

  2338. +    private static final boolean forceSW  =
    2339. 

  2339. +        Boolean.valueOf(AccessController.doPrivileged(
    2340. 

  2340. +            new GetPropertyAction("sun.java2d.twp.forcesw", "false")));
    2341. 

  2341. +
    2342. 

  2342. +    /**
    2343. 

  2343. +     * Creates an instance of the painter for particular peer.
    2344. 

  2344. +     */
    2345. 

  2345. +    public static TranslucentWindowPainter createInstance(WWindowPeer peer) {
    2346. 

  2346. +        GraphicsConfiguration gc = peer.getGraphicsConfiguration();
    2347. 

  2347. +        if (!forceSW && gc instanceof AccelGraphicsConfig) {
    2348. 

  2348. +            String gcName = gc.getClass().getSimpleName();
    2349. 

  2349. +            AccelGraphicsConfig agc = (AccelGraphicsConfig)gc;
    2350. 

  2350. +            // this is a heuristic to check that we have a pcix board
    2351. 

  2351. +            // (those have higher transfer rate from gpu to cpu)
    2352. 

  2352. +            if ((agc.getContextCapabilities().getCaps() & CAPS_PS30) != 0 ||
    2353. 

  2353. +                forceOpt)
    2354. 

  2354. +            {
    2355. 

  2355. +                // we check for name to avoid loading classes unnecessarily if
    2356. 

  2356. +                // a pipeline isn't enabled
    2357. 

  2357. +                if (gcName.startsWith("D3D")) {
    2358. 

  2358. +                    return new VIOptD3DWindowPainter(peer);
    2359. 

  2359. +                } else if (forceOpt && gcName.startsWith("WGL")) {
    2360. 

  2360. +                    // on some boards (namely, ATI, even on pcix bus) ogl is
    2361. 

  2361. +                    // very slow reading pixels back so for now it is disabled
    2362. 

  2362. +                    // unless forced
    2363. 

  2363. +                    return new VIOptWGLWindowPainter(peer);
    2364. 

  2364. +                }
    2365. 

  2365. +            }
    2366. 

  2366. +        }
    2367. 

  2367. +        return new BIWindowPainter(peer);
    2368. 

  2368. +    }
    2369. 

  2369. +
    2370. 

  2370. +    protected TranslucentWindowPainter(WWindowPeer peer) {
    2371. 

  2371. +        this.peer = peer;
    2372. 

  2372. +        this.window = (Window)peer.getTarget();
    2373. 

  2373. +    }
    2374. 

  2374. +
    2375. 

  2375. +    /**
    2376. 

  2376. +     * Creates (if needed), clears and returns the buffer for this painter.
    2377. 

  2377. +     */
    2378. 

  2378. +    protected abstract Image getBackBuffer();
    2379. 

  2379. +
    2380. 

  2380. +    /**
    2381. 

  2381. +     * Updates the the window associated with this painter with the contents
    2382. 

  2382. +     * of the passed image.
    2383. 

  2383. +     * The image can not be null, and NPE will be thrown if it is.
    2384. 

  2384. +     */
    2385. 

  2385. +    protected abstract boolean update(Image bb);
    2386. 

  2386. +
    2387. 

  2387. +    /**
    2388. 

  2388. +     * Flushes the resources associated with the painter. They will be
    2389. 

  2389. +     * recreated as needed.
    2390. 

  2390. +     */
    2391. 

  2391. +    public abstract void flush();
    2392. 

  2392. +
    2393. 

  2393. +    /**
    2394. 

  2394. +     * Updates the window associated with the painter given the passed image.
    2395. 

  2395. +     * If the passed image is null the painter will use its own buffer for
    2396. 

  2396. +     * rendering the contents of the window into it and updating the window.
    2397. 

  2397. +     *
    2398. 

  2398. +     * If the passed buffer has dimensions different from the window, it is
    2399. 

  2399. +     * copied into the internal buffer first and the latter is used to update
    2400. 

  2400. +     * the window.
    2401. 

  2401. +     *
    2402. 

  2402. +     * @param bb the image to update the non opaque window with, or null.
    2403. 

  2403. +     * If not null, the image must be of ARGB_PRE type.
    2404. 

  2404. +     */
    2405. 

  2405. +    public void updateWindow(Image bb) {
    2406. 

  2406. +        boolean done = false;
    2407. 

  2407. +        if (bb != null && (window.getWidth()  != bb.getWidth(null) ||
    2408. 

  2408. +                           window.getHeight() != bb.getHeight(null)))
    2409. 

  2409. +        {
    2410. 

  2410. +            Image ourBB = getBackBuffer();
    2411. 

  2411. +            Graphics2D g = (Graphics2D)ourBB.getGraphics();
    2412. 

  2412. +            g.drawImage(bb, 0, 0, null);
    2413. 

  2413. +            g.dispose();
    2414. 

  2414. +            bb = ourBB;
    2415. 

  2415. +        }
    2416. 

  2416. +        do {
    2417. 

  2417. +            if (bb == null) {
    2418. 

  2418. +                bb = getBackBuffer();
    2419. 

  2419. +                Graphics2D g = (Graphics2D)bb.getGraphics();
    2420. 

  2420. +                try {
    2421. 

  2421. +                    window.paintAll(g);
    2422. 

  2422. +                } finally {
    2423. 

  2423. +                    g.dispose();
    2424. 

  2424. +                }
    2425. 

  2425. +            }
    2426. 

  2426. +
    2427. 

  2427. +            peer.paintAppletWarning((Graphics2D)bb.getGraphics(),
    2428. 

  2428. +                                    bb.getWidth(null), bb.getHeight(null));
    2429. 

  2429. +
    2430. 

  2430. +            done = update(bb);
    2431. 

  2431. +            // in case they passed us a lost VI, next time around we'll use our
    2432. 

  2432. +            // own bb because we can not validate and restore the contents of
    2433. 

  2433. +            // their VI
    2434. 

  2434. +            if (!done) {
    2435. 

  2435. +                bb = null;
    2436. 

  2436. +            }
    2437. 

  2437. +        } while (!done);
    2438. 

  2438. +    }
    2439. 

  2439. +
    2440. 

  2440. +    private static final Image clearImage(Image bb) {
    2441. 

  2441. +        Graphics2D g = (Graphics2D)bb.getGraphics();
    2442. 

  2442. +        int w = bb.getWidth(null);
    2443. 

  2443. +        int h = bb.getHeight(null);
    2444. 

  2444. +
    2445. 

  2445. +        g.setComposite(AlphaComposite.Src);
    2446. 

  2446. +        g.setColor(new Color(0, 0, 0, 0));
    2447. 

  2447. +        g.fillRect(0, 0, w, h);
    2448. 

  2448. +
    2449. 

  2449. +        return bb;
    2450. 

  2450. +    }
    2451. 

  2451. +
    2452. 

  2452. +    /**
    2453. 

  2453. +     * A painter which uses BufferedImage as the internal buffer. The window
    2454. 

  2454. +     * is painted into this buffer, and the contents then are uploaded
    2455. 

  2455. +     * into the layered window.
    2456. 

  2456. +     *
    2457. 

  2457. +     * This painter handles all types of images passed to its paint(Image)
    2458. 

  2458. +     * method (VI, BI, regular Images).
    2459. 

  2459. +     */
    2460. 

  2460. +    private static class BIWindowPainter extends TranslucentWindowPainter {
    2461. 

  2461. +        private WeakReference<BufferedImage> biRef;
    2462. 

  2462. +
    2463. 

  2463. +        protected BIWindowPainter(WWindowPeer peer) {
    2464. 

  2464. +            super(peer);
    2465. 

  2465. +        }
    2466. 

  2466. +
    2467. 

  2467. +        private BufferedImage getBIBackBuffer() {
    2468. 

  2468. +            int w = window.getWidth();
    2469. 

  2469. +            int h = window.getHeight();
    2470. 

  2470. +            BufferedImage bb = biRef == null ? null : biRef.get();
    2471. 

  2471. +            if (bb == null || bb.getWidth() != w || bb.getHeight() != h) {
    2472. 

  2472. +                if (bb != null) {
    2473. 

  2473. +                    bb.flush();
    2474. 

  2474. +                    bb = null;
    2475. 

  2475. +                }
    2476. 

  2476. +                bb = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB_PRE);
    2477. 

  2477. +                biRef = new WeakReference<BufferedImage>(bb);
    2478. 

  2478. +            }
    2479. 

  2479. +            return (BufferedImage)clearImage(bb);
    2480. 

  2480. +        }
    2481. 

  2481. +
    2482. 

  2482. +        @Override
    2483. 

  2483. +        protected Image getBackBuffer() {
    2484. 

  2484. +            return getBIBackBuffer();
    2485. 

  2485. +        }
    2486. 

  2486. +
    2487. 

  2487. +        @Override
    2488. 

  2488. +        protected boolean update(Image bb) {
    2489. 

  2489. +            VolatileImage viBB = null;
    2490. 

  2490. +
    2491. 

  2491. +            if (bb instanceof BufferedImage) {
    2492. 

  2492. +                BufferedImage bi = (BufferedImage)bb;
    2493. 

  2493. +                int data[] =
    2494. 

  2494. +                    ((DataBufferInt)bi.getRaster().getDataBuffer()).getData();
    2495. 

  2495. +                peer.updateWindowImpl(data, bi.getWidth(), bi.getHeight());
    2496. 

  2496. +                return true;
    2497. 

  2497. +            } else if (bb instanceof VolatileImage) {
    2498. 

  2498. +                viBB = (VolatileImage)bb;
    2499. 

  2499. +                if (bb instanceof DestSurfaceProvider) {
    2500. 

  2500. +                    Surface s = ((DestSurfaceProvider)bb).getDestSurface();
    2501. 

  2501. +                    if (s instanceof BufImgSurfaceData) {
    2502. 

  2502. +                        // the image is probably lost, upload the data from the
    2503. 

  2503. +                        // backup surface to avoid creating another heap-based
    2504. 

  2504. +                        // image (the parent's buffer)
    2505. 

  2505. +                        int w = viBB.getWidth();
    2506. 

  2506. +                        int h = viBB.getHeight();
    2507. 

  2507. +                        BufImgSurfaceData bisd = (BufImgSurfaceData)s;
    2508. 

  2508. +                        int data[] = ((DataBufferInt)bisd.getRaster(0,0,w,h).
    2509. 

  2509. +                            getDataBuffer()).getData();
    2510. 

  2510. +                        peer.updateWindowImpl(data, w, h);
    2511. 

  2511. +                        return true;
    2512. 

  2512. +                    }
    2513. 

  2513. +                }
    2514. 

  2514. +            }
    2515. 

  2515. +
    2516. 

  2516. +            // copy the passed image into our own buffer, then upload
    2517. 

  2517. +            BufferedImage bi = getBIBackBuffer();
    2518. 

  2518. +            Graphics2D g = (Graphics2D)bi.getGraphics();
    2519. 

  2519. +            g.setComposite(AlphaComposite.Src);
    2520. 

  2520. +            g.drawImage(bb, 0, 0, null);
    2521. 

  2521. +
    2522. 

  2522. +            int data[] =
    2523. 

  2523. +                ((DataBufferInt)bi.getRaster().getDataBuffer()).getData();
    2524. 

  2524. +            peer.updateWindowImpl(data, bi.getWidth(), bi.getHeight());
    2525. 

  2525. +
    2526. 

  2526. +            return (viBB != null ? !viBB.contentsLost() : true);
    2527. 

  2527. +        }
    2528. 

  2528. +
    2529. 

  2529. +        public void flush() {
    2530. 

  2530. +            if (biRef != null) {
    2531. 

  2531. +                biRef.clear();
    2532. 

  2532. +            }
    2533. 

  2533. +        }
    2534. 

  2534. +    }
    2535. 

  2535. +
    2536. 

  2536. +    /**
    2537. 

  2537. +     * A version of the painter which uses VolatileImage as the internal buffer.
    2538. 

  2538. +     * The window is painted into this VI and then copied into the parent's
    2539. 

  2539. +     * Java heap-based buffer (which is then uploaded to the layered window)
    2540. 

  2540. +     */
    2541. 

  2541. +    private static class VIWindowPainter extends BIWindowPainter {
    2542. 

  2542. +        private WeakReference<VolatileImage> viRef;
    2543. 

  2543. +
    2544. 

  2544. +        protected VIWindowPainter(WWindowPeer peer) {
    2545. 

  2545. +            super(peer);
    2546. 

  2546. +        }
    2547. 

  2547. +
    2548. 

  2548. +        @Override
    2549. 

  2549. +        protected Image getBackBuffer() {
    2550. 

  2550. +            int w = window.getWidth();
    2551. 

  2551. +            int h = window.getHeight();
    2552. 

  2552. +            GraphicsConfiguration gc = peer.getGraphicsConfiguration();
    2553. 

  2553. +
    2554. 

  2554. +            VolatileImage viBB = viRef == null ? null : viRef.get();
    2555. 

  2555. +
    2556. 

  2556. +            if (viBB == null || viBB.getWidth() != w || viBB.getHeight() != h ||
    2557. 

  2557. +                viBB.validate(gc) == IMAGE_INCOMPATIBLE)
    2558. 

  2558. +            {
    2559. 

  2559. +                if (viBB != null) {
    2560. 

  2560. +                    viBB.flush();
    2561. 

  2561. +                    viBB = null;
    2562. 

  2562. +                }
    2563. 

  2563. +
    2564. 

  2564. +                if (gc instanceof AccelGraphicsConfig) {
    2565. 

  2565. +                    AccelGraphicsConfig agc = ((AccelGraphicsConfig)gc);
    2566. 

  2566. +                    viBB = agc.createCompatibleVolatileImage(w, h,
    2567. 

  2567. +                                                             TRANSLUCENT,
    2568. 

  2568. +                                                             RT_PLAIN);
    2569. 

  2569. +                }
    2570. 

  2570. +                if (viBB == null) {
    2571. 

  2571. +                    viBB = gc.createCompatibleVolatileImage(w, h, TRANSLUCENT);
    2572. 

  2572. +                }
    2573. 

  2573. +                viBB.validate(gc);
    2574. 

  2574. +                viRef = new WeakReference<VolatileImage>(viBB);
    2575. 

  2575. +            }
    2576. 

  2576. +
    2577. 

  2577. +            return clearImage(viBB);
    2578. 

  2578. +        }
    2579. 

  2579. +
    2580. 

  2580. +        @Override
    2581. 

  2581. +        public void flush() {
    2582. 

  2582. +            if (viRef != null) {
    2583. 

  2583. +                VolatileImage viBB = viRef.get();
    2584. 

  2584. +                if (viBB != null) {
    2585. 

  2585. +                    viBB.flush();
    2586. 

  2586. +                    viBB = null;
    2587. 

  2587. +                }
    2588. 

  2588. +                viRef.clear();
    2589. 

  2589. +            }
    2590. 

  2590. +        }
    2591. 

  2591. +    }
    2592. 

  2592. +
    2593. 

  2593. +    /**
    2594. 

  2594. +     * Optimized version of hw painter. Uses VolatileImages for the
    2595. 

  2595. +     * buffer, and uses an optimized path to pull the data from those into
    2596. 

  2596. +     * the layered window, bypassing Java heap-based image.
    2597. 

  2597. +     */
    2598. 

  2598. +    private abstract static class VIOptWindowPainter extends VIWindowPainter {
    2599. 

  2599. +
    2600. 

  2600. +        protected VIOptWindowPainter(WWindowPeer peer) {
    2601. 

  2601. +            super(peer);
    2602. 

  2602. +        }
    2603. 

  2603. +
    2604. 

  2604. +        protected abstract boolean updateWindowAccel(long psdops, int w, int h);
    2605. 

  2605. +
    2606. 

  2606. +        @Override
    2607. 

  2607. +        protected boolean update(Image bb) {
    2608. 

  2608. +            if (bb instanceof DestSurfaceProvider) {
    2609. 

  2609. +                Surface s = ((DestSurfaceProvider)bb).getDestSurface();
    2610. 

  2610. +                if (s instanceof AccelSurface) {
    2611. 

  2611. +                    final int w = bb.getWidth(null);
    2612. 

  2612. +                    final int h = bb.getHeight(null);
    2613. 

  2613. +                    final boolean arr[] = { false };
    2614. 

  2614. +                    final AccelSurface as = (AccelSurface)s;
    2615. 

  2615. +                    RenderQueue rq = as.getContext().getRenderQueue();
    2616. 

  2616. +                    rq.lock();
    2617. 

  2617. +                    try {
    2618. 

  2618. +                        as.getContext().validateContext(as);
    2619. 

  2619. +                        rq.flushAndInvokeNow(new Runnable() {
    2620. 

  2620. +                            public void run() {
    2621. 

  2621. +                                long psdops = as.getNativeOps();
    2622. 

  2622. +                                arr[0] = updateWindowAccel(psdops, w, h);
    2623. 

  2623. +                            }
    2624. 

  2624. +                        });
    2625. 

  2625. +                    } catch (InvalidPipeException e) {
    2626. 

  2626. +                        // ignore, false will be returned
    2627. 

  2627. +                    } finally {
    2628. 

  2628. +                        rq.unlock();
    2629. 

  2629. +                    }
    2630. 

  2630. +                    return arr[0];
    2631. 

  2631. +                }
    2632. 

  2632. +            }
    2633. 

  2633. +            return super.update(bb);
    2634. 

  2634. +        }
    2635. 

  2635. +    }
    2636. 

  2636. +
    2637. 

  2637. +    private static class VIOptD3DWindowPainter extends VIOptWindowPainter {
    2638. 

  2638. +
    2639. 

  2639. +        protected VIOptD3DWindowPainter(WWindowPeer peer) {
    2640. 

  2640. +            super(peer);
    2641. 

  2641. +        }
    2642. 

  2642. +
    2643. 

  2643. +        @Override
    2644. 

  2644. +        protected boolean updateWindowAccel(long psdops, int w, int h) {
    2645. 

  2645. +            // note: this method is executed on the toolkit thread, no sync is
    2646. 

  2646. +            // necessary at the native level, and a pointer to peer can be used
    2647. 

  2647. +            return sun.java2d.d3d.D3DSurfaceData.
    2648. 

  2648. +                updateWindowAccelImpl(psdops, peer.getData(), w, h);
    2649. 

  2649. +        }
    2650. 

  2650. +    }
    2651. 

  2651. +
    2652. 

  2652. +    private static class VIOptWGLWindowPainter extends VIOptWindowPainter {
    2653. 

  2653. +
    2654. 

  2654. +        protected VIOptWGLWindowPainter(WWindowPeer peer) {
    2655. 

  2655. +            super(peer);
    2656. 

  2656. +        }
    2657. 

  2657. +
    2658. 

  2658. +        @Override
    2659. 

  2659. +        protected boolean updateWindowAccel(long psdops, int w, int h) {
    2660. 

  2660. +            // note: part of this method which deals with GDI will be on the
    2661. 

  2661. +            // toolkit thread
    2662. 

  2662. +            return sun.java2d.opengl.WGLSurfaceData.
    2663. 

  2663. +                updateWindowAccelImpl(psdops, peer, w, h);
    2664. 

  2664. +        }
    2665. 

  2665. +    }
    2666. 

  2666. +}
    2667. 

  2667. diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java openjdk/jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java
    2668. 

  2668. --- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java	2011-01-20 23:54:43.000000000 +0000
    2669. 

  2669. +++ openjdk/jdk/src/windows/classes/sun/awt/windows/WCanvasPeer.java	2011-02-16 01:27:25.012325621 +0000
    2670. 

  2670. @@ -1,5 +1,5 @@
    2671. 

  2671.  /*
    2672. 

  2672. - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
    2673. 

  2673. + * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
    2674. 

  2674.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2675. 

  2675.   *
    2676. 

  2676.   * This code is free software; you can redistribute it and/or modify it
    2677. 

  2677. @@ -28,6 +28,7 @@
    2678. 

  2678.  import java.awt.peer.*;
    2679. 

  2679.  import java.lang.ref.WeakReference;
    2680. 

  2680.  import java.lang.reflect.Method;
    2681. 

  2681. +import sun.awt.AWTAccessor;
    2682. 

  2682.  import sun.awt.ComponentAccessor;
    2683. 

  2683.  import sun.awt.SunToolkit;
    2684. 

  2684.  import sun.awt.Win32GraphicsDevice;
    2685. 

  2685. @@ -110,16 +111,20 @@
    2686. 

  2686.      }
    2687. 

  2687.  
    2688. 

  2688.      public void print(Graphics g) {
    2689. 

  2689. -        Dimension d = ((Component)target).getSize();
    2690. 

  2690. -        if (g instanceof Graphics2D ||
    2691. 

  2691. -            g instanceof sun.awt.Graphics2Delegate) {
    2692. 

  2692. -            // background color is setup correctly, so just use clearRect
    2693. 

  2693. -            g.clearRect(0, 0, d.width, d.height);
    2694. 

  2694. -        } else {
    2695. 

  2695. -            // emulate clearRect
    2696. 

  2696. -            g.setColor(((Component)target).getBackground());
    2697. 

  2697. -            g.fillRect(0, 0, d.width, d.height);
    2698. 

  2698. -            g.setColor(((Component)target).getForeground());
    2699. 

  2699. +        if (!(target instanceof Window) ||
    2700. 

  2700. +            AWTAccessor.getWindowAccessor().isOpaque((Window)target))
    2701. 

  2701. +        {
    2702. 

  2702. +            Dimension d = ((Component)target).getSize();
    2703. 

  2703. +            if (g instanceof Graphics2D ||
    2704. 

  2704. +                g instanceof sun.awt.Graphics2Delegate) {
    2705. 

  2705. +                // background color is setup correctly, so just use clearRect
    2706. 

  2706. +                g.clearRect(0, 0, d.width, d.height);
    2707. 

  2707. +            } else {
    2708. 

  2708. +                // emulate clearRect
    2709. 

  2709. +                g.setColor(((Component)target).getBackground());
    2710. 

  2710. +                g.fillRect(0, 0, d.width, d.height);
    2711. 

  2711. +                g.setColor(((Component)target).getForeground());
    2712. 

  2712. +            }
    2713. 

  2713.          }
    2714. 

  2714.          super.print(g);
    2715. 

  2715.      }
    2716. 

  2716. diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java openjdk/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
    2717. 

  2717. --- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java	2011-02-16 00:40:21.000000000 +0000
    2718. 

  2718. +++ openjdk/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java	2011-02-16 01:27:25.012325621 +0000
    2719. 

  2719. @@ -1,5 +1,5 @@
    2720. 

  2720.  /*
    2721. 

  2721. - * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
    2722. 

  2722. + * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
    2723. 

  2723.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2724. 

  2724.   *
    2725. 

  2725.   * This code is free software; you can redistribute it and/or modify it
    2726. 

  2726. @@ -39,21 +39,22 @@
    2727. 

  2727.  import java.awt.event.InvocationEvent;
    2728. 

  2728.  import java.awt.event.KeyEvent;
    2729. 

  2729.  import sun.awt.Win32GraphicsConfig;
    2730. 

  2730. +import sun.awt.Win32GraphicsEnvironment;
    2731. 

  2731.  import sun.java2d.InvalidPipeException;
    2732. 

  2732.  import sun.java2d.SurfaceData;
    2733. 

  2733. -import sun.java2d.d3d.D3DScreenUpdateManager;
    2734. 

  2734. -import static sun.java2d.d3d.D3DSurfaceData.*;
    2735. 

  2735.  import sun.java2d.ScreenUpdateManager;
    2736. 

  2736. +import sun.java2d.d3d.D3DSurfaceData;
    2737. 

  2737.  import sun.java2d.opengl.OGLSurfaceData;
    2738. 

  2738. +import sun.java2d.pipe.Region;
    2739. 

  2739.  import sun.awt.DisplayChangedListener;
    2740. 

  2740.  import sun.awt.PaintEventDispatcher;
    2741. 

  2741. +import sun.awt.SunToolkit;
    2742. 

  2742.  import sun.awt.event.IgnorePaintEvent;
    2743. 

  2743.  
    2744. 

  2744.  import java.awt.dnd.DropTarget;
    2745. 

  2745.  import java.awt.dnd.peer.DropTargetPeer;
    2746. 

  2746.  import sun.awt.ComponentAccessor;
    2747. 

  2747.  
    2748. 

  2748. -
    2749. 

  2749.  import java.util.logging.*;
    2750. 

  2750.  
    2751. 

  2751.  
    2752. 

  2752. @@ -193,7 +194,7 @@
    2753. 

  2753.                  cont.invalidate();
    2754. 

  2754.                  cont.validate();
    2755. 

  2755.  
    2756. 

  2756. -                if (surfaceData instanceof D3DWindowSurfaceData ||
    2757. 

  2757. +                if (surfaceData instanceof D3DSurfaceData.D3DWindowSurfaceData ||
    2758. 

  2758.                      surfaceData instanceof OGLSurfaceData)
    2759. 

  2759.                  {
    2760. 

  2760.                      // When OGL or D3D is enabled, it is necessary to
    2761. 

  2761. @@ -265,7 +266,7 @@
    2762. 

  2762.              int[] pix = createPrintedPixels(0, startY, totalW, h);
    2763. 

  2763.              if (pix != null) {
    2764. 

  2764.                  BufferedImage bim = new BufferedImage(totalW, h,
    2765. 

  2765. -                                              BufferedImage.TYPE_INT_RGB);
    2766. 

  2766. +                                              BufferedImage.TYPE_INT_ARGB);
    2767. 

  2767.                  bim.setRGB(0, 0, totalW, h, pix, 0, totalW);
    2768. 

  2768.                  g.drawImage(bim, 0, startY, null);
    2769. 

  2769.                  bim.flush();
    2770. 

  2770. @@ -902,25 +903,6 @@
    2771. 

  2771.      public void setBoundsOperation(int operation) {
    2772. 

  2772.      }
    2773. 

  2773.  
    2774. 

  2774. -
    2775. 

  2775. -    native void setRectangularShape(int lox, int loy, int hix, int hiy,
    2776. 

  2776. -                     sun.java2d.pipe.Region region);
    2777. 

  2777. -
    2778. 

  2778. -
    2779. 

  2779. -    // REMIND: Temp workaround for issues with using HW acceleration
    2780. 

  2780. -    // in the browser on Vista when DWM is enabled.
    2781. 

  2781. -    // @return true if the toplevel container is not an EmbeddedFrame or
    2782. 

  2782. -    // if this EmbeddedFrame is acceleration capable, false otherwise
    2783. 

  2783. -    private static final boolean isContainingTopLevelAccelCapable(Component c) {
    2784. 

  2784. -        while (c != null && !(c instanceof WEmbeddedFrame)) {
    2785. 

  2785. -            c = c.getParent();
    2786. 

  2786. -        }
    2787. 

  2787. -        if (c == null) {
    2788. 

  2788. -            return true;
    2789. 

  2789. -        }
    2790. 

  2790. -        return ((WEmbeddedFramePeer)c.getPeer()).isAccelCapable();
    2791. 

  2791. -    }
    2792. 

  2792. -
    2793. 

  2793.      /**
    2794. 

  2794.       * Returns whether this component is capable of being hw accelerated.
    2795. 

  2795.       * More specifically, whether rendering to this component or a
    2796. 

  2796. @@ -935,28 +917,36 @@
    2797. 

  2797.       * @see com.sun.awt.AWTUtilities.Translucency#TRANSLUCENT
    2798. 

  2798.       */
    2799. 

  2799.      public boolean isAccelCapable() {
    2800. 

  2800. -        // REMIND: Temp workaround for issues with using HW acceleration
    2801. 

  2801. -        // in the browser on Vista when DWM is enabled
    2802. 

  2802. -        if (!isContainingTopLevelAccelCapable((Component)target)) {
    2803. 

  2803. -            return false;
    2804. 

  2804. -        }
    2805. 

  2805. -
    2806. 

  2806. -        // REMIND: translucent windows support-related
    2807. 

  2807. -/*
    2808. 

  2808.          boolean isTranslucent =
    2809. 

  2809.              SunToolkit.isContainingTopLevelTranslucent((Component)target);
    2810. 

  2810.          // D3D/OGL and translucent windows interacted poorly in Windows XP;
    2811. 

  2811.          // these problems are no longer present in Vista
    2812. 

  2812.          return !isTranslucent || Win32GraphicsEnvironment.isVistaOS();
    2813. 

  2813. -*/
    2814. 

  2814. -        return true;
    2815. 

  2815. +    }
    2816. 

  2816. +
    2817. 

  2817. +    native void setRectangularShape(int lox, int loy, int hix, int hiy,
    2818. 

  2818. +                     Region region);
    2819. 

  2819. +
    2820. 

  2820. +
    2821. 

  2821. +    // REMIND: Temp workaround for issues with using HW acceleration
    2822. 

  2822. +    // in the browser on Vista when DWM is enabled.
    2823. 

  2823. +    // @return true if the toplevel container is not an EmbeddedFrame or
    2824. 

  2824. +    // if this EmbeddedFrame is acceleration capable, false otherwise
    2825. 

  2825. +    private static final boolean isContainingTopLevelAccelCapable(Component c) {
    2826. 

  2826. +        while (c != null && !(c instanceof WEmbeddedFrame)) {
    2827. 

  2827. +            c = c.getParent();
    2828. 

  2828. +        }
    2829. 

  2829. +        if (c == null) {
    2830. 

  2830. +            return true;
    2831. 

  2831. +        }
    2832. 

  2832. +        return ((WEmbeddedFramePeer)c.getPeer()).isAccelCapable();
    2833. 

  2833.      }
    2834. 

  2834.  
    2835. 

  2835.      /**
    2836. 

  2836.       * Applies the shape to the native component window.
    2837. 

  2837.       * @since 1.7
    2838. 

  2838.       */
    2839. 

  2839. -    public void applyShape(sun.java2d.pipe.Region shape) {
    2840. 

  2840. +    public void applyShape(Region shape) {
    2841. 

  2841.          if (shapeLog.isLoggable(Level.FINER)) {
    2842. 

  2842.              shapeLog.finer(
    2843. 

  2843.                      "*** INFO: Setting shape: PEER: " + this
    2844. 

  2844. diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java openjdk/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java
    2845. 

  2845. --- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java	2011-01-20 23:54:43.000000000 +0000
    2846. 

  2846. +++ openjdk/jdk/src/windows/classes/sun/awt/windows/WFileDialogPeer.java	2011-02-16 01:27:25.012325621 +0000
    2847. 

  2847. @@ -1,5 +1,5 @@
    2848. 

  2848.  /*
    2849. 

  2849. - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
    2850. 

  2850. + * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
    2851. 

  2851.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2852. 

  2852.   *
    2853. 

  2853.   * This code is free software; you can redistribute it and/or modify it
    2854. 

  2854. @@ -244,4 +244,10 @@
    2855. 

  2855.      public boolean isRestackSupported() {
    2856. 

  2856.          return false;
    2857. 

  2857.      }
    2858. 

  2858. +
    2859. 

  2859. +    // The effects are not supported for system dialogs.
    2860. 

  2860. +    public void applyShape(sun.java2d.pipe.Region shape) {}
    2861. 

  2861. +    public void setOpacity(float opacity) {}
    2862. 

  2862. +    public void setOpaque(boolean isOpaque) {}
    2863. 

  2863. +    public void updateWindow(java.awt.image.BufferedImage backBuffer) {}
    2864. 

  2864.  }
    2865. 

  2865. diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java openjdk/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java
    2866. 

  2866. --- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java	2011-01-20 23:54:43.000000000 +0000
    2867. 

  2867. +++ openjdk/jdk/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java	2011-02-16 01:27:25.012325621 +0000
    2868. 

  2868. @@ -1,5 +1,5 @@
    2869. 

  2869.  /*
    2870. 

  2870. - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
    2871. 

  2871. + * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
    2872. 

  2872.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2873. 

  2873.   *
    2874. 

  2874.   * This code is free software; you can redistribute it and/or modify it
    2875. 

  2875. @@ -156,4 +156,10 @@
    2876. 

  2876.      public boolean isRestackSupported() {
    2877. 

  2877.          return false;
    2878. 

  2878.      }
    2879. 

  2879. +
    2880. 

  2880. +    // The effects are not supported for system dialogs.
    2881. 

  2881. +    public void applyShape(sun.java2d.pipe.Region shape) {}
    2882. 

  2882. +    public void setOpacity(float opacity) {}
    2883. 

  2883. +    public void setOpaque(boolean isOpaque) {}
    2884. 

  2884. +    public void updateWindow(java.awt.image.BufferedImage backBuffer) {}
    2885. 

  2885.  }
    2886. 

  2886. diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WToolkit.java openjdk/jdk/src/windows/classes/sun/awt/windows/WToolkit.java
    2887. 

  2887. --- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WToolkit.java	2011-02-16 00:40:21.000000000 +0000
    2888. 

  2888. +++ openjdk/jdk/src/windows/classes/sun/awt/windows/WToolkit.java	2011-02-16 01:27:25.012325621 +0000
    2889. 

  2889. @@ -1,5 +1,5 @@
    2890. 

  2890.  /*
    2891. 

  2891. - * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
    2892. 

  2892. + * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
    2893. 

  2893.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2894. 

  2894.   *
    2895. 

  2895.   * This code is free software; you can redistribute it and/or modify it
    2896. 

  2896. @@ -966,4 +966,34 @@
    2897. 

  2897.      }
    2898. 

  2898.  
    2899. 

  2899.      private static native boolean isProtectedMode();
    2900. 

  2900. +
    2901. 

  2901. +    @Override
    2902. 

  2902. +    public boolean isWindowOpacitySupported() {
    2903. 

  2903. +        // supported in Win2K and later
    2904. 

  2904. +        return true;
    2905. 

  2905. +    }
    2906. 

  2906. +
    2907. 

  2907. +    @Override
    2908. 

  2908. +    public boolean isWindowShapingSupported() {
    2909. 

  2909. +        return true;
    2910. 

  2910. +    }
    2911. 

  2911. +
    2912. 

  2912. +    @Override
    2913. 

  2913. +    public boolean isWindowTranslucencySupported() {
    2914. 

  2914. +        // supported in Win2K and later
    2915. 

  2915. +        return true;
    2916. 

  2916. +    }
    2917. 

  2917. +
    2918. 

  2918. +    @Override
    2919. 

  2919. +    public boolean isTranslucencyCapable(GraphicsConfiguration gc) {
    2920. 

  2920. +        //XXX: worth checking if 8-bit? Anyway, it doesn't hurt.
    2921. 

  2921. +        return true;
    2922. 

  2922. +    }
    2923. 

  2923. +
    2924. 

  2924. +    // On MS Windows one must use the peer.updateWindow() to implement
    2925. 

  2925. +    // non-opaque windows.
    2926. 

  2926. +    @Override
    2927. 

  2927. +    public boolean needUpdateWindow() {
    2928. 

  2928. +        return true;
    2929. 

  2929. +    }
    2930. 

  2930.  }
    2931. 

  2931. diff -Nru openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java openjdk/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java
    2932. 

  2932. --- openjdk.orig/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java	2011-01-20 23:54:43.000000000 +0000
    2933. 

  2933. +++ openjdk/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java	2011-02-16 01:27:25.012325621 +0000
    2934. 

  2934. @@ -1,5 +1,5 @@
    2935. 

  2935.  /*
    2936. 

  2936. - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
    2937. 

  2937. + * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
    2938. 

  2938.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    2939. 

  2939.   *
    2940. 

  2940.   * This code is free software; you can redistribute it and/or modify it
    2941. 

  2941. @@ -31,17 +31,15 @@
    2942. 

  2942.  
    2943. 

  2943.  import java.beans.*;
    2944. 

  2944.  
    2945. 

  2945. -import java.lang.ref.*;
    2946. 

  2946.  import java.lang.reflect.*;
    2947. 

  2947.  
    2948. 

  2948. -import java.security.*;
    2949. 

  2949. -
    2950. 

  2950.  import java.util.*;
    2951. 

  2951.  import java.util.List;
    2952. 

  2952.  import java.util.logging.*;
    2953. 

  2953.  
    2954. 

  2954.  import sun.awt.*;
    2955. 

  2955. -import sun.awt.image.*;
    2956. 

  2956. +
    2957. 

  2957. +import sun.java2d.pipe.Region;
    2958. 

  2958.  
    2959. 

  2959.  public class WWindowPeer extends WPanelPeer implements WindowPeer {
    2960. 

  2960.  
    2961. 

  2961. @@ -52,6 +50,10 @@
    2962. 

  2962.      // extends WWindowPeer, not WDialogPeer
    2963. 

  2963.      private WWindowPeer modalBlocker = null;
    2964. 

  2964.  
    2965. 

  2965. +    private boolean isOpaque;
    2966. 

  2966. +
    2967. 

  2967. +    private volatile TranslucentWindowPainter painter;
    2968. 

  2968. +
    2969. 

  2969.      /*
    2970. 

  2970.       * A key used for storing a list of active windows in AppContext. The value
    2971. 

  2971.       * is a list of windows, sorted by the time of activation: later a window is
    2972. 

  2972. @@ -90,9 +92,18 @@
    2973. 

  2973.                  l.remove(this);
    2974. 

  2974.              }
    2975. 

  2975.          }
    2976. 

  2976. +
    2977. 

  2977.          // Remove ourself from the Map of DisplayChangeListeners
    2978. 

  2978.          GraphicsConfiguration gc = getGraphicsConfiguration();
    2979. 

  2979.          ((Win32GraphicsDevice)gc.getDevice()).removeDisplayChangedListener(this);
    2980. 

  2980. +
    2981. 

  2981. +        TranslucentWindowPainter currentPainter = painter;
    2982. 

  2982. +        if (currentPainter != null) {
    2983. 

  2983. +            currentPainter.flush();
    2984. 

  2984. +            // don't set the current one to null here; reduces the chances of
    2985. 

  2985. +            // MT issues (like NPEs)
    2986. 

  2986. +        }
    2987. 

  2987. +
    2988. 

  2988.          super.disposeImpl();
    2989. 

  2989.      }
    2990. 

  2990.  
    2991. 

  2991. @@ -164,6 +175,10 @@
    2992. 

  2992.          }
    2993. 

  2993.  
    2994. 

  2994.          updateIconImages();
    2995. 

  2995. +
    2996. 

  2996. +        updateShape();
    2997. 

  2997. +        updateOpacity();
    2998. 

  2998. +        updateOpaque();
    2999. 

  2999.      }
    3000. 

  3000.  
    3001. 

  3001.      native void createAwtWindow(WComponentPeer parent);
    3002. 

  3002. @@ -197,6 +212,8 @@
    3003. 

  3003.          if (((Window)target).isAlwaysOnTopSupported() && alwaysOnTop) {
    3004. 

  3004.              setAlwaysOnTop(alwaysOnTop);
    3005. 

  3005.          }
    3006. 

  3006. +
    3007. 

  3007. +        updateWindow(null);
    3008. 

  3008.      }
    3009. 

  3009.  
    3010. 

  3010.      // Synchronize the insets members (here & in helper) with actual window
    3011. 

  3011. @@ -279,6 +296,31 @@
    3012. 

  3012.          }
    3013. 

  3013.      }
    3014. 

  3014.  
    3015. 

  3015. +    private void updateShape() {
    3016. 

  3016. +        // Shape shape = ((Window)target).getShape();
    3017. 

  3017. +        Shape shape = AWTAccessor.getWindowAccessor().getShape((Window)target);
    3018. 

  3018. +        if (shape != null) {
    3019. 

  3019. +            applyShape(Region.getInstance(shape, null));
    3020. 

  3020. +        }
    3021. 

  3021. +    }
    3022. 

  3022. +
    3023. 

  3023. +    private void updateOpacity() {
    3024. 

  3024. +        // float opacity = ((Window)target).getOpacity();
    3025. 

  3025. +        float opacity = AWTAccessor.getWindowAccessor().getOpacity((Window)target);
    3026. 

  3026. +        if (opacity < 1.0f) {
    3027. 

  3027. +            setOpacity(opacity);
    3028. 

  3028. +        }
    3029. 

  3029. +    }
    3030. 

  3030. +
    3031. 

  3031. +    private void updateOpaque() {
    3032. 

  3032. +        this.isOpaque = true;
    3033. 

  3033. +        // boolean opaque = ((Window)target).isOpaque();
    3034. 

  3034. +        boolean opaque = AWTAccessor.getWindowAccessor().isOpaque((Window)target);
    3035. 

  3035. +        if (!opaque) {
    3036. 

  3036. +            setOpaque(opaque);
    3037. 

  3037. +        }
    3038. 

  3038. +    }
    3039. 

  3039. +
    3040. 

  3040.      native void setMinSize(int width, int height);
    3041. 

  3041.  
    3042. 

  3042.  /*
    3043. 

  3043. @@ -531,6 +573,135 @@
    3044. 

  3044.           super.setBounds(newBounds.x, newBounds.y, newBounds.width, newBounds.height, op);
    3045. 

  3045.       }
    3046. 

  3046.  
    3047. 

  3047. +    @Override
    3048. 

  3048. +    public void print(Graphics g) {
    3049. 

  3049. +        // We assume we print the whole frame,
    3050. 

  3050. +        // so we expect no clip was set previously
    3051. 

  3051. +        Shape shape = AWTAccessor.getWindowAccessor().getShape((Window)target);
    3052. 

  3052. +        if (shape != null) {
    3053. 

  3053. +            g.setClip(shape);
    3054. 

  3054. +        }
    3055. 

  3055. +        super.print(g);
    3056. 

  3056. +    }
    3057. 

  3057. +
    3058. 

  3058. +    private void replaceSurfaceDataRecursively(Component c) {
    3059. 

  3059. +        if (c instanceof Container) {
    3060. 

  3060. +            for (Component child : ((Container)c).getComponents()) {
    3061. 

  3061. +                replaceSurfaceDataRecursively(child);
    3062. 

  3062. +            }
    3063. 

  3063. +        }
    3064. 

  3064. +        ComponentPeer cp = c.getPeer();
    3065. 

  3065. +        if (cp instanceof WComponentPeer) {
    3066. 

  3066. +            ((WComponentPeer)cp).replaceSurfaceDataLater();
    3067. 

  3067. +        }
    3068. 

  3068. +    }
    3069. 

  3069. +
    3070. 

  3070. +    private native void setOpacity(int iOpacity);
    3071. 

  3071. +
    3072. 

  3072. +    public void setOpacity(float opacity) {
    3073. 

  3073. +        if (!((SunToolkit)((Window)target).getToolkit()).
    3074. 

  3074. +            isWindowOpacitySupported())
    3075. 

  3075. +        {
    3076. 

  3076. +            return;
    3077. 

  3077. +        }
    3078. 

  3078. +
    3079. 

  3079. +        replaceSurfaceDataRecursively((Component)getTarget());
    3080. 

  3080. +
    3081. 

  3081. +        final int maxOpacity = 0xff;
    3082. 

  3082. +        int iOpacity = (int)(opacity * maxOpacity);
    3083. 

  3083. +        if (iOpacity < 0) {
    3084. 

  3084. +            iOpacity = 0;
    3085. 

  3085. +        }
    3086. 

  3086. +        if (iOpacity > maxOpacity) {
    3087. 

  3087. +            iOpacity = maxOpacity;
    3088. 

  3088. +        }
    3089. 

  3089. +
    3090. 

  3090. +        setOpacity(iOpacity);
    3091. 

  3091. +        updateWindow(null);
    3092. 

  3092. +    }
    3093. 

  3093. +
    3094. 

  3094. +    private native void setOpaqueImpl(boolean isOpaque);
    3095. 

  3095. +
    3096. 

  3096. +    public void setOpaque(boolean isOpaque) {
    3097. 

  3097. +        Window target = (Window)getTarget();
    3098. 

  3098. +
    3099. 

  3099. +        SunToolkit sunToolkit = (SunToolkit)target.getToolkit();
    3100. 

  3100. +        if (!sunToolkit.isWindowTranslucencySupported() ||
    3101. 

  3101. +            !sunToolkit.isTranslucencyCapable(target.getGraphicsConfiguration()))
    3102. 

  3102. +        {
    3103. 

  3103. +            return;
    3104. 

  3104. +        }
    3105. 

  3105. +
    3106. 

  3106. +        boolean opaqueChanged = this.isOpaque != isOpaque;
    3107. 

  3107. +        boolean isVistaOS = Win32GraphicsEnvironment.isVistaOS();
    3108. 

  3108. +
    3109. 

  3109. +        if (opaqueChanged && !isVistaOS){
    3110. 

  3110. +            // non-Vista OS: only replace the surface data if the opacity
    3111. 

  3111. +            // status changed (see WComponentPeer.isAccelCapable() for more)
    3112. 

  3112. +            replaceSurfaceDataRecursively(target);
    3113. 

  3113. +        }
    3114. 

  3114. +
    3115. 

  3115. +        this.isOpaque = isOpaque;
    3116. 

  3116. +
    3117. 

  3117. +        setOpaqueImpl(isOpaque);
    3118. 

  3118. +
    3119. 

  3119. +        if (opaqueChanged) {
    3120. 

  3120. +            if (isOpaque) {
    3121. 

  3121. +                TranslucentWindowPainter currentPainter = painter;
    3122. 

  3122. +                if (currentPainter != null) {
    3123. 

  3123. +                    currentPainter.flush();
    3124. 

  3124. +                    painter = null;
    3125. 

  3125. +                }
    3126. 

  3126. +            } else {
    3127. 

  3127. +                painter = TranslucentWindowPainter.createInstance(this);
    3128. 

  3128. +            }
    3129. 

  3129. +        }
    3130. 

  3130. +
    3131. 

  3131. +        if (opaqueChanged && isVistaOS) {
    3132. 

  3132. +            // On Vista: setting the window non-opaque makes the window look
    3133. 

  3133. +            // rectangular, though still catching the mouse clicks within
    3134. 

  3134. +            // its shape only. To restore the correct visual appearance
    3135. 

  3135. +            // of the window (i.e. w/ the correct shape) we have to reset
    3136. 

  3136. +            // the shape.
    3137. 

  3137. +            Shape shape = AWTAccessor.getWindowAccessor().getShape(target);
    3138. 

  3138. +            if (shape != null) {
    3139. 

  3139. +                AWTAccessor.getWindowAccessor().setShape(target, shape);
    3140. 

  3140. +            }
    3141. 

  3141. +        }
    3142. 

  3142. +
    3143. 

  3143. +        updateWindow(null);
    3144. 

  3144. +    }
    3145. 

  3145. +
    3146. 

  3146. +    public native void updateWindowImpl(int[] data, int width, int height);
    3147. 

  3147. +
    3148. 

  3148. +    public void updateWindow(BufferedImage backBuffer) {
    3149. 

  3149. +        if (isOpaque) {
    3150. 

  3150. +            return;
    3151. 

  3151. +        }
    3152. 

  3152. +
    3153. 

  3153. +        TranslucentWindowPainter currentPainter = painter;
    3154. 

  3154. +        if (currentPainter != null) {
    3155. 

  3155. +            currentPainter.updateWindow(backBuffer);
    3156. 

  3156. +        } else if (log.isLoggable(Level.FINER)) {
    3157. 

  3157. +            log.log(Level.FINER,
    3158. 

  3158. +                    "Translucent window painter is null in updateWindow");
    3159. 

  3159. +        }
    3160. 

  3160. +    }
    3161. 

  3161. +
    3162. 

  3162. +    /**
    3163. 

  3163. +     * Paints the Applet Warning into the passed Graphics2D. This method is
    3164. 

  3164. +     * called by the TranslucentWindowPainter before updating the layered
    3165. 

  3165. +     * window.
    3166. 

  3166. +     *
    3167. 

  3167. +     * @param g Graphics context to paint the warning to
    3168. 

  3168. +     * @param w the width of the area
    3169. 

  3169. +     * @param h the height of the area
    3170. 

  3170. +     * @see TranslucentWindowPainter
    3171. 

  3171. +     */
    3172. 

  3172. +    public void paintAppletWarning(Graphics2D g, int w, int h) {
    3173. 

  3173. +        // REMIND: the applet warning needs to be painted here
    3174. 

  3174. +    }
    3175. 

  3175. +
    3176. 

  3176.      /*
    3177. 

  3177.       * Static inner class, listens for 'activeWindow' KFM property changes and
    3178. 

  3178.       * updates the list of active windows per AppContext, so the latest active
    3179. 

  3179. diff -Nru openjdk.orig/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java openjdk/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
    3180. 

  3180. --- openjdk.orig/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java	2011-02-16 00:40:21.000000000 +0000
    3181. 

  3181. +++ openjdk/jdk/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java	2011-02-16 01:27:25.012325621 +0000
    3182. 

  3182. @@ -1,5 +1,5 @@
    3183. 

  3183.  /*
    3184. 

  3184. - * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
    3185. 

  3185. + * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
    3186. 

  3186.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3187. 

  3187.   *
    3188. 

  3188.   * This code is free software; you can redistribute it and/or modify it
    3189. 

  3189. @@ -72,9 +72,8 @@
    3190. 

  3190.          // the OGL pipeline can render directly to the screen and interfere
    3191. 

  3191.          // with layered windows, which is why we don't allow accelerated
    3192. 

  3192.          // surfaces in this case
    3193. 

  3193. -        if (!peer.isAccelCapable())
    3194. 

  3194. -        // REMIND: commented until toplevel translucency is implemented
    3195. 

  3195. -//            || !SunToolkit.isContainingTopLevelOpaque((Component)peer.getTarget()))
    3196. 

  3196. +        if (!peer.isAccelCapable() ||
    3197. 

  3197. +            !SunToolkit.isContainingTopLevelOpaque((Component)peer.getTarget()))
    3198. 

  3198.          {
    3199. 

  3199.              return null;
    3200. 

  3200.          }
    3201. 

  3201. @@ -93,9 +92,8 @@
    3202. 

  3202.          // the OGL pipeline can render directly to the screen and interfere
    3203. 

  3203.          // with layered windows, which is why we don't allow accelerated
    3204. 

  3204.          // surfaces in this case
    3205. 

  3205. -        if (!peer.isAccelCapable())
    3206. 

  3206. -        // REMIND: commented until toplevel translucency is implemented
    3207. 

  3207. -//            || !SunToolkit.isContainingTopLevelOpaque((Component)peer.getTarget()))
    3208. 

  3208. +        if (!peer.isAccelCapable() ||
    3209. 

  3209. +            !SunToolkit.isContainingTopLevelOpaque((Component)peer.getTarget()))
    3210. 

  3210.          {
    3211. 

  3211.              return null;
    3212. 

  3212.          }
    3213. 

  3213. diff -Nru openjdk.orig/jdk/src/windows/native/sun/awt/utility/rect.h openjdk/jdk/src/windows/native/sun/awt/utility/rect.h
    3214. 

  3214. --- openjdk.orig/jdk/src/windows/native/sun/awt/utility/rect.h	2011-01-20 23:54:44.000000000 +0000
    3215. 

  3215. +++ openjdk/jdk/src/windows/native/sun/awt/utility/rect.h	2011-02-16 01:27:25.012325621 +0000
    3216. 

  3216. @@ -1,5 +1,5 @@
    3217. 

  3217.  /*
    3218. 

  3218. - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    3219. 

  3219. + * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
    3220. 

  3220.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3221. 

  3221.   *
    3222. 

  3222.   * This code is free software; you can redistribute it and/or modify it
    3223. 

  3223. @@ -43,5 +43,15 @@
    3224. 

  3224.  
    3225. 

  3225.  #define RECT_INC_HEIGHT(r) (r).bottom++
    3226. 

  3226.  
    3227. 

  3227. +#if defined(__cplusplus)
    3228. 

  3228. +extern "C" {
    3229. 

  3229. +#endif
    3230. 

  3230. +
    3231. 

  3231. +int BitmapToYXBandedRectangles(int bitsPerPixel, int width, int height,
    3232. 

  3232. +        unsigned char * buf, RECT_T * outBuf);
    3233. 

  3233. +
    3234. 

  3234. +#if defined(__cplusplus)
    3235. 

  3235. +}
    3236. 

  3236. +#endif
    3237. 

  3237.  
    3238. 

  3238.  #endif // _AWT_RECT_H
    3239. 

  3239. diff -Nru openjdk.orig/jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp openjdk/jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp
    3240. 

  3240. --- openjdk.orig/jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp	2011-02-16 00:40:21.000000000 +0000
    3241. 

  3241. +++ openjdk/jdk/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp	2011-02-16 01:27:25.012325621 +0000
    3242. 

  3242. @@ -1,5 +1,5 @@
    3243. 

  3243.  /*
    3244. 

  3244. - * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
    3245. 

  3245. + * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
    3246. 

  3246.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3247. 

  3247.   *
    3248. 

  3248.   * This code is free software; you can redistribute it and/or modify it
    3249. 

  3249. @@ -614,17 +614,15 @@
    3250. 

  3250.  
    3251. 

  3251.      res = pTmpSurface->LockRect(&lockedRect, NULL, D3DLOCK_NOSYSLOCK);
    3252. 

  3252.      if (SUCCEEDED(res)) {
    3253. 

  3253. -        // REMIND: commented until translucent window support is integrated
    3254. 

  3254. -//        hBitmap =
    3255. 

  3255. -//            BitmapUtil::CreateBitmapFromARGBPre(w, h,
    3256. 

  3256. -//                                                lockedRect.Pitch,
    3257. 

  3257. -//                                                (int*)lockedRect.pBits);
    3258. 

  3258. +        hBitmap =
    3259. 

  3259. +            BitmapUtil::CreateBitmapFromARGBPre(w, h,
    3260. 

  3260. +                                                lockedRect.Pitch,
    3261. 

  3261. +                                                (int*)lockedRect.pBits);
    3262. 

  3262.          pTmpSurface->UnlockRect();
    3263. 

  3263.      }
    3264. 

  3264.      RETURN_STATUS_IF_NULL(hBitmap, JNI_FALSE);
    3265. 

  3265.  
    3266. 

  3266. -    // REMIND: commented until translucent window support is integrated
    3267. 

  3267. -//    window->UpdateWindow(env, NULL, w, h, hBitmap);
    3268. 

  3268. +    window->UpdateWindow(env, NULL, w, h, hBitmap);
    3269. 

  3269.  
    3270. 

  3270.      // hBitmap is released in UpdateWindow
    3271. 

  3271.  
    3272. 

  3272. diff -Nru openjdk.orig/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c openjdk/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c
    3273. 

  3273. --- openjdk.orig/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c	2011-02-16 00:40:21.000000000 +0000
    3274. 

  3274. +++ openjdk/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c	2011-02-16 01:27:25.012325621 +0000
    3275. 

  3275. @@ -1,5 +1,5 @@
    3276. 

  3276.  /*
    3277. 

  3277. - * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
    3278. 

  3278. + * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
    3279. 

  3279.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3280. 

  3280.   *
    3281. 

  3281.   * This code is free software; you can redistribute it and/or modify it
    3282. 

  3282. @@ -625,17 +625,15 @@
    3283. 

  3283.      j2d_glPixelStorei(GL_PACK_ALIGNMENT, 4);
    3284. 

  3284.  
    3285. 

  3285.      // the pixels read from the surface are already premultiplied
    3286. 

  3286. -    // REMIND: commented until translucent window support is integrated
    3287. 

  3287. -//    hBitmap = BitmapUtil_CreateBitmapFromARGBPre(w, h, scanStride,
    3288. 

  3288. -//                                                 (int*)pDst);
    3289. 

  3289. +    hBitmap = BitmapUtil_CreateBitmapFromARGBPre(w, h, scanStride,
    3290. 

  3290. +                                                 (int*)pDst);
    3291. 

  3291.      free(pDst);
    3292. 

  3292.  
    3293. 

  3293.      if (hBitmap == NULL) {
    3294. 

  3294.          return JNI_FALSE;
    3295. 

  3295.      }
    3296. 

  3296.  
    3297. 

  3297. -    // REMIND: commented until translucent window support is integrated
    3298. 

  3298. -    // AwtWindow_UpdateWindow(env, peer, w, h, hBitmap);
    3299. 

  3299. +    AwtWindow_UpdateWindow(env, peer, w, h, hBitmap);
    3300. 

  3300.  
    3301. 

  3301.      // hBitmap is released in UpdateWindow
    3302. 

  3302.  
    3303. 

  3303. diff -Nru openjdk.orig/jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp openjdk/jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp
    3304. 

  3304. --- openjdk.orig/jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp	2011-01-20 23:54:44.000000000 +0000
    3305. 

  3305. +++ openjdk/jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp	2011-02-16 01:27:25.012325621 +0000
    3306. 

  3306. @@ -1,5 +1,5 @@
    3307. 

  3307.  /*
    3308. 

  3308. - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
    3309. 

  3309. + * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
    3310. 

  3310.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3311. 

  3311.   *
    3312. 

  3312.   * This code is free software; you can redistribute it and/or modify it
    3313. 

  3313. @@ -28,9 +28,14 @@
    3314. 

  3314.  #include <windowsx.h>
    3315. 

  3315.  #include <zmouse.h>
    3316. 

  3316.  
    3317. 

  3317. +#include "GraphicsPrimitiveMgr.h"
    3318. 

  3318. +
    3319. 

  3319.  #include "awt.h"
    3320. 

  3320.  #include "awt_BitmapUtil.h"
    3321. 

  3321.  
    3322. 

  3322. +// Platform-dependent RECT_[EQ | SET | INC_HEIGHT] macros
    3323. 

  3323. +#include "utility/rect.h"
    3324. 

  3324. +
    3325. 

  3325.  HBITMAP BitmapUtil::CreateTransparencyMaskFromARGB(int width, int height, int* imageData)
    3326. 

  3326.  {
    3327. 

  3327.      //Scan lines should be aligned to word boundary
    3328. 

  3328. @@ -148,3 +153,222 @@
    3329. 

  3329.      ::GdiFlush();
    3330. 

  3330.      return hBitmap;
    3331. 

  3331.  }
    3332. 

  3332. +
    3333. 

  3333. +/*
    3334. 

  3334. + * Creates 32-bit premultiplied ARGB bitmap from specified ARGBPre data.
    3335. 

  3335. + * This function may not work on OS prior to Win95.
    3336. 

  3336. + * See MSDN articles for CreateDIBitmap, BITMAPINFOHEADER,
    3337. 

  3337. + * BITMAPV4HEADER, BITMAPV5HEADER for additional info.
    3338. 

  3338. + */
    3339. 

  3339. +HBITMAP BitmapUtil::CreateBitmapFromARGBPre(int width, int height,
    3340. 

  3340. +                                            int srcStride,
    3341. 

  3341. +                                            int* imageData)
    3342. 

  3342. +{
    3343. 

  3343. +    BITMAPINFOHEADER bmi;
    3344. 

  3344. +    void *bitmapBits = NULL;
    3345. 

  3345. +
    3346. 

  3346. +    ZeroMemory(&bmi, sizeof(bmi));
    3347. 

  3347. +    bmi.biSize = sizeof(bmi);
    3348. 

  3348. +    bmi.biWidth = width;
    3349. 

  3349. +    bmi.biHeight = -height;
    3350. 

  3350. +    bmi.biPlanes = 1;
    3351. 

  3351. +    bmi.biBitCount = 32;
    3352. 

  3352. +    bmi.biCompression = BI_RGB;
    3353. 

  3353. +
    3354. 

  3354. +    HBITMAP hBitmap =
    3355. 

  3355. +        ::CreateDIBSection(NULL, (BITMAPINFO *) & bmi, DIB_RGB_COLORS,
    3356. 

  3356. +                           &bitmapBits, NULL, 0);
    3357. 

  3357. +
    3358. 

  3358. +    if (!bitmapBits) {
    3359. 

  3359. +        return NULL;
    3360. 

  3360. +    }
    3361. 

  3361. +
    3362. 

  3362. +    int dstStride = width * 4;
    3363. 

  3363. +
    3364. 

  3364. +    if (srcStride == dstStride) {
    3365. 

  3365. +        memcpy(bitmapBits, (void*)imageData, srcStride * height);
    3366. 

  3366. +    } else if (height > 0) {
    3367. 

  3367. +        void *pSrcPixels = (void*)imageData;
    3368. 

  3368. +        void *pDstPixels = bitmapBits;
    3369. 

  3369. +        do {
    3370. 

  3370. +            memcpy(pDstPixels, pSrcPixels, dstStride);
    3371. 

  3371. +            pSrcPixels = PtrAddBytes(pSrcPixels, srcStride);
    3372. 

  3372. +            pDstPixels = PtrAddBytes(pDstPixels, dstStride);
    3373. 

  3373. +        } while (--height > 0);
    3374. 

  3374. +    }
    3375. 

  3375. +
    3376. 

  3376. +    return hBitmap;
    3377. 

  3377. +}
    3378. 

  3378. +
    3379. 

  3379. +extern "C" {
    3380. 

  3380. +
    3381. 

  3381. +/**
    3382. 

  3382. + * This method is called from the WGL pipeline when it needs to create a bitmap
    3383. 

  3383. + * needed to update the layered window.
    3384. 

  3384. + */
    3385. 

  3385. +HBITMAP BitmapUtil_CreateBitmapFromARGBPre(int width, int height,
    3386. 

  3386. +                                           int srcStride,
    3387. 

  3387. +                                           int* imageData)
    3388. 

  3388. +{
    3389. 

  3389. +    return BitmapUtil::CreateBitmapFromARGBPre(width, height,
    3390. 

  3390. +                                               srcStride, imageData);
    3391. 

  3391. +
    3392. 

  3392. +}
    3393. 

  3393. +
    3394. 

  3394. +}  /* extern "C" */
    3395. 

  3395. +
    3396. 

  3396. +
    3397. 

  3397. +/**
    3398. 

  3398. + * Transforms the given bitmap into an HRGN representing the transparency
    3399. 

  3399. + * of the bitmap. The bitmap MUST BE 32bpp. Alpha value == 0 is considered
    3400. 

  3400. + * transparent, alpha > 0 - opaque.
    3401. 

  3401. + */
    3402. 

  3402. +HRGN BitmapUtil::BitmapToRgn(HBITMAP hBitmap)
    3403. 

  3403. +{
    3404. 

  3404. +    HDC hdc = ::CreateCompatibleDC(NULL);
    3405. 

  3405. +    ::SelectObject(hdc, hBitmap);
    3406. 

  3406. +
    3407. 

  3407. +    BITMAPINFOEX bi;
    3408. 

  3408. +    ::ZeroMemory(&bi, sizeof(bi));
    3409. 

  3409. +
    3410. 

  3410. +    bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
    3411. 

  3411. +
    3412. 

  3412. +    BOOL r = ::GetDIBits(hdc, hBitmap, 0, 0, NULL,
    3413. 

  3413. +            reinterpret_cast<BITMAPINFO*>(&bi), DIB_RGB_COLORS);
    3414. 

  3414. +
    3415. 

  3415. +    if (!r || bi.bmiHeader.biBitCount != 32)
    3416. 

  3416. +    {
    3417. 

  3417. +        ::DeleteDC(hdc);
    3418. 

  3418. +        return NULL;
    3419. 

  3419. +    }
    3420. 

  3420. +
    3421. 

  3421. +    UINT width = bi.bmiHeader.biWidth;
    3422. 

  3422. +    UINT height = abs(bi.bmiHeader.biHeight);
    3423. 

  3423. +
    3424. 

  3424. +    BYTE * buf = (BYTE*)safe_Malloc(bi.bmiHeader.biSizeImage);
    3425. 

  3425. +    bi.bmiHeader.biHeight = -height;
    3426. 

  3426. +    ::GetDIBits(hdc, hBitmap, 0, height, buf,
    3427. 

  3427. +            reinterpret_cast<BITMAPINFO*>(&bi), DIB_RGB_COLORS);
    3428. 

  3428. +
    3429. 

  3429. +    /* reserving memory for the worst case */
    3430. 

  3430. +    RGNDATA * pRgnData = (RGNDATA *) safe_Malloc(sizeof(RGNDATAHEADER) +
    3431. 

  3431. +            sizeof(RECT) * (width / 2 + 1) * height);
    3432. 

  3432. +    RGNDATAHEADER * pRgnHdr = (RGNDATAHEADER *) pRgnData;
    3433. 

  3433. +    pRgnHdr->dwSize = sizeof(RGNDATAHEADER);
    3434. 

  3434. +    pRgnHdr->iType = RDH_RECTANGLES;
    3435. 

  3435. +    pRgnHdr->nRgnSize = 0;
    3436. 

  3436. +    pRgnHdr->rcBound.top = 0;
    3437. 

  3437. +    pRgnHdr->rcBound.left = 0;
    3438. 

  3438. +    pRgnHdr->rcBound.bottom = height;
    3439. 

  3439. +    pRgnHdr->rcBound.right = width;
    3440. 

  3440. +
    3441. 

  3441. +    pRgnHdr->nCount = BitmapToYXBandedRectangles(32, width, height, buf,
    3442. 

  3442. +            (RECT_T *) (((BYTE *) pRgnData) + sizeof(RGNDATAHEADER)));
    3443. 

  3443. +
    3444. 

  3444. +    HRGN rgn = ::ExtCreateRegion(NULL,
    3445. 

  3445. +            sizeof(RGNDATAHEADER) + sizeof(RECT_T) * pRgnHdr->nCount,
    3446. 

  3446. +            pRgnData);
    3447. 

  3447. +
    3448. 

  3448. +    free(pRgnData);
    3449. 

  3449. +    ::DeleteDC(hdc);
    3450. 

  3450. +    free(buf);
    3451. 

  3451. +
    3452. 

  3452. +    return rgn;
    3453. 

  3453. +}
    3454. 

  3454. +
    3455. 

  3455. +/**
    3456. 

  3456. + * Makes a copy of the given bitmap. Blends every pixel of the source
    3457. 

  3457. + * with the given blendColor and alpha. If alpha == 0, the function
    3458. 

  3458. + * simply makes a plain copy of the source without any blending.
    3459. 

  3459. + */
    3460. 

  3460. +HBITMAP BitmapUtil::BlendCopy(HBITMAP hSrcBitmap, COLORREF blendColor,
    3461. 

  3461. +        BYTE alpha)
    3462. 

  3462. +{
    3463. 

  3463. +    HDC hdc = ::CreateCompatibleDC(NULL);
    3464. 

  3464. +    HBITMAP oldBitmap = (HBITMAP)::SelectObject(hdc, hSrcBitmap);
    3465. 

  3465. +
    3466. 

  3466. +    BITMAPINFOEX bi;
    3467. 

  3467. +    ::ZeroMemory(&bi, sizeof(bi));
    3468. 

  3468. +
    3469. 

  3469. +    bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
    3470. 

  3470. +
    3471. 

  3471. +    BOOL r = ::GetDIBits(hdc, hSrcBitmap, 0, 0, NULL,
    3472. 

  3472. +            reinterpret_cast<BITMAPINFO*>(&bi), DIB_RGB_COLORS);
    3473. 

  3473. +
    3474. 

  3474. +    if (!r || bi.bmiHeader.biBitCount != 32)
    3475. 

  3475. +    {
    3476. 

  3476. +        ::DeleteDC(hdc);
    3477. 

  3477. +        return NULL;
    3478. 

  3478. +    }
    3479. 

  3479. +
    3480. 

  3480. +    UINT width = bi.bmiHeader.biWidth;
    3481. 

  3481. +    UINT height = abs(bi.bmiHeader.biHeight);
    3482. 

  3482. +
    3483. 

  3483. +    BYTE * buf = (BYTE*)safe_Malloc(bi.bmiHeader.biSizeImage);
    3484. 

  3484. +    bi.bmiHeader.biHeight = -height;
    3485. 

  3485. +    ::GetDIBits(hdc, hSrcBitmap, 0, height, buf,
    3486. 

  3486. +            reinterpret_cast<BITMAPINFO*>(&bi), DIB_RGB_COLORS);
    3487. 

  3487. +
    3488. 

  3488. +    UINT widthBytes = width * bi.bmiHeader.biBitCount / 8;
    3489. 

  3489. +    UINT alignedWidth = (((widthBytes - 1) / 4) + 1) * 4;
    3490. 

  3490. +    UINT i, j;
    3491. 

  3491. +
    3492. 

  3492. +    for (j = 0; j < height; j++) {
    3493. 

  3493. +        BYTE *pSrc = (BYTE *) buf + j * alignedWidth;
    3494. 

  3494. +        for (i = 0; i < width; i++, pSrc += 4) {
    3495. 

  3495. +            // Note: if the current alpha is zero, the other three color
    3496. 

  3496. +            // components may (theoretically) contain some uninitialized
    3497. 

  3497. +            // data. The developer does not expect to display them,
    3498. 

  3498. +            // hence we handle this situation differently.
    3499. 

  3499. +            if (pSrc[3] == 0) {
    3500. 

  3500. +                pSrc[0] = GetBValue(blendColor) * alpha / 255;
    3501. 

  3501. +                pSrc[1] = GetGValue(blendColor) * alpha / 255;
    3502. 

  3502. +                pSrc[2] = GetRValue(blendColor) * alpha / 255;
    3503. 

  3503. +                pSrc[3] = alpha;
    3504. 

  3504. +            } else {
    3505. 

  3505. +                pSrc[0] = (GetBValue(blendColor) * alpha / 255) +
    3506. 

  3506. +                    (pSrc[0] * (255 - alpha) / 255);
    3507. 

  3507. +                pSrc[1] = (GetGValue(blendColor) * alpha / 255) +
    3508. 

  3508. +                    (pSrc[1] * (255 - alpha) / 255);
    3509. 

  3509. +                pSrc[2] = (GetRValue(blendColor) * alpha / 255) +
    3510. 

  3510. +                    (pSrc[2] * (255 - alpha) / 255);
    3511. 

  3511. +                pSrc[3] = (alpha * alpha / 255) +
    3512. 

  3512. +                    (pSrc[3] * (255 - alpha) / 255);
    3513. 

  3513. +            }
    3514. 

  3514. +        }
    3515. 

  3515. +    }
    3516. 

  3516. +
    3517. 

  3517. +    HBITMAP hDstBitmap = ::CreateDIBitmap(hdc,
    3518. 

  3518. +            reinterpret_cast<BITMAPINFOHEADER*>(&bi),
    3519. 

  3519. +            CBM_INIT,
    3520. 

  3520. +            buf,
    3521. 

  3521. +            reinterpret_cast<BITMAPINFO*>(&bi),
    3522. 

  3522. +            DIB_RGB_COLORS
    3523. 

  3523. +            );
    3524. 

  3524. +
    3525. 

  3525. +    ::SelectObject(hdc, oldBitmap);
    3526. 

  3526. +    ::DeleteDC(hdc);
    3527. 

  3527. +    free(buf);
    3528. 

  3528. +
    3529. 

  3529. +    return hDstBitmap;
    3530. 

  3530. +}
    3531. 

  3531. +
    3532. 

  3532. +/**
    3533. 

  3533. + * Creates a 32 bit ARGB bitmap. Returns the bitmap handle. The *bitmapBits
    3534. 

  3534. + * contains the pointer to the bitmap data or NULL if an error occured.
    3535. 

  3535. + */
    3536. 

  3536. +HBITMAP BitmapUtil::CreateARGBBitmap(int width, int height, void ** bitmapBitsPtr)
    3537. 

  3537. +{
    3538. 

  3538. +    BITMAPINFOHEADER bmi;
    3539. 

  3539. +
    3540. 

  3540. +    ::ZeroMemory(&bmi, sizeof(bmi));
    3541. 

  3541. +    bmi.biSize = sizeof(BITMAPINFOHEADER);
    3542. 

  3542. +    bmi.biWidth = width;
    3543. 

  3543. +    bmi.biHeight = -height;
    3544. 

  3544. +    bmi.biPlanes = 1;
    3545. 

  3545. +    bmi.biBitCount = 32;
    3546. 

  3546. +    bmi.biCompression = BI_RGB;
    3547. 

  3547. +
    3548. 

  3548. +    return ::CreateDIBSection(NULL, (BITMAPINFO *) & bmi, DIB_RGB_COLORS,
    3549. 

  3549. +                bitmapBitsPtr, NULL, 0);
    3550. 

  3550. +}
    3551. 

  3551. diff -Nru openjdk.orig/jdk/src/windows/native/sun/windows/awt_BitmapUtil.h openjdk/jdk/src/windows/native/sun/windows/awt_BitmapUtil.h
    3552. 

  3552. --- openjdk.orig/jdk/src/windows/native/sun/windows/awt_BitmapUtil.h	2011-01-20 23:54:44.000000000 +0000
    3553. 

  3553. +++ openjdk/jdk/src/windows/native/sun/windows/awt_BitmapUtil.h	2011-02-16 01:27:25.012325621 +0000
    3554. 

  3554. @@ -1,5 +1,5 @@
    3555. 

  3555.  /*
    3556. 

  3556. - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
    3557. 

  3557. + * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
    3558. 

  3558.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3559. 

  3559.   *
    3560. 

  3560.   * This code is free software; you can redistribute it and/or modify it
    3561. 

  3561. @@ -45,6 +45,32 @@
    3562. 

  3562.       */
    3563. 

  3563.      static HBITMAP CreateV4BitmapFromARGB(int width, int height, int* imageData);
    3564. 

  3564.  
    3565. 

  3565. +    /**
    3566. 

  3566. +     * Creates 32-bit premultiplied ARGB V4 Bitmap (Win95-compatible) from
    3567. 

  3567. +     * specified ARGB Pre input data.
    3568. 

  3568. +     */
    3569. 

  3569. +    static HBITMAP CreateBitmapFromARGBPre(int width, int height,
    3570. 

  3570. +                                           int srcStride,
    3571. 

  3571. +                                           int* imageData);
    3572. 

  3572. +
    3573. 

  3573. +    /**
    3574. 

  3574. +     * Transforms the given bitmap into an HRGN representing the transparency
    3575. 

  3575. +     * of the bitmap.
    3576. 

  3576. +     */
    3577. 

  3577. +    static HRGN BitmapToRgn(HBITMAP hBitmap);
    3578. 

  3578. +
    3579. 

  3579. +    /**
    3580. 

  3580. +     * Makes a copy of the given bitmap. Blends every pixel of the source
    3581. 

  3581. +     * with the given blendColor and alpha. If alpha == 0, the function
    3582. 

  3582. +     * simply makes a plain copy of the source without any blending.
    3583. 

  3583. +     */
    3584. 

  3584. +    static HBITMAP BlendCopy(HBITMAP hSrcBitmap, COLORREF blendColor, BYTE alpha);
    3585. 

  3585. +
    3586. 

  3586. +    /**
    3587. 

  3587. +     * Creates a 32 bit ARGB bitmap. Returns the bitmap handle.
    3588. 

  3588. +     * The pointer to the bitmap data is stored into bitmapBitsPtr.
    3589. 

  3589. +     */
    3590. 

  3590. +    static HBITMAP CreateARGBBitmap(int width, int height, void ** bitmapBitsPtr);
    3591. 

  3591.  };
    3592. 

  3592.  
    3593. 

  3593.  #endif
    3594. 

  3594. diff -Nru openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.cpp openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp
    3595. 

  3595. --- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.cpp	2011-02-16 00:40:21.000000000 +0000
    3596. 

  3596. +++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp	2011-02-16 01:27:25.012325621 +0000
    3597. 

  3597. @@ -1,5 +1,5 @@
    3598. 

  3598.  /*
    3599. 

  3599. - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
    3600. 

  3600. + * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
    3601. 

  3601.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3602. 

  3602.   *
    3603. 

  3603.   * This code is free software; you can redistribute it and/or modify it
    3604. 

  3604. @@ -221,9 +221,6 @@
    3605. 

  3605.  BOOL AwtComponent::sm_rtlReadingOrder =
    3606. 

  3606.      PRIMARYLANGID(GetInputLanguage()) == LANG_ARABIC;
    3607. 

  3607.  
    3608. 

  3608. -UINT AwtComponent::sm_95WheelMessage = WM_NULL;
    3609. 

  3609. -UINT AwtComponent::sm_95WheelSupport = WM_NULL;
    3610. 

  3610. -
    3611. 

  3611.  HWND AwtComponent::sm_cursorOn;
    3612. 

  3612.  BOOL AwtComponent::m_QueryNewPaletteCalled = FALSE;
    3613. 

  3613.  
    3614. 

  3614. @@ -4700,6 +4697,25 @@
    3615. 

  3615.      return hdc;
    3616. 

  3616.  }
    3617. 

  3617.  
    3618. 

  3618. +void AwtComponent::FillBackground(HDC hMemoryDC, SIZE &size)
    3619. 

  3619. +{
    3620. 

  3620. +    RECT eraseR = { 0, 0, size.cx, size.cy };
    3621. 

  3621. +    VERIFY(::FillRect(hMemoryDC, &eraseR, GetBackgroundBrush()));
    3622. 

  3622. +}
    3623. 

  3623. +
    3624. 

  3624. +void AwtComponent::FillAlpha(void *bitmapBits, SIZE &size, BYTE alpha)
    3625. 

  3625. +{
    3626. 

  3626. +    if (bitmapBits) {
    3627. 

  3627. +        DWORD* dest = (DWORD*)bitmapBits;
    3628. 

  3628. +        //XXX: might be optimized to use one loop (cy*cx -> 0).
    3629. 

  3629. +        for (int i = 0; i < size.cy; i++ ) {
    3630. 

  3630. +            for (int j = 0; j < size.cx; j++ ) {
    3631. 

  3631. +                ((BYTE*)(dest++))[3] = alpha;
    3632. 

  3632. +            }
    3633. 

  3633. +        }
    3634. 

  3634. +    }
    3635. 

  3635. +}
    3636. 

  3636. +
    3637. 

  3637.  jintArray AwtComponent::CreatePrintedPixels(SIZE &loc, SIZE &size) {
    3638. 

  3638.      JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
    3639. 

  3639.  
    3640. 

  3640. @@ -6276,15 +6292,12 @@
    3641. 

  3641.  
    3642. 

  3642.      AwtComponent *c = NULL;
    3643. 

  3643.  
    3644. 

  3644. -
    3645. 

  3645. -
    3646. 

  3646.      PDATA pData;
    3647. 

  3647.      JNI_CHECK_PEER_GOTO(self, ret);
    3648. 

  3648. +
    3649. 

  3649.      c = (AwtComponent *)pData;
    3650. 

  3650. -    if (::IsWindow(c->GetHWnd()))
    3651. 

  3651. -    {
    3652. 

  3652. +    if (::IsWindow(c->GetHWnd())) {
    3653. 

  3653.          HRGN hRgn = NULL;
    3654. 

  3654. -
    3655. 

  3655.          if (region || x1 || x2 || y1 || y2) {
    3656. 

  3656.              // If all the params are zeros, the shape must be simply reset.
    3657. 

  3657.              // Otherwise, convert it into a region.
    3658. 

  3658. diff -Nru openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.h openjdk/jdk/src/windows/native/sun/windows/awt_Component.h
    3659. 

  3659. --- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.h	2011-02-16 00:40:21.000000000 +0000
    3660. 

  3660. +++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.h	2011-02-16 01:27:25.016325311 +0000
    3661. 

  3661. @@ -1,5 +1,5 @@
    3662. 

  3662.  /*
    3663. 

  3663. - * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
    3664. 

  3664. + * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
    3665. 

  3665.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3666. 

  3666.   *
    3667. 

  3667.   * This code is free software; you can redistribute it and/or modify it
    3668. 

  3668. @@ -422,9 +422,6 @@
    3669. 

  3669.      /* Functions for MouseWheel support on Windows95
    3670. 

  3670.       * These should only be called if running on 95
    3671. 

  3671.       */
    3672. 

  3672. -    static void Wheel95Init();
    3673. 

  3673. -    INLINE static UINT Wheel95GetMsg() {return sm_95WheelMessage;}
    3674. 

  3674. -    static UINT Wheel95GetScrLines();
    3675. 

  3675.  
    3676. 

  3676.      /* Determines whether the component is obscured by another window */
    3677. 

  3677.      // Called on Toolkit thread
    3678. 

  3678. @@ -714,9 +711,9 @@
    3679. 

  3679.      virtual void SetDragCapture(UINT flags);
    3680. 

  3680.      virtual void ReleaseDragCapture(UINT flags);
    3681. 

  3681.  
    3682. 

  3682. -    // 95 support for mouse wheel
    3683. 

  3683. -    static UINT sm_95WheelMessage;
    3684. 

  3684. -    static UINT sm_95WheelSupport;
    3685. 

  3685. +    //These functions are overridden in AwtWindow to handle non-opaque windows.
    3686. 

  3686. +    virtual void FillBackground(HDC hMemoryDC, SIZE &size);
    3687. 

  3687. +    virtual void FillAlpha(void *bitmapBits, SIZE &size, BYTE alpha);
    3688. 

  3688.  
    3689. 

  3689.  private:
    3690. 

  3690.      BOOL m_bSubclassed;
    3691. 

  3691. diff -Nru openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.cpp openjdk/jdk/src/windows/native/sun/windows/awt_Window.cpp
    3692. 

  3692. --- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.cpp	2011-02-16 00:40:21.000000000 +0000
    3693. 

  3693. +++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.cpp	2011-02-16 01:27:25.016325311 +0000
    3694. 

  3694. @@ -1,5 +1,5 @@
    3695. 

  3695.  /*
    3696. 

  3696. - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
    3697. 

  3697. + * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
    3698. 

  3698.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3699. 

  3699.   *
    3700. 

  3700.   * This code is free software; you can redistribute it and/or modify it
    3701. 

  3701. @@ -25,6 +25,8 @@
    3702. 

  3702.  
    3703. 

  3703.  #include <windowsx.h>
    3704. 

  3704.  
    3705. 

  3705. +#include <jlong.h>
    3706. 

  3706. +
    3707. 

  3707.  #include "awt_Component.h"
    3708. 

  3708.  #include "awt_Container.h"
    3709. 

  3709.  #include "awt_Frame.h"
    3710. 

  3710. @@ -87,7 +89,6 @@
    3711. 

  3711.      jint x, y;
    3712. 

  3712.      jint w, h;
    3713. 

  3713.  };
    3714. 

  3714. -
    3715. 

  3715.  // struct for _SetIconImagesData
    3716. 

  3716.  struct SetIconImagesDataStruct {
    3717. 

  3717.      jobject window;
    3718. 

  3718. @@ -96,7 +97,6 @@
    3719. 

  3719.      jintArray smallIconRaster;
    3720. 

  3720.      jint smw, smh;
    3721. 

  3721.  };
    3722. 

  3722. -
    3723. 

  3723.  // struct for _SetMinSize() method
    3724. 

  3724.  // and other methods setting sizes
    3725. 

  3725.  struct SizeStruct {
    3726. 

  3726. @@ -113,6 +113,24 @@
    3727. 

  3727.      jobject window;
    3728. 

  3728.      jlong blockerHWnd;
    3729. 

  3729.  };
    3730. 

  3730. +// struct for _SetOpacity() method
    3731. 

  3731. +struct OpacityStruct {
    3732. 

  3732. +    jobject window;
    3733. 

  3733. +    jint iOpacity;
    3734. 

  3734. +};
    3735. 

  3735. +// struct for _SetOpaque() method
    3736. 

  3736. +struct OpaqueStruct {
    3737. 

  3737. +    jobject window;
    3738. 

  3738. +    jboolean isOpaque;
    3739. 

  3739. +};
    3740. 

  3740. +// struct for _UpdateWindow() method
    3741. 

  3741. +struct UpdateWindowStruct {
    3742. 

  3742. +    jobject window;
    3743. 

  3743. +    jintArray data;
    3744. 

  3744. +    HBITMAP hBitmap;
    3745. 

  3745. +    jint width, height;
    3746. 

  3746. +};
    3747. 

  3747. +
    3748. 

  3748.  /************************************************************************
    3749. 

  3749.   * AwtWindow fields
    3750. 

  3750.   */
    3751. 

  3751. @@ -164,6 +182,11 @@
    3752. 

  3752.              ::SetWindowsHookEx(WH_CBT, (HOOKPROC)AwtWindow::CBTFilter,
    3753. 

  3753.                                 0, AwtToolkit::MainThread());
    3754. 

  3754.      }
    3755. 

  3755. +
    3756. 

  3756. +    m_opaque = TRUE;
    3757. 

  3757. +    m_opacity = 0xff;
    3758. 

  3758. +
    3759. 

  3759. +    ::InitializeCriticalSection(&contentBitmapCS);
    3760. 

  3760.  }
    3761. 

  3761.  
    3762. 

  3762.  AwtWindow::~AwtWindow()
    3763. 

  3763. @@ -1870,6 +1893,216 @@
    3764. 

  3764.      //Does nothing for windows, is overriden for frames and dialogs
    3765. 

  3765.  }
    3766. 

  3766.  
    3767. 

  3767. +void AwtWindow::RedrawWindow()
    3768. 

  3768. +{
    3769. 

  3769. +    if (isOpaque()) {
    3770. 

  3770. +        ::RedrawWindow(GetHWnd(), NULL, NULL,
    3771. 

  3771. +                RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN);
    3772. 

  3772. +    } else {
    3773. 

  3773. +        ::EnterCriticalSection(&contentBitmapCS);
    3774. 

  3774. +        if (hContentBitmap != NULL) {
    3775. 

  3775. +            UpdateWindowImpl(contentWidth, contentHeight, hContentBitmap);
    3776. 

  3776. +        }
    3777. 

  3777. +        ::LeaveCriticalSection(&contentBitmapCS);
    3778. 

  3778. +    }
    3779. 

  3779. +}
    3780. 

  3780. +
    3781. 

  3781. +void AwtWindow::SetTranslucency(BYTE opacity, BOOL opaque)
    3782. 

  3782. +{
    3783. 

  3783. +    BYTE old_opacity = getOpacity();
    3784. 

  3784. +    BOOL old_opaque = isOpaque();
    3785. 

  3785. +
    3786. 

  3786. +    if (opacity == old_opacity && opaque == old_opaque) {
    3787. 

  3787. +        return;
    3788. 

  3788. +    }
    3789. 

  3789. +
    3790. 

  3790. +    setOpacity(opacity);
    3791. 

  3791. +    setOpaque(opaque);
    3792. 

  3792. +
    3793. 

  3793. +    HWND hwnd = GetHWnd();
    3794. 

  3794. +
    3795. 

  3795. +    LONG ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
    3796. 

  3796. +
    3797. 

  3797. +    if (opaque != old_opaque) {
    3798. 

  3798. +        ::EnterCriticalSection(&contentBitmapCS);
    3799. 

  3799. +        if (hContentBitmap != NULL) {
    3800. 

  3800. +            ::DeleteObject(hContentBitmap);
    3801. 

  3801. +            hContentBitmap = NULL;
    3802. 

  3802. +        }
    3803. 

  3803. +        ::LeaveCriticalSection(&contentBitmapCS);
    3804. 

  3804. +    }
    3805. 

  3805. +
    3806. 

  3806. +    if (opaque && opacity == 0xff) {
    3807. 

  3807. +        // Turn off all the effects
    3808. 

  3808. +        ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style & ~WS_EX_LAYERED);
    3809. 

  3809. +        // Ask the window to repaint itself and all the children
    3810. 

  3810. +        RedrawWindow();
    3811. 

  3811. +    } else {
    3812. 

  3812. +        // We're going to enable some effects
    3813. 

  3813. +        if (!(ex_style & WS_EX_LAYERED)) {
    3814. 

  3814. +            ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style | WS_EX_LAYERED);
    3815. 

  3815. +        } else {
    3816. 

  3816. +            if ((opaque && opacity < 0xff) ^ (old_opaque && old_opacity < 0xff)) {
    3817. 

  3817. +                // _One_ of the modes uses the SetLayeredWindowAttributes.
    3818. 

  3818. +                // Need to reset the style in this case.
    3819. 

  3819. +                // If both modes are simple (i.e. just changing the opacity level),
    3820. 

  3820. +                // no need to reset the style.
    3821. 

  3821. +                ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style & ~WS_EX_LAYERED);
    3822. 

  3822. +                ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style | WS_EX_LAYERED);
    3823. 

  3823. +            }
    3824. 

  3824. +        }
    3825. 

  3825. +
    3826. 

  3826. +        if (opaque) {
    3827. 

  3827. +            // Simple opacity mode
    3828. 

  3828. +            ::SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), opacity, LWA_ALPHA);
    3829. 

  3829. +        }
    3830. 

  3830. +    }
    3831. 

  3831. +}
    3832. 

  3832. +
    3833. 

  3833. +static HBITMAP CreateBitmapFromRaster(JNIEnv* env, jintArray raster, jint w, jint h)
    3834. 

  3834. +{
    3835. 

  3835. +    HBITMAP image = NULL;
    3836. 

  3836. +    if (raster != NULL) {
    3837. 

  3837. +        int* rasterBuffer = NULL;
    3838. 

  3838. +        try {
    3839. 

  3839. +            rasterBuffer = (int *)env->GetPrimitiveArrayCritical(raster, 0);
    3840. 

  3840. +            JNI_CHECK_NULL_GOTO(rasterBuffer, "raster data", done);
    3841. 

  3841. +            image = BitmapUtil::CreateBitmapFromARGBPre(w, h, w*4, rasterBuffer);
    3842. 

  3842. +        } catch (...) {
    3843. 

  3843. +            if (rasterBuffer != NULL) {
    3844. 

  3844. +                env->ReleasePrimitiveArrayCritical(raster, rasterBuffer, 0);
    3845. 

  3845. +            }
    3846. 

  3846. +            throw;
    3847. 

  3847. +        }
    3848. 

  3848. +        if (rasterBuffer != NULL) {
    3849. 

  3849. +            env->ReleasePrimitiveArrayCritical(raster, rasterBuffer, 0);
    3850. 

  3850. +        }
    3851. 

  3851. +    }
    3852. 

  3852. +done:
    3853. 

  3853. +    return image;
    3854. 

  3854. +}
    3855. 

  3855. +
    3856. 

  3856. +void AwtWindow::UpdateWindowImpl(int width, int height, HBITMAP hBitmap)
    3857. 

  3857. +{
    3858. 

  3858. +    if (isOpaque()) {
    3859. 

  3859. +        return;
    3860. 

  3860. +    }
    3861. 

  3861. +
    3862. 

  3862. +    HWND hWnd = GetHWnd();
    3863. 

  3863. +    HDC hdcDst = ::GetDC(NULL);
    3864. 

  3864. +    HDC hdcSrc = ::CreateCompatibleDC(NULL);
    3865. 

  3865. +    HBITMAP hOldBitmap = (HBITMAP)::SelectObject(hdcSrc, hBitmap);
    3866. 

  3866. +
    3867. 

  3867. +    //XXX: this code doesn't paint the children (say, the java.awt.Button)!
    3868. 

  3868. +    //So, if we ever want to support HWs here, we need to repaint them
    3869. 

  3869. +    //in some other way...
    3870. 

  3870. +    //::SendMessage(hWnd, WM_PRINT, (WPARAM)hdcSrc, /*PRF_CHECKVISIBLE |*/
    3871. 

  3871. +    //      PRF_CHILDREN /*| PRF_CLIENT | PRF_NONCLIENT*/);
    3872. 

  3872. +
    3873. 

  3873. +    POINT ptSrc;
    3874. 

  3874. +    ptSrc.x = ptSrc.y = 0;
    3875. 

  3875. +
    3876. 

  3876. +    RECT rect;
    3877. 

  3877. +    POINT ptDst;
    3878. 

  3878. +    SIZE size;
    3879. 

  3879. +
    3880. 

  3880. +    ::GetWindowRect(hWnd, &rect);
    3881. 

  3881. +    ptDst.x = rect.left;
    3882. 

  3882. +    ptDst.y = rect.top;
    3883. 

  3883. +    size.cx = width;
    3884. 

  3884. +    size.cy = height;
    3885. 

  3885. +
    3886. 

  3886. +    BLENDFUNCTION bf;
    3887. 

  3887. +
    3888. 

  3888. +    bf.SourceConstantAlpha = getOpacity();
    3889. 

  3889. +    bf.AlphaFormat = AC_SRC_ALPHA;
    3890. 

  3890. +    bf.BlendOp = AC_SRC_OVER;
    3891. 

  3891. +    bf.BlendFlags = 0;
    3892. 

  3892. +
    3893. 

  3893. +    ::UpdateLayeredWindow(hWnd, hdcDst, &ptDst, &size, hdcSrc, &ptSrc,
    3894. 

  3894. +            RGB(0, 0, 0), &bf, ULW_ALPHA);
    3895. 

  3895. +
    3896. 

  3896. +    ::ReleaseDC(NULL, hdcDst);
    3897. 

  3897. +    ::SelectObject(hdcSrc, hOldBitmap);
    3898. 

  3898. +    ::DeleteDC(hdcSrc);
    3899. 

  3899. +}
    3900. 

  3900. +
    3901. 

  3901. +void AwtWindow::UpdateWindow(JNIEnv* env, jintArray data, int width, int height,
    3902. 

  3902. +                             HBITMAP hNewBitmap)
    3903. 

  3903. +{
    3904. 

  3904. +    if (isOpaque()) {
    3905. 

  3905. +        return;
    3906. 

  3906. +    }
    3907. 

  3907. +
    3908. 

  3908. +    HBITMAP hBitmap;
    3909. 

  3909. +    if (hNewBitmap == NULL) {
    3910. 

  3910. +        if (data == NULL) {
    3911. 

  3911. +            return;
    3912. 

  3912. +        }
    3913. 

  3913. +        hBitmap = CreateBitmapFromRaster(env, data, width, height);
    3914. 

  3914. +        if (hBitmap == NULL) {
    3915. 

  3915. +            return;
    3916. 

  3916. +        }
    3917. 

  3917. +    } else {
    3918. 

  3918. +        hBitmap = hNewBitmap;
    3919. 

  3919. +    }
    3920. 

  3920. +
    3921. 

  3921. +    ::EnterCriticalSection(&contentBitmapCS);
    3922. 

  3922. +    if (hContentBitmap != NULL) {
    3923. 

  3923. +        ::DeleteObject(hContentBitmap);
    3924. 

  3924. +    }
    3925. 

  3925. +    hContentBitmap = hBitmap;
    3926. 

  3926. +    contentWidth = width;
    3927. 

  3927. +    contentHeight = height;
    3928. 

  3928. +    UpdateWindowImpl(width, height, hBitmap);
    3929. 

  3929. +    ::LeaveCriticalSection(&contentBitmapCS);
    3930. 

  3930. +}
    3931. 

  3931. +
    3932. 

  3932. +void AwtWindow::FillBackground(HDC hMemoryDC, SIZE &size)
    3933. 

  3933. +{
    3934. 

  3934. +    if (isOpaque()) {
    3935. 

  3935. +        AwtCanvas::FillBackground(hMemoryDC, size);
    3936. 

  3936. +    }
    3937. 

  3937. +}
    3938. 

  3938. +
    3939. 

  3939. +void AwtWindow::FillAlpha(void *bitmapBits, SIZE &size, BYTE alpha)
    3940. 

  3940. +{
    3941. 

  3941. +    if (isOpaque()) {
    3942. 

  3942. +        AwtCanvas::FillAlpha(bitmapBits, size, alpha);
    3943. 

  3943. +    }
    3944. 

  3944. +}
    3945. 

  3945. +
    3946. 

  3946. +/*
    3947. 

  3947. + * Fixed 6353381: it's improved fix for 4792958
    3948. 

  3948. + * which was backed-out to avoid 5059656
    3949. 

  3949. + */
    3950. 

  3950. +BOOL AwtWindow::HasValidRect()
    3951. 

  3951. +{
    3952. 

  3952. +    RECT inside;
    3953. 

  3953. +    RECT outside;
    3954. 

  3954. +
    3955. 

  3955. +    if (::IsIconic(GetHWnd())) {
    3956. 

  3956. +        return FALSE;
    3957. 

  3957. +    }
    3958. 

  3958. +
    3959. 

  3959. +    ::GetClientRect(GetHWnd(), &inside);
    3960. 

  3960. +    ::GetWindowRect(GetHWnd(), &outside);
    3961. 

  3961. +
    3962. 

  3962. +    BOOL isZeroClientArea = (inside.right == 0 && inside.bottom == 0);
    3963. 

  3963. +    BOOL isInvalidLocation = ((outside.left == -32000 && outside.top == -32000) || // Win2k && WinXP
    3964. 

  3964. +                              (outside.left == 32000 && outside.top == 32000) || // Win95 && Win98
    3965. 

  3965. +                              (outside.left == 3000 && outside.top == 3000)); // Win95 && Win98
    3966. 

  3966. +
    3967. 

  3967. +    // the bounds correspond to iconic state
    3968. 

  3968. +    if (isZeroClientArea && isInvalidLocation)
    3969. 

  3969. +    {
    3970. 

  3970. +        return FALSE;
    3971. 

  3971. +    }
    3972. 

  3972. +
    3973. 

  3973. +    return TRUE;
    3974. 

  3974. +}
    3975. 

  3975. +
    3976. 

  3976. +
    3977. 

  3977.  void AwtWindow::_SetIconImagesData(void * param)
    3978. 

  3978.  {
    3979. 

  3979.      JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
    3980. 

  3980. @@ -2042,36 +2275,68 @@
    3981. 

  3981.      env->DeleteGlobalRef(self);
    3982. 

  3982.  }
    3983. 

  3983.  
    3984. 

  3984. -/*
    3985. 

  3985. - * Fixed 6353381: it's improved fix for 4792958
    3986. 

  3986. - * which was backed-out to avoid 5059656
    3987. 

  3987. - */
    3988. 

  3988. -BOOL AwtWindow::HasValidRect()
    3989. 

  3989. +void AwtWindow::_SetOpacity(void* param)
    3990. 

  3990.  {
    3991. 

  3991. -    RECT inside;
    3992. 

  3992. -    RECT outside;
    3993. 

  3993. +    JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
    3994. 

  3994.  
    3995. 

  3995. -    if (::IsIconic(GetHWnd())) {
    3996. 

  3996. -        return FALSE;
    3997. 

  3997. -    }
    3998. 

  3998. +    OpacityStruct *os = (OpacityStruct *)param;
    3999. 

  3999. +    jobject self = os->window;
    4000. 

  4000. +    BYTE iOpacity = (BYTE)os->iOpacity;
    4001. 

  4001.  
    4002. 

  4002. -    ::GetClientRect(GetHWnd(), &inside);
    4003. 

  4003. -    ::GetWindowRect(GetHWnd(), &outside);
    4004. 

  4004. +    PDATA pData;
    4005. 

  4005. +    JNI_CHECK_PEER_GOTO(self, ret);
    4006. 

  4006. +    AwtWindow *window = (AwtWindow *)pData;
    4007. 

  4007.  
    4008. 

  4008. -    BOOL isZeroClientArea = (inside.right == 0 && inside.bottom == 0);
    4009. 

  4009. -    BOOL isInvalidLocation = ((outside.left == -32000 && outside.top == -32000) || // Win2k && WinXP
    4010. 

  4010. -                              (outside.left == 32000 && outside.top == 32000) || // Win95 && Win98
    4011. 

  4011. -                              (outside.left == 3000 && outside.top == 3000)); // Win95 && Win98
    4012. 

  4012. +    window->SetTranslucency(iOpacity, window->isOpaque());
    4013. 

  4013.  
    4014. 

  4014. -    // the bounds correspond to iconic state
    4015. 

  4015. -    if (isZeroClientArea && isInvalidLocation)
    4016. 

  4016. -    {
    4017. 

  4017. -        return FALSE;
    4018. 

  4018. -    }
    4019. 

  4019. +  ret:
    4020. 

  4020. +    env->DeleteGlobalRef(self);
    4021. 

  4021. +    delete os;
    4022. 

  4022. +}
    4023. 

  4023.  
    4024. 

  4024. -    return TRUE;
    4025. 

  4025. +void AwtWindow::_SetOpaque(void* param)
    4026. 

  4026. +{
    4027. 

  4027. +    JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
    4028. 

  4028. +
    4029. 

  4029. +    OpaqueStruct *os = (OpaqueStruct *)param;
    4030. 

  4030. +    jobject self = os->window;
    4031. 

  4031. +    BOOL isOpaque = (BOOL)os->isOpaque;
    4032. 

  4032. +
    4033. 

  4033. +    PDATA pData;
    4034. 

  4034. +    JNI_CHECK_PEER_GOTO(self, ret);
    4035. 

  4035. +    AwtWindow *window = (AwtWindow *)pData;
    4036. 

  4036. +
    4037. 

  4037. +    window->SetTranslucency(window->getOpacity(), isOpaque);
    4038. 

  4038. +
    4039. 

  4039. +  ret:
    4040. 

  4040. +    env->DeleteGlobalRef(self);
    4041. 

  4041. +    delete os;
    4042. 

  4042.  }
    4043. 

  4043.  
    4044. 

  4044. +void AwtWindow::_UpdateWindow(void* param)
    4045. 

  4045. +{
    4046. 

  4046. +    JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
    4047. 

  4047. +
    4048. 

  4048. +    UpdateWindowStruct *uws = (UpdateWindowStruct *)param;
    4049. 

  4049. +    jobject self = uws->window;
    4050. 

  4050. +    jintArray data = uws->data;
    4051. 

  4051. +
    4052. 

  4052. +    PDATA pData;
    4053. 

  4053. +    JNI_CHECK_PEER_GOTO(self, ret);
    4054. 

  4054. +    AwtWindow *window = (AwtWindow *)pData;
    4055. 

  4055. +
    4056. 

  4056. +    window->UpdateWindow(env, data, (int)uws->width, (int)uws->height,
    4057. 

  4057. +                         uws->hBitmap);
    4058. 

  4058. +
    4059. 

  4059. +  ret:
    4060. 

  4060. +    env->DeleteGlobalRef(self);
    4061. 

  4061. +    if (data != NULL) {
    4062. 

  4062. +        env->DeleteGlobalRef(data);
    4063. 

  4063. +    }
    4064. 

  4064. +    delete uws;
    4065. 

  4065. +}
    4066. 

  4066. +
    4067. 

  4067. +
    4068. 

  4068.  extern "C" {
    4069. 

  4069.  
    4070. 

  4070.  /*
    4071. 

  4071. @@ -2526,5 +2791,94 @@
    4072. 

  4072.  
    4073. 

  4073.      CATCH_BAD_ALLOC;
    4074. 

  4074.  }
    4075. 

  4075. +
    4076. 

  4076. +/*
    4077. 

  4077. + * Class:     sun_awt_windows_WWindowPeer
    4078. 

  4078. + * Method:    setOpacity
    4079. 

  4079. + * Signature: (I)V
    4080. 

  4080. + */
    4081. 

  4081. +JNIEXPORT void JNICALL
    4082. 

  4082. +Java_sun_awt_windows_WWindowPeer_setOpacity(JNIEnv *env, jobject self,
    4083. 

  4083. +                                              jint iOpacity)
    4084. 

  4084. +{
    4085. 

  4085. +    TRY;
    4086. 

  4086. +
    4087. 

  4087. +    OpacityStruct *os = new OpacityStruct;
    4088. 

  4088. +    os->window = env->NewGlobalRef(self);
    4089. 

  4089. +    os->iOpacity = iOpacity;
    4090. 

  4090. +
    4091. 

  4091. +    AwtToolkit::GetInstance().SyncCall(AwtWindow::_SetOpacity, os);
    4092. 

  4092. +    // global refs and mds are deleted in _SetMinSize
    4093. 

  4093. +
    4094. 

  4094. +    CATCH_BAD_ALLOC;
    4095. 

  4095. +}
    4096. 

  4096. +
    4097. 

  4097. +/*
    4098. 

  4098. + * Class:     sun_awt_windows_WWindowPeer
    4099. 

  4099. + * Method:    setOpaqueImpl
    4100. 

  4100. + * Signature: (Z)V
    4101. 

  4101. + */
    4102. 

  4102. +JNIEXPORT void JNICALL
    4103. 

  4103. +Java_sun_awt_windows_WWindowPeer_setOpaqueImpl(JNIEnv *env, jobject self,
    4104. 

  4104. +                                              jboolean isOpaque)
    4105. 

  4105. +{
    4106. 

  4106. +    TRY;
    4107. 

  4107. +
    4108. 

  4108. +    OpaqueStruct *os = new OpaqueStruct;
    4109. 

  4109. +    os->window = env->NewGlobalRef(self);
    4110. 

  4110. +    os->isOpaque = isOpaque;
    4111. 

  4111. +
    4112. 

  4112. +    AwtToolkit::GetInstance().SyncCall(AwtWindow::_SetOpaque, os);
    4113. 

  4113. +    // global refs and mds are deleted in _SetMinSize
    4114. 

  4114. +
    4115. 

  4115. +    CATCH_BAD_ALLOC;
    4116. 

  4116. +}
    4117. 

  4117. +
    4118. 

  4118. +/*
    4119. 

  4119. + * Class:     sun_awt_windows_WWindowPeer
    4120. 

  4120. + * Method:    updateWindowImpl
    4121. 

  4121. + * Signature: ([III)V
    4122. 

  4122. + */
    4123. 

  4123. +JNIEXPORT void JNICALL
    4124. 

  4124. +Java_sun_awt_windows_WWindowPeer_updateWindowImpl(JNIEnv *env, jobject self,
    4125. 

  4125. +                                                  jintArray data,
    4126. 

  4126. +                                                  jint width, jint height)
    4127. 

  4127. +{
    4128. 

  4128. +    TRY;
    4129. 

  4129. +
    4130. 

  4130. +    UpdateWindowStruct *uws = new UpdateWindowStruct;
    4131. 

  4131. +    uws->window = env->NewGlobalRef(self);
    4132. 

  4132. +    uws->data = (jintArray)env->NewGlobalRef(data);
    4133. 

  4133. +    uws->hBitmap = NULL;
    4134. 

  4134. +    uws->width = width;
    4135. 

  4135. +    uws->height = height;
    4136. 

  4136. +
    4137. 

  4137. +    AwtToolkit::GetInstance().InvokeFunction(AwtWindow::_UpdateWindow, uws);
    4138. 

  4138. +    // global refs and mds are deleted in _UpdateWindow
    4139. 

  4139. +
    4140. 

  4140. +    CATCH_BAD_ALLOC;
    4141. 

  4141. +}
    4142. 

  4142. +
    4143. 

  4143. +/**
    4144. 

  4144. + * This method is called from the WGL pipeline when it needs to update
    4145. 

  4145. + * the layered window WindowPeer's C++ level object.
    4146. 

  4146. + */
    4147. 

  4147. +void AwtWindow_UpdateWindow(JNIEnv *env, jobject peer,
    4148. 

  4148. +                            jint width, jint height, HBITMAP hBitmap)
    4149. 

  4149. +{
    4150. 

  4150. +    TRY;
    4151. 

  4151. +
    4152. 

  4152. +    UpdateWindowStruct *uws = new UpdateWindowStruct;
    4153. 

  4153. +    uws->window = env->NewGlobalRef(peer);
    4154. 

  4154. +    uws->data = NULL;
    4155. 

  4155. +    uws->hBitmap = hBitmap;
    4156. 

  4156. +    uws->width = width;
    4157. 

  4157. +    uws->height = height;
    4158. 

  4158. +
    4159. 

  4159. +    AwtToolkit::GetInstance().InvokeFunction(AwtWindow::_UpdateWindow, uws);
    4160. 

  4160. +    // global refs and mds are deleted in _UpdateWindow
    4161. 

  4161. +
    4162. 

  4162. +    CATCH_BAD_ALLOC;
    4163. 

  4163. +}
    4164. 

  4164.  
    4165. 

  4165.  } /* extern "C" */
    4166. 

  4166. diff -Nru openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.h openjdk/jdk/src/windows/native/sun/windows/awt_Window.h
    4167. 

  4167. --- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.h	2011-02-16 00:40:21.000000000 +0000
    4168. 

  4168. +++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.h	2011-02-16 01:27:25.016325311 +0000
    4169. 

  4169. @@ -1,5 +1,5 @@
    4170. 

  4170.  /*
    4171. 

  4171. - * Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
    4172. 

  4172. + * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
    4173. 

  4173.   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    4174. 

  4174.   *
    4175. 

  4175.   * This code is free software; you can redistribute it and/or modify it
    4176. 

  4176. @@ -188,6 +188,9 @@
    4177. 

  4177.  
    4178. 

  4178.      void moveToDefaultLocation(); /* moves Window to X,Y specified by Window Manger */
    4179. 

  4179.  
    4180. 

  4180. +    void UpdateWindow(JNIEnv* env, jintArray data, int width, int height,
    4181. 

  4181. +                      HBITMAP hNewBitmap = NULL);
    4182. 

  4182. +
    4183. 

  4183.      INLINE virtual BOOL IsTopLevel() { return TRUE; }
    4184. 

  4184.      static AwtWindow * GetGrabbedWindow() { return m_grabbedWindow; }
    4185. 

  4185.  
    4186. 

  4186. @@ -210,6 +213,9 @@
    4187. 

  4187.      static void _SetModalExcludedNativeProp(void *param);
    4188. 

  4188.      static void _ModalDisable(void *param);
    4189. 

  4189.      static void _ModalEnable(void *param);
    4190. 

  4190. +    static void _SetOpacity(void* param);
    4191. 

  4191. +    static void _SetOpaque(void* param);
    4192. 

  4192. +    static void _UpdateWindow(void* param);
    4193. 

  4193.  
    4194. 

  4194.      inline static BOOL IsResizing() {
    4195. 

  4195.          return sm_resizing;
    4196. 

  4196. @@ -234,6 +240,32 @@
    4197. 

  4197.                                         // from its hierarchy when shown. Currently applied to instances of
    4198. 

  4198.                                         // javax/swing/Popup$HeavyWeightWindow class.
    4199. 

  4199.  
    4200. 

  4200. +    BYTE m_opacity;         // The opacity level. == 0xff by default (when opacity mode is disabled)
    4201. 

  4201. +    BOOL m_opaque;          // Whether the window uses the perpixel translucency (false), or not (true).
    4202. 

  4202. +
    4203. 

  4203. +    inline BYTE getOpacity() {
    4204. 

  4204. +        return m_opacity;
    4205. 

  4205. +    }
    4206. 

  4206. +    inline void setOpacity(BYTE opacity) {
    4207. 

  4207. +        m_opacity = opacity;
    4208. 

  4208. +    }
    4209. 

  4209. +
    4210. 

  4210. +    inline BOOL isOpaque() {
    4211. 

  4211. +        return m_opaque;
    4212. 

  4212. +    }
    4213. 

  4213. +    inline void setOpaque(BOOL opaque) {
    4214. 

  4214. +        m_opaque = opaque;
    4215. 

  4215. +    }
    4216. 

  4216. +
    4217. 

  4217. +    CRITICAL_SECTION contentBitmapCS;
    4218. 

  4218. +    HBITMAP hContentBitmap;
    4219. 

  4219. +    UINT contentWidth;
    4220. 

  4220. +    UINT contentHeight;
    4221. 

  4221. +
    4222. 

  4222. +    void RedrawWindow();
    4223. 

  4223. +    void SetTranslucency(BYTE opacity, BOOL opaque);
    4224. 

  4224. +    void UpdateWindowImpl(int width, int height, HBITMAP hBitmap);
    4225. 

  4225. +
    4226. 

  4226.  protected:
    4227. 

  4227.      BOOL m_isResizable;
    4228. 

  4228.      static AwtWindow* m_grabbedWindow; // Current grabbing window
    4229. 

  4229. @@ -242,6 +274,10 @@
    4230. 

  4230.      BOOL m_iconInherited;     /* TRUE if icon is inherited from the owner */
    4231. 

  4231.      BOOL m_filterFocusAndActivation; /* Used in the WH_CBT hook */
    4232. 

  4232.  
    4233. 

  4233. +    //These are used in AwtComponent::CreatePrintedPixels. They are overridden
    4234. 

  4234. +    //here to handle non-opaque windows.
    4235. 

  4235. +    virtual void FillBackground(HDC hMemoryDC, SIZE &size);
    4236. 

  4236. +    virtual void FillAlpha(void *bitmapBits, SIZE &size, BYTE alpha);
    4237. 

  4237.  
    4238. 

  4238.  private:
    4239. 

  4239.      int m_screenNum;
    4240. 

  4240. diff -Nru openjdk.orig/jdk/test/com/sun/awt/Translucency/TranslucentJAppletTest/TranslucentJAppletTest.java openjdk/jdk/test/com/sun/awt/Translucency/TranslucentJAppletTest/TranslucentJAppletTest.java
    4241. 

  4241. --- openjdk.orig/jdk/test/com/sun/awt/Translucency/TranslucentJAppletTest/TranslucentJAppletTest.java	1970-01-01 01:00:00.000000000 +0100
    4242. 

  4242. +++ openjdk/jdk/test/com/sun/awt/Translucency/TranslucentJAppletTest/TranslucentJAppletTest.java	2011-02-16 01:27:25.016325311 +0000
    4243. 

  4243. @@ -0,0 +1,103 @@
    4244. 

  4244. +/*
    4245. 

  4245. + * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
    4246. 

  4246. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    4247. 

  4247. + *
    4248. 

  4248. + * This code is free software; you can redistribute it and/or modify it
    4249. 

  4249. + * under the terms of the GNU General Public License version 2 only, as
    4250. 

  4250. + * published by the Free Software Foundation.
    4251. 

  4251. + *
    4252. 

  4252. + * This code is distributed in the hope that it will be useful, but WITHOUT
    4253. 

  4253. + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4254. 

  4254. + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    4255. 

  4255. + * version 2 for more details (a copy is included in the LICENSE file that
    4256. 

  4256. + * accompanied this code).
    4257. 

  4257. + *
    4258. 

  4258. + * You should have received a copy of the GNU General Public License version
    4259. 

  4259. + * 2 along with this work; if not, write to the Free Software Foundation,
    4260. 

  4260. + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4261. 

  4261. + *
    4262. 

  4262. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4263. 

  4263. + * or visit www.oracle.com if you need additional information or have any
    4264. 

  4264. + * questions.
    4265. 

  4265. + */
    4266. 

  4266. +
    4267. 

  4267. +/*
    4268. 

  4268. + * @test %I% %E%
    4269. 

  4269. + * @bug 6683728
    4270. 

  4270. + * @summary Tests that a JApplet in a translucent JFrame works properly
    4271. 

  4271. + * @author Kenneth.Russell@sun.com: area=Graphics
    4272. 

  4272. + * @compile -XDignore.symbol.file=true TranslucentJAppletTest.java
    4273. 

  4273. + * @run main/manual/othervm TranslucentJAppletTest
    4274. 

  4274. + */
    4275. 

  4275. +
    4276. 

  4276. +import java.awt.*;
    4277. 

  4277. +import java.awt.image.*;
    4278. 

  4278. +
    4279. 

  4279. +import javax.swing.*;
    4280. 

  4280. +
    4281. 

  4281. +public class TranslucentJAppletTest {
    4282. 

  4282. +
    4283. 

  4283. +    private static JFrame frame;
    4284. 

  4284. +    private static volatile boolean paintComponentCalled = false;
    4285. 

  4285. +
    4286. 

  4286. +    private static void initAndShowGUI() {
    4287. 

  4287. +        frame = new JFrame();
    4288. 

  4288. +        JApplet applet = new JApplet();
    4289. 

  4289. +        JPanel panel = new JPanel() {
    4290. 

  4290. +            protected void paintComponent(Graphics g) {
    4291. 

  4291. +                paintComponentCalled = true;
    4292. 

  4292. +                g.setColor(Color.RED);
    4293. 

  4293. +                g.fillOval(0, 0, getWidth(), getHeight());
    4294. 

  4294. +            }
    4295. 

  4295. +        };
    4296. 

  4296. +        panel.setDoubleBuffered(false);
    4297. 

  4297. +        panel.setOpaque(false);
    4298. 

  4298. +        applet.add(panel);
    4299. 

  4299. +        frame.add(applet);
    4300. 

  4300. +        frame.setBounds(100, 100, 200, 200);
    4301. 

  4301. +        frame.setUndecorated(true);
    4302. 

  4302. +        com.sun.awt.AWTUtilities.setWindowOpaque(frame, false);
    4303. 

  4303. +        frame.setVisible(true);
    4304. 

  4304. +    }
    4305. 

  4305. +
    4306. 

  4306. +    public static void main(String[] args)
    4307. 

  4307. +        throws Exception
    4308. 

  4308. +    {
    4309. 

  4309. +        sun.awt.SunToolkit tk = (sun.awt.SunToolkit)Toolkit.getDefaultToolkit();
    4310. 

  4310. +
    4311. 

  4311. +        Robot r = new Robot();
    4312. 

  4312. +        Color color1 = r.getPixelColor(100, 100); // (0, 0) in frame coordinates
    4313. 

  4313. +
    4314. 

  4314. +        SwingUtilities.invokeAndWait(new Runnable() {
    4315. 

  4315. +            public void run() {
    4316. 

  4316. +                initAndShowGUI();
    4317. 

  4317. +            }
    4318. 

  4318. +        });
    4319. 

  4319. +        tk.realSync();
    4320. 

  4320. +
    4321. 

  4321. +        if (!paintComponentCalled) {
    4322. 

  4322. +            throw new RuntimeException("Test FAILED: panel's paintComponent() method is not called");
    4323. 

  4323. +        }
    4324. 

  4324. +
    4325. 

  4325. +        Color newColor1 = r.getPixelColor(100, 100);
    4326. 

  4326. +        // unfortunately, robot.getPixelColor() doesn't work for some unknown reason
    4327. 

  4327. +        // Color newColor2 = r.getPixelColor(200, 200);
    4328. 

  4328. +        BufferedImage bim = r.createScreenCapture(new Rectangle(200, 200, 1, 1));
    4329. 

  4329. +        Color newColor2 = new Color(bim.getRGB(0, 0));
    4330. 

  4330. +
    4331. 

  4331. +        // Frame must be transparent at (100, 100) in screen coords
    4332. 

  4332. +        if (!color1.equals(newColor1)) {
    4333. 

  4333. +            System.err.println("color1 = " + color1);
    4334. 

  4334. +            System.err.println("newColor1 = " + newColor1);
    4335. 

  4335. +            throw new RuntimeException("Test FAILED: frame pixel at (0, 0) is not transparent");
    4336. 

  4336. +        }
    4337. 

  4337. +
    4338. 

  4338. +        // Frame must be RED at (200, 200) in screen coords
    4339. 

  4339. +        if (!newColor2.equals(Color.RED)) {
    4340. 

  4340. +            System.err.println("newColor2 = " + newColor2);
    4341. 

  4341. +            throw new RuntimeException("Test FAILED: frame pixel at (100, 100) is not red (transparent?)");
    4342. 

  4342. +        }
    4343. 

  4343. +
    4344. 

  4344. +        System.out.println("Test PASSED");
    4345. 

  4345. +    }
    4346. 

  4346. +}
    4347. 

  4347. diff -Nru openjdk.orig/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form openjdk/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form
    4348. 

  4348. --- openjdk.orig/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form	1970-01-01 01:00:00.000000000 +0100
    4349. 

  4349. +++ openjdk/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form	2011-02-16 01:27:25.016325311 +0000
    4350. 

  4350. @@ -0,0 +1,230 @@
    4351. 

  4351. +<?xml version="1.0" encoding="UTF-8" ?>
    4352. 

  4352. +
    4353. 

  4353. +<Form version="1.3" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
    4354. 

  4354. +  <NonVisualComponents>
    4355. 

  4355. +    <Component class="javax.swing.ButtonGroup" name="createDisposeGrp">
    4356. 

  4356. +    </Component>
    4357. 

  4357. +  </NonVisualComponents>
    4358. 

  4358. +  <Properties>
    4359. 

  4359. +    <Property name="defaultCloseOperation" type="int" value="3"/>
    4360. 

  4360. +    <Property name="title" type="java.lang.String" value="TranslucentShapedFrameTest"/>
    4361. 

  4361. +  </Properties>
    4362. 

  4362. +  <SyntheticProperties>
    4363. 

  4363. +    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
    4364. 

  4364. +  </SyntheticProperties>
    4365. 

  4365. +  <AuxValues>
    4366. 

  4366. +    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
    4367. 

  4367. +    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
    4368. 

  4368. +    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
    4369. 

  4369. +    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
    4370. 

  4370. +    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
    4371. 

  4371. +    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
    4372. 

  4372. +  </AuxValues>
    4373. 

  4373. +
    4374. 

  4374. +  <Layout>
    4375. 

  4375. +    <DimensionLayout dim="0">
    4376. 

  4376. +      <Group type="103" groupAlignment="0" attributes="0">
    4377. 

  4377. +          <Group type="102" attributes="0">
    4378. 

  4378. +              <EmptySpace max="-2" attributes="0"/>
    4379. 

  4379. +              <Group type="103" groupAlignment="0" attributes="0">
    4380. 

  4380. +                  <Group type="102" alignment="0" attributes="0">
    4381. 

  4381. +                      <Component id="transparencySld" pref="375" max="32767" attributes="0"/>
    4382. 

  4382. +                      <EmptySpace max="-2" attributes="0"/>
    4383. 

  4383. +                  </Group>
    4384. 

  4384. +                  <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
    4385. 

  4385. +                  <Group type="102" alignment="0" attributes="0">
    4386. 

  4386. +                      <Component id="shapedCb" min="-2" max="-2" attributes="0"/>
    4387. 

  4387. +                      <EmptySpace max="-2" attributes="0"/>
    4388. 

  4388. +                      <Component id="nonOpaqueChb" min="-2" max="-2" attributes="0"/>
    4389. 

  4389. +                      <EmptySpace max="-2" attributes="0"/>
    4390. 

  4390. +                      <Component id="useSwingCb" min="-2" max="-2" attributes="0"/>
    4391. 

  4391. +                      <EmptySpace pref="102" max="32767" attributes="0"/>
    4392. 

  4392. +                  </Group>
    4393. 

  4393. +                  <Group type="102" alignment="0" attributes="0">
    4394. 

  4394. +                      <Group type="103" groupAlignment="0" attributes="0">
    4395. 

  4395. +                          <Group type="102" alignment="0" attributes="0">
    4396. 

  4396. +                              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
    4397. 

  4397. +                              <EmptySpace pref="314" max="-2" attributes="0"/>
    4398. 

  4398. +                          </Group>
    4399. 

  4399. +                          <Group type="102" alignment="0" attributes="0">
    4400. 

  4400. +                              <Component id="passedBtn" min="-2" max="-2" attributes="0"/>
    4401. 

  4401. +                              <EmptySpace max="-2" attributes="0"/>
    4402. 

  4402. +                              <Component id="failedBtn" min="-2" max="-2" attributes="0"/>
    4403. 

  4403. +                              <EmptySpace pref="241" max="-2" attributes="0"/>
    4404. 

  4404. +                          </Group>
    4405. 

  4405. +                          <Component id="jScrollPane1" alignment="1" pref="375" max="32767" attributes="0"/>
    4406. 

  4406. +                          <Group type="102" alignment="0" attributes="0">
    4407. 

  4407. +                              <Component id="createFrameBtn" min="-2" pref="187" max="-2" attributes="0"/>
    4408. 

  4408. +                              <EmptySpace max="-2" attributes="0"/>
    4409. 

  4409. +                              <Component id="disposeFrameBtn" min="-2" pref="182" max="-2" attributes="0"/>
    4410. 

  4410. +                          </Group>
    4411. 

  4411. +                      </Group>
    4412. 

  4412. +                      <EmptySpace max="-2" attributes="0"/>
    4413. 

  4413. +                  </Group>
    4414. 

  4414. +              </Group>
    4415. 

  4415. +          </Group>
    4416. 

  4416. +      </Group>
    4417. 

  4417. +    </DimensionLayout>
    4418. 

  4418. +    <DimensionLayout dim="1">
    4419. 

  4419. +      <Group type="103" groupAlignment="0" attributes="0">
    4420. 

  4420. +          <Group type="102" alignment="0" attributes="0">
    4421. 

  4421. +              <EmptySpace max="-2" attributes="0"/>
    4422. 

  4422. +              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
    4423. 

  4423. +              <EmptySpace max="-2" attributes="0"/>
    4424. 

  4424. +              <Component id="transparencySld" min="-2" max="-2" attributes="0"/>
    4425. 

  4425. +              <EmptySpace max="-2" attributes="0"/>
    4426. 

  4426. +              <Group type="103" groupAlignment="3" attributes="0">
    4427. 

  4427. +                  <Component id="shapedCb" alignment="3" min="-2" max="-2" attributes="0"/>
    4428. 

  4428. +                  <Component id="nonOpaqueChb" alignment="3" min="-2" max="-2" attributes="0"/>
    4429. 

  4429. +                  <Component id="useSwingCb" alignment="3" min="-2" max="-2" attributes="0"/>
    4430. 

  4430. +              </Group>
    4431. 

  4431. +              <EmptySpace max="-2" attributes="0"/>
    4432. 

  4432. +              <Group type="103" groupAlignment="3" attributes="0">
    4433. 

  4433. +                  <Component id="disposeFrameBtn" alignment="3" min="-2" max="-2" attributes="0"/>
    4434. 

  4434. +                  <Component id="createFrameBtn" alignment="3" min="-2" max="-2" attributes="0"/>
    4435. 

  4435. +              </Group>
    4436. 

  4436. +              <EmptySpace min="-2" pref="17" max="-2" attributes="0"/>
    4437. 

  4437. +              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
    4438. 

  4438. +              <EmptySpace max="-2" attributes="0"/>
    4439. 

  4439. +              <Component id="jScrollPane1" min="-2" pref="148" max="-2" attributes="0"/>
    4440. 

  4440. +              <EmptySpace max="-2" attributes="0"/>
    4441. 

  4441. +              <Group type="103" groupAlignment="3" attributes="0">
    4442. 

  4442. +                  <Component id="passedBtn" alignment="3" min="-2" max="-2" attributes="0"/>
    4443. 

  4443. +                  <Component id="failedBtn" alignment="3" min="-2" max="-2" attributes="0"/>
    4444. 

  4444. +              </Group>
    4445. 

  4445. +              <EmptySpace max="32767" attributes="0"/>
    4446. 

  4446. +          </Group>
    4447. 

  4447. +      </Group>
    4448. 

  4448. +    </DimensionLayout>
    4449. 

  4449. +  </Layout>
    4450. 

  4450. +  <SubComponents>
    4451. 

  4451. +    <Component class="javax.swing.JLabel" name="jLabel1">
    4452. 

  4452. +      <Properties>
    4453. 

  4453. +        <Property name="text" type="java.lang.String" value="Frame Opacity:"/>
    4454. 

  4454. +      </Properties>
    4455. 

  4455. +    </Component>
    4456. 

  4456. +    <Component class="javax.swing.JSlider" name="transparencySld">
    4457. 

  4457. +      <Properties>
    4458. 

  4458. +        <Property name="majorTickSpacing" type="int" value="10"/>
    4459. 

  4459. +        <Property name="minorTickSpacing" type="int" value="5"/>
    4460. 

  4460. +        <Property name="paintLabels" type="boolean" value="true"/>
    4461. 

  4461. +        <Property name="paintTicks" type="boolean" value="true"/>
    4462. 

  4462. +        <Property name="value" type="int" value="100"/>
    4463. 

  4463. +      </Properties>
    4464. 

  4464. +      <Events>
    4465. 

  4465. +        <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="transparencySldStateChanged"/>
    4466. 

  4466. +      </Events>
    4467. 

  4467. +    </Component>
    4468. 

  4468. +    <Component class="javax.swing.JCheckBox" name="shapedCb">
    4469. 

  4469. +      <Properties>
    4470. 

  4470. +        <Property name="text" type="java.lang.String" value="Shaped Frame"/>
    4471. 

  4471. +        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
    4472. 

  4472. +          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
    4473. 

  4473. +            <EmptyBorder bottom="0" left="0" right="0" top="0"/>
    4474. 

  4474. +          </Border>
    4475. 

  4475. +        </Property>
    4476. 

  4476. +        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
    4477. 

  4477. +          <Insets value="[0, 0, 0, 0]"/>
    4478. 

  4478. +        </Property>
    4479. 

  4479. +      </Properties>
    4480. 

  4480. +      <Events>
    4481. 

  4481. +        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="shapedCbActionPerformed"/>
    4482. 

  4482. +      </Events>
    4483. 

  4483. +    </Component>
    4484. 

  4484. +    <Component class="javax.swing.JCheckBox" name="nonOpaqueChb">
    4485. 

  4485. +      <Properties>
    4486. 

  4486. +        <Property name="text" type="java.lang.String" value="Non Opaque Frame"/>
    4487. 

  4487. +        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
    4488. 

  4488. +          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
    4489. 

  4489. +            <EmptyBorder bottom="0" left="0" right="0" top="0"/>
    4490. 

  4490. +          </Border>
    4491. 

  4491. +        </Property>
    4492. 

  4492. +        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
    4493. 

  4493. +          <Insets value="[0, 0, 0, 0]"/>
    4494. 

  4494. +        </Property>
    4495. 

  4495. +      </Properties>
    4496. 

  4496. +      <Events>
    4497. 

  4497. +        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="nonOpaqueChbActionPerformed"/>
    4498. 

  4498. +      </Events>
    4499. 

  4499. +    </Component>
    4500. 

  4500. +    <Container class="javax.swing.JScrollPane" name="jScrollPane1">
    4501. 

  4501. +      <AuxValues>
    4502. 

  4502. +        <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
    4503. 

  4503. +      </AuxValues>
    4504. 

  4504. +
    4505. 

  4505. +      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
    4506. 

  4506. +      <SubComponents>
    4507. 

  4507. +        <Component class="javax.swing.JTextArea" name="jTextArea1">
    4508. 

  4508. +          <Properties>
    4509. 

  4509. +            <Property name="columns" type="int" value="20"/>
    4510. 

  4510. +            <Property name="rows" type="int" value="5"/>
    4511. 

  4511. +            <Property name="text" type="java.lang.String" value="Create translucent and/or shaped, or&#xa;non-opaque frame. Make sure it behaves&#xa;correctly (no artifacts left on the screen&#xa;when dragging - if dragging is possible).&#xa;Click &quot;Passed&quot; if the test behaves correctly,&#xa;&quot;Falied&quot; otherwise."/>
    4512. 

  4512. +          </Properties>
    4513. 

  4513. +        </Component>
    4514. 

  4514. +      </SubComponents>
    4515. 

  4515. +    </Container>
    4516. 

  4516. +    <Component class="javax.swing.JLabel" name="jLabel2">
    4517. 

  4517. +      <Properties>
    4518. 

  4518. +        <Property name="text" type="java.lang.String" value="Instructions:"/>
    4519. 

  4519. +      </Properties>
    4520. 

  4520. +    </Component>
    4521. 

  4521. +    <Component class="javax.swing.JButton" name="passedBtn">
    4522. 

  4522. +      <Properties>
    4523. 

  4523. +        <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
    4524. 

  4524. +          <Color blue="64" green="ff" red="81" type="rgb"/>
    4525. 

  4525. +        </Property>
    4526. 

  4526. +        <Property name="text" type="java.lang.String" value="Passed"/>
    4527. 

  4527. +      </Properties>
    4528. 

  4528. +      <Events>
    4529. 

  4529. +        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="passedBtnActionPerformed"/>
    4530. 

  4530. +      </Events>
    4531. 

  4531. +    </Component>
    4532. 

  4532. +    <Component class="javax.swing.JButton" name="failedBtn">
    4533. 

  4533. +      <Properties>
    4534. 

  4534. +        <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
    4535. 

  4535. +          <Color blue="0" green="0" id="red" palette="1" red="ff" type="palette"/>
    4536. 

  4536. +        </Property>
    4537. 

  4537. +        <Property name="text" type="java.lang.String" value="Failed"/>
    4538. 

  4538. +      </Properties>
    4539. 

  4539. +      <Events>
    4540. 

  4540. +        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="failedBtnActionPerformed"/>
    4541. 

  4541. +      </Events>
    4542. 

  4542. +    </Component>
    4543. 

  4543. +    <Component class="javax.swing.JToggleButton" name="createFrameBtn">
    4544. 

  4544. +      <Properties>
    4545. 

  4545. +        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
    4546. 

  4546. +          <ComponentRef name="createDisposeGrp"/>
    4547. 

  4547. +        </Property>
    4548. 

  4548. +        <Property name="text" type="java.lang.String" value="Create Frame"/>
    4549. 

  4549. +      </Properties>
    4550. 

  4550. +      <Events>
    4551. 

  4551. +        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="createFrameBtnActionPerformed"/>
    4552. 

  4552. +      </Events>
    4553. 

  4553. +    </Component>
    4554. 

  4554. +    <Component class="javax.swing.JToggleButton" name="disposeFrameBtn">
    4555. 

  4555. +      <Properties>
    4556. 

  4556. +        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
    4557. 

  4557. +          <ComponentRef name="createDisposeGrp"/>
    4558. 

  4558. +        </Property>
    4559. 

  4559. +        <Property name="selected" type="boolean" value="true"/>
    4560. 

  4560. +        <Property name="text" type="java.lang.String" value="Dispose Frame"/>
    4561. 

  4561. +      </Properties>
    4562. 

  4562. +      <Events>
    4563. 

  4563. +        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="disposeFrameBtnActionPerformed"/>
    4564. 

  4564. +      </Events>
    4565. 

  4565. +    </Component>
    4566. 

  4566. +    <Component class="javax.swing.JCheckBox" name="useSwingCb">
    4567. 

  4567. +      <Properties>
    4568. 

  4568. +        <Property name="text" type="java.lang.String" value="Use JFrame"/>
    4569. 

  4569. +        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
    4570. 

  4570. +          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
    4571. 

  4571. +            <EmptyBorder bottom="0" left="0" right="0" top="0"/>
    4572. 

  4572. +          </Border>
    4573. 

  4573. +        </Property>
    4574. 

  4574. +        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
    4575. 

  4575. +          <Insets value="[0, 0, 0, 0]"/>
    4576. 

  4576. +        </Property>
    4577. 

  4577. +      </Properties>
    4578. 

  4578. +    </Component>
    4579. 

  4579. +  </SubComponents>
    4580. 

  4580. +</Form>
    4581. 

  4581. diff -Nru openjdk.orig/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java openjdk/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java
    4582. 

  4582. --- openjdk.orig/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java	1970-01-01 01:00:00.000000000 +0100
    4583. 

  4583. +++ openjdk/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java	2011-02-16 01:27:25.016325311 +0000
    4584. 

  4584. @@ -0,0 +1,359 @@
    4585. 

  4585. +/*
    4586. 

  4586. + * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
    4587. 

  4587. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    4588. 

  4588. + *
    4589. 

  4589. + * This code is free software; you can redistribute it and/or modify it
    4590. 

  4590. + * under the terms of the GNU General Public License version 2 only, as
    4591. 

  4591. + * published by the Free Software Foundation.  Oracle designates this
    4592. 

  4592. + * particular file as subject to the "Classpath" exception as provided
    4593. 

  4593. + * by Oracle in the LICENSE file that accompanied this code.
    4594. 

  4594. + *
    4595. 

  4595. + * This code is distributed in the hope that it will be useful, but WITHOUT
    4596. 

  4596. + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4597. 

  4597. + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    4598. 

  4598. + * version 2 for more details (a copy is included in the LICENSE file that
    4599. 

  4599. + * accompanied this code).
    4600. 

  4600. + *
    4601. 

  4601. + * You should have received a copy of the GNU General Public License version
    4602. 

  4602. + * 2 along with this work; if not, write to the Free Software Foundation,
    4603. 

  4603. + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4604. 

  4604. + *
    4605. 

  4605. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4606. 

  4606. + * or visit www.oracle.com if you need additional information or have any
    4607. 

  4607. + * questions.
    4608. 

  4608. + */
    4609. 

  4609. +
    4610. 

  4610. +/*
    4611. 

  4611. + * @test %I% %E%
    4612. 

  4612. + * @bug 6655001 6670649 6687141
    4613. 

  4613. + * @summary Tests that hw acceleration doesn't affect translucent/shaped windows
    4614. 

  4614. + * @author Dmitri.Trembovetski@sun.com: area=Graphics
    4615. 

  4615. + * @compile -XDignore.symbol.file=true TranslucentShapedFrameTest.java
    4616. 

  4616. + * @compile -XDignore.symbol.file=true TSFrame.java
    4617. 

  4617. + * @run main/manual/othervm TranslucentShapedFrameTest
    4618. 

  4618. + * @run main/manual/othervm -Dsun.java2d.noddraw=true TranslucentShapedFrameTest
    4619. 

  4619. + * @run main/manual/othervm -Dsun.java2d.opengl=True TranslucentShapedFrameTest
    4620. 

  4620. + */
    4621. 

  4621. +import com.sun.awt.AWTUtilities;
    4622. 

  4622. +import static com.sun.awt.AWTUtilities.Translucency.*;
    4623. 

  4623. +import java.awt.Frame;
    4624. 

  4624. +import java.awt.GraphicsConfiguration;
    4625. 

  4625. +import java.awt.GraphicsDevice;
    4626. 

  4626. +import java.awt.GraphicsEnvironment;
    4627. 

  4627. +import java.awt.Shape;
    4628. 

  4628. +import java.awt.geom.Ellipse2D;
    4629. 

  4629. +import java.util.concurrent.CountDownLatch;
    4630. 

  4630. +import javax.swing.JSlider;
    4631. 

  4631. +import javax.swing.SwingUtilities;
    4632. 

  4632. +import javax.swing.UIManager;
    4633. 

  4633. +import javax.swing.UnsupportedLookAndFeelException;
    4634. 

  4634. +
    4635. 

  4635. +public class TranslucentShapedFrameTest extends javax.swing.JFrame {
    4636. 

  4636. +    Frame testFrame;
    4637. 

  4637. +    static CountDownLatch done;
    4638. 

  4638. +    static volatile boolean failed = false;
    4639. 

  4639. +    GraphicsConfiguration gcToUse = null;
    4640. 

  4640. +
    4641. 

  4641. +    /**
    4642. 

  4642. +     * Creates new form TranslucentShapedFrameTest
    4643. 

  4643. +     */
    4644. 

  4644. +    public TranslucentShapedFrameTest() {
    4645. 

  4645. +        // not necessary, but we just look nicer
    4646. 

  4646. +        try {
    4647. 

  4647. +            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
    4648. 

  4648. +        } catch (Exception ex) {}
    4649. 

  4649. +
    4650. 

  4650. +        initComponents();
    4651. 

  4651. +        checkEffects();
    4652. 

  4652. +
    4653. 

  4653. +        SwingUtilities.updateComponentTreeUI(this);
    4654. 

  4654. +    }
    4655. 

  4655. +
    4656. 

  4656. +    /** This method is called from within the constructor to
    4657. 

  4657. +     * initialize the form.
    4658. 

  4658. +     * WARNING: Do NOT modify this code. The content of this method is
    4659. 

  4659. +     * always regenerated by the Form Editor.
    4660. 

  4660. +     */
    4661. 

  4661. +    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
    4662. 

  4662. +    private void initComponents() {
    4663. 

  4663. +        createDisposeGrp = new javax.swing.ButtonGroup();
    4664. 

  4664. +        jLabel1 = new javax.swing.JLabel();
    4665. 

  4665. +        transparencySld = new javax.swing.JSlider();
    4666. 

  4666. +        shapedCb = new javax.swing.JCheckBox();
    4667. 

  4667. +        nonOpaqueChb = new javax.swing.JCheckBox();
    4668. 

  4668. +        jScrollPane1 = new javax.swing.JScrollPane();
    4669. 

  4669. +        jTextArea1 = new javax.swing.JTextArea();
    4670. 

  4670. +        jLabel2 = new javax.swing.JLabel();
    4671. 

  4671. +        passedBtn = new javax.swing.JButton();
    4672. 

  4672. +        failedBtn = new javax.swing.JButton();
    4673. 

  4673. +        createFrameBtn = new javax.swing.JToggleButton();
    4674. 

  4674. +        disposeFrameBtn = new javax.swing.JToggleButton();
    4675. 

  4675. +        useSwingCb = new javax.swing.JCheckBox();
    4676. 

  4676. +
    4677. 

  4677. +        setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
    4678. 

  4678. +        setTitle("TranslucentShapedFrameTest");
    4679. 

  4679. +        jLabel1.setText("Frame Opacity:");
    4680. 

  4680. +
    4681. 

  4681. +        transparencySld.setMajorTickSpacing(10);
    4682. 

  4682. +        transparencySld.setMinorTickSpacing(5);
    4683. 

  4683. +        transparencySld.setPaintLabels(true);
    4684. 

  4684. +        transparencySld.setPaintTicks(true);
    4685. 

  4685. +        transparencySld.setValue(100);
    4686. 

  4686. +        transparencySld.addChangeListener(new javax.swing.event.ChangeListener() {
    4687. 

  4687. +            public void stateChanged(javax.swing.event.ChangeEvent evt) {
    4688. 

  4688. +                transparencySldStateChanged(evt);
    4689. 

  4689. +            }
    4690. 

  4690. +        });
    4691. 

  4691. +
    4692. 

  4692. +        shapedCb.setText("Shaped Frame");
    4693. 

  4693. +        shapedCb.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
    4694. 

  4694. +        shapedCb.setMargin(new java.awt.Insets(0, 0, 0, 0));
    4695. 

  4695. +        shapedCb.addActionListener(new java.awt.event.ActionListener() {
    4696. 

  4696. +            public void actionPerformed(java.awt.event.ActionEvent evt) {
    4697. 

  4697. +                shapedCbActionPerformed(evt);
    4698. 

  4698. +            }
    4699. 

  4699. +        });
    4700. 

  4700. +
    4701. 

  4701. +        nonOpaqueChb.setText("Non Opaque Frame");
    4702. 

  4702. +        nonOpaqueChb.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
    4703. 

  4703. +        nonOpaqueChb.setMargin(new java.awt.Insets(0, 0, 0, 0));
    4704. 

  4704. +        nonOpaqueChb.addActionListener(new java.awt.event.ActionListener() {
    4705. 

  4705. +            public void actionPerformed(java.awt.event.ActionEvent evt) {
    4706. 

  4706. +                nonOpaqueChbActionPerformed(evt);
    4707. 

  4707. +            }
    4708. 

  4708. +        });
    4709. 

  4709. +
    4710. 

  4710. +        jTextArea1.setColumns(20);
    4711. 

  4711. +        jTextArea1.setRows(5);
    4712. 

  4712. +        jTextArea1.setText("Create translucent and/or shaped, or\nnon-opaque frame. Make sure it behaves\ncorrectly (no artifacts left on the screen\nwhen dragging - if dragging is possible).\nClick \"Passed\" if the test behaves correctly,\n\"Falied\" otherwise.");
    4713. 

  4713. +        jScrollPane1.setViewportView(jTextArea1);
    4714. 

  4714. +
    4715. 

  4715. +        jLabel2.setText("Instructions:");
    4716. 

  4716. +
    4717. 

  4717. +        passedBtn.setBackground(new java.awt.Color(129, 255, 100));
    4718. 

  4718. +        passedBtn.setText("Passed");
    4719. 

  4719. +        passedBtn.addActionListener(new java.awt.event.ActionListener() {
    4720. 

  4720. +            public void actionPerformed(java.awt.event.ActionEvent evt) {
    4721. 

  4721. +                passedBtnActionPerformed(evt);
    4722. 

  4722. +            }
    4723. 

  4723. +        });
    4724. 

  4724. +
    4725. 

  4725. +        failedBtn.setBackground(java.awt.Color.red);
    4726. 

  4726. +        failedBtn.setText("Failed");
    4727. 

  4727. +        failedBtn.addActionListener(new java.awt.event.ActionListener() {
    4728. 

  4728. +            public void actionPerformed(java.awt.event.ActionEvent evt) {
    4729. 

  4729. +                failedBtnActionPerformed(evt);
    4730. 

  4730. +            }
    4731. 

  4731. +        });
    4732. 

  4732. +
    4733. 

  4733. +        createDisposeGrp.add(createFrameBtn);
    4734. 

  4734. +        createFrameBtn.setText("Create Frame");
    4735. 

  4735. +        createFrameBtn.addActionListener(new java.awt.event.ActionListener() {
    4736. 

  4736. +            public void actionPerformed(java.awt.event.ActionEvent evt) {
    4737. 

  4737. +                createFrameBtnActionPerformed(evt);
    4738. 

  4738. +            }
    4739. 

  4739. +        });
    4740. 

  4740. +
    4741. 

  4741. +        createDisposeGrp.add(disposeFrameBtn);
    4742. 

  4742. +        disposeFrameBtn.setSelected(true);
    4743. 

  4743. +        disposeFrameBtn.setText("Dispose Frame");
    4744. 

  4744. +        disposeFrameBtn.addActionListener(new java.awt.event.ActionListener() {
    4745. 

  4745. +            public void actionPerformed(java.awt.event.ActionEvent evt) {
    4746. 

  4746. +                disposeFrameBtnActionPerformed(evt);
    4747. 

  4747. +            }
    4748. 

  4748. +        });
    4749. 

  4749. +
    4750. 

  4750. +        useSwingCb.setText("Use JFrame");
    4751. 

  4751. +        useSwingCb.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
    4752. 

  4752. +        useSwingCb.setMargin(new java.awt.Insets(0, 0, 0, 0));
    4753. 

  4753. +
    4754. 

  4754. +        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
    4755. 

  4755. +        getContentPane().setLayout(layout);
    4756. 

  4756. +        layout.setHorizontalGroup(
    4757. 

  4757. +            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    4758. 

  4758. +            .addGroup(layout.createSequentialGroup()
    4759. 

  4759. +                .addContainerGap()
    4760. 

  4760. +                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    4761. 

  4761. +                    .addGroup(layout.createSequentialGroup()
    4762. 

  4762. +                        .addComponent(transparencySld, javax.swing.GroupLayout.DEFAULT_SIZE, 375, Short.MAX_VALUE)
    4763. 

  4763. +                        .addContainerGap())
    4764. 

  4764. +                    .addComponent(jLabel1)
    4765. 

  4765. +                    .addGroup(layout.createSequentialGroup()
    4766. 

  4766. +                        .addComponent(shapedCb)
    4767. 

  4767. +                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    4768. 

  4768. +                        .addComponent(nonOpaqueChb)
    4769. 

  4769. +                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    4770. 

  4770. +                        .addComponent(useSwingCb)
    4771. 

  4771. +                        .addContainerGap(102, Short.MAX_VALUE))
    4772. 

  4772. +                    .addGroup(layout.createSequentialGroup()
    4773. 

  4773. +                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    4774. 

  4774. +                            .addGroup(layout.createSequentialGroup()
    4775. 

  4775. +                                .addComponent(jLabel2)
    4776. 

  4776. +                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 314, javax.swing.GroupLayout.PREFERRED_SIZE))
    4777. 

  4777. +                            .addGroup(layout.createSequentialGroup()
    4778. 

  4778. +                                .addComponent(passedBtn)
    4779. 

  4779. +                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    4780. 

  4780. +                                .addComponent(failedBtn)
    4781. 

  4781. +                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 241, javax.swing.GroupLayout.PREFERRED_SIZE))
    4782. 

  4782. +                            .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 375, Short.MAX_VALUE)
    4783. 

  4783. +                            .addGroup(layout.createSequentialGroup()
    4784. 

  4784. +                                .addComponent(createFrameBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 187, javax.swing.GroupLayout.PREFERRED_SIZE)
    4785. 

  4785. +                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    4786. 

  4786. +                                .addComponent(disposeFrameBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 182, javax.swing.GroupLayout.PREFERRED_SIZE)))
    4787. 

  4787. +                        .addContainerGap())))
    4788. 

  4788. +        );
    4789. 

  4789. +        layout.setVerticalGroup(
    4790. 

  4790. +            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
    4791. 

  4791. +            .addGroup(layout.createSequentialGroup()
    4792. 

  4792. +                .addContainerGap()
    4793. 

  4793. +                .addComponent(jLabel1)
    4794. 

  4794. +                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    4795. 

  4795. +                .addComponent(transparencySld, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
    4796. 

  4796. +                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    4797. 

  4797. +                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    4798. 

  4798. +                    .addComponent(shapedCb)
    4799. 

  4799. +                    .addComponent(nonOpaqueChb)
    4800. 

  4800. +                    .addComponent(useSwingCb))
    4801. 

  4801. +                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    4802. 

  4802. +                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    4803. 

  4803. +                    .addComponent(disposeFrameBtn)
    4804. 

  4804. +                    .addComponent(createFrameBtn))
    4805. 

  4805. +                .addGap(17, 17, 17)
    4806. 

  4806. +                .addComponent(jLabel2)
    4807. 

  4807. +                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    4808. 

  4808. +                .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 148, javax.swing.GroupLayout.PREFERRED_SIZE)
    4809. 

  4809. +                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
    4810. 

  4810. +                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
    4811. 

  4811. +                    .addComponent(passedBtn)
    4812. 

  4812. +                    .addComponent(failedBtn))
    4813. 

  4813. +                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
    4814. 

  4814. +        );
    4815. 

  4815. +        pack();
    4816. 

  4816. +    }// </editor-fold>//GEN-END:initComponents
    4817. 

  4817. +
    4818. 

  4818. +    private void nonOpaqueChbActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_nonOpaqueChbActionPerformed
    4819. 

  4819. +        if (testFrame != null) {
    4820. 

  4820. +            // REMIND: this path in the test doesn't work well (test bug)
    4821. 

  4821. +//            AWTUtilities.setWindowOpaque(testFrame, !nonOpaqueChb.isSelected());
    4822. 

  4822. +        }
    4823. 

  4823. +    }//GEN-LAST:event_nonOpaqueChbActionPerformed
    4824. 

  4824. +
    4825. 

  4825. +    private void shapedCbActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_shapedCbActionPerformed
    4826. 

  4826. +        if (testFrame != null) {
    4827. 

  4827. +            Shape s = null;
    4828. 

  4828. +            if (shapedCb.isSelected()) {
    4829. 

  4829. +                s = new Ellipse2D.Double(0, 0,
    4830. 

  4830. +                                         testFrame.getWidth(),
    4831. 

  4831. +                                         testFrame.getHeight());
    4832. 

  4832. +            }
    4833. 

  4833. +            AWTUtilities.setWindowShape(testFrame, s);
    4834. 

  4834. +        }
    4835. 

  4835. +    }//GEN-LAST:event_shapedCbActionPerformed
    4836. 

  4836. +
    4837. 

  4837. +    private void transparencySldStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_transparencySldStateChanged
    4838. 

  4838. +        JSlider source = (JSlider)evt.getSource();
    4839. 

  4839. +            int transl = transparencySld.getValue();
    4840. 

  4840. +            if (testFrame != null) {
    4841. 

  4841. +                AWTUtilities.setWindowOpacity(testFrame, (float)transl/100f);
    4842. 

  4842. +            }
    4843. 

  4843. +    }//GEN-LAST:event_transparencySldStateChanged
    4844. 

  4844. +
    4845. 

  4845. +    private void failedBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_failedBtnActionPerformed
    4846. 

  4846. +        disposeFrameBtnActionPerformed(evt);
    4847. 

  4847. +        dispose();
    4848. 

  4848. +        failed = true;
    4849. 

  4849. +        done.countDown();
    4850. 

  4850. +    }//GEN-LAST:event_failedBtnActionPerformed
    4851. 

  4851. +
    4852. 

  4852. +    private void disposeFrameBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_disposeFrameBtnActionPerformed
    4853. 

  4853. +        TSFrame.stopThreads();
    4854. 

  4854. +        if (testFrame != null) {
    4855. 

  4855. +            testFrame.dispose();
    4856. 

  4856. +            testFrame = null;
    4857. 

  4857. +        }
    4858. 

  4858. +    }//GEN-LAST:event_disposeFrameBtnActionPerformed
    4859. 

  4859. +
    4860. 

  4860. +    private void createFrameBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_createFrameBtnActionPerformed
    4861. 

  4861. +        disposeFrameBtnActionPerformed(evt);
    4862. 

  4862. +        int transl = transparencySld.getValue();
    4863. 

  4863. +        testFrame = TSFrame.createGui(gcToUse,
    4864. 

  4864. +                useSwingCb.isSelected(), shapedCb.isSelected(),
    4865. 

  4865. +                (transl < 100), nonOpaqueChb.isSelected(),
    4866. 

  4866. +                (float)transl/100f);
    4867. 

  4867. +    }//GEN-LAST:event_createFrameBtnActionPerformed
    4868. 

  4868. +
    4869. 

  4869. +    private void passedBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_passedBtnActionPerformed
    4870. 

  4870. +        disposeFrameBtnActionPerformed(evt);
    4871. 

  4871. +        dispose();
    4872. 

  4872. +        done.countDown();
    4873. 

  4873. +    }//GEN-LAST:event_passedBtnActionPerformed
    4874. 

  4874. +
    4875. 

  4875. +    /**
    4876. 

  4876. +     * @param args the command line arguments
    4877. 

  4877. +     */
    4878. 

  4878. +    public static void main(String args[]) {
    4879. 

  4879. +        done = new CountDownLatch(1);
    4880. 

  4880. +        java.awt.EventQueue.invokeLater(new Runnable() {
    4881. 

  4881. +            public void run() {
    4882. 

  4882. +                new TranslucentShapedFrameTest().setVisible(true);
    4883. 

  4883. +            }
    4884. 

  4884. +        });
    4885. 

  4885. +        try {
    4886. 

  4886. +            done.await();
    4887. 

  4887. +        } catch (InterruptedException ex) {}
    4888. 

  4888. +        if (failed) {
    4889. 

  4889. +            throw new RuntimeException("Test FAILED");
    4890. 

  4890. +        }
    4891. 

  4891. +        System.out.println("Test PASSED");
    4892. 

  4892. +    }
    4893. 

  4893. +
    4894. 

  4894. +    private void checkEffects() {
    4895. 

  4895. +        if (!AWTUtilities.isTranslucencySupported(PERPIXEL_TRANSPARENT)) {
    4896. 

  4896. +            shapedCb.setEnabled(false);
    4897. 

  4897. +        }
    4898. 

  4898. +
    4899. 

  4899. +        if (!AWTUtilities.isTranslucencySupported(TRANSLUCENT)) {
    4900. 

  4900. +            transparencySld.setEnabled(false);
    4901. 

  4901. +        }
    4902. 

  4902. +
    4903. 

  4903. +        GraphicsConfiguration gc = null;
    4904. 

  4904. +        if (AWTUtilities.isTranslucencySupported(PERPIXEL_TRANSLUCENT)) {
    4905. 

  4905. +            gc = findGraphicsConfig();
    4906. 

  4906. +            if (gc == null) {
    4907. 

  4907. +                nonOpaqueChb.setEnabled(false);
    4908. 

  4908. +            }
    4909. 

  4909. +        }
    4910. 

  4910. +
    4911. 

  4911. +        gcToUse = gc;
    4912. 

  4912. +    }
    4913. 

  4913. +
    4914. 

  4914. +    private GraphicsConfiguration findGraphicsConfig() {
    4915. 

  4915. +        GraphicsDevice gd =
    4916. 

  4916. +            GraphicsEnvironment.getLocalGraphicsEnvironment().
    4917. 

  4917. +                getDefaultScreenDevice();
    4918. 

  4918. +        GraphicsConfiguration gcs[] = gd.getConfigurations();
    4919. 

  4919. +        for (GraphicsConfiguration gc : gcs) {
    4920. 

  4920. +            if (AWTUtilities.isTranslucencyCapable(gc)) {
    4921. 

  4921. +                return gc;
    4922. 

  4922. +            }
    4923. 

  4923. +        }
    4924. 

  4924. +        return null;
    4925. 

  4925. +    }
    4926. 

  4926. +
    4927. 

  4927. +    // Variables declaration - do not modify//GEN-BEGIN:variables
    4928. 

  4928. +    private javax.swing.ButtonGroup createDisposeGrp;
    4929. 

  4929. +    private javax.swing.JToggleButton createFrameBtn;
    4930. 

  4930. +    private javax.swing.JToggleButton disposeFrameBtn;
    4931. 

  4931. +    private javax.swing.JButton failedBtn;
    4932. 

  4932. +    private javax.swing.JLabel jLabel1;
    4933. 

  4933. +    private javax.swing.JLabel jLabel2;
    4934. 

  4934. +    private javax.swing.JScrollPane jScrollPane1;
    4935. 

  4935. +    private javax.swing.JTextArea jTextArea1;
    4936. 

  4936. +    private javax.swing.JCheckBox nonOpaqueChb;
    4937. 

  4937. +    private javax.swing.JButton passedBtn;
    4938. 

  4938. +    private javax.swing.JCheckBox shapedCb;
    4939. 

  4939. +    private javax.swing.JSlider transparencySld;
    4940. 

  4940. +    private javax.swing.JCheckBox useSwingCb;
    4941. 

  4941. +    // End of variables declaration//GEN-END:variables
    4942. 

  4942. +
    4943. 

  4943. +}
    4944. 

  4944. diff -Nru openjdk.orig/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TSFrame.java openjdk/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TSFrame.java
    4945. 

  4945. --- openjdk.orig/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TSFrame.java	1970-01-01 01:00:00.000000000 +0100
    4946. 

  4946. +++ openjdk/jdk/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TSFrame.java	2011-02-16 01:27:25.016325311 +0000
    4947. 

  4947. @@ -0,0 +1,306 @@
    4948. 

  4948. +/*
    4949. 

  4949. + * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
    4950. 

  4950. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    4951. 

  4951. + *
    4952. 

  4952. + * This code is free software; you can redistribute it and/or modify it
    4953. 

  4953. + * under the terms of the GNU General Public License version 2 only, as
    4954. 

  4954. + * published by the Free Software Foundation.  Oracle designates this
    4955. 

  4955. + * particular file as subject to the "Classpath" exception as provided
    4956. 

  4956. + * by Oracle in the LICENSE file that accompanied this code.
    4957. 

  4957. + *
    4958. 

  4958. + * This code is distributed in the hope that it will be useful, but WITHOUT
    4959. 

  4959. + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4960. 

  4960. + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    4961. 

  4961. + * version 2 for more details (a copy is included in the LICENSE file that
    4962. 

  4962. + * accompanied this code).
    4963. 

  4963. + *
    4964. 

  4964. + * You should have received a copy of the GNU General Public License version
    4965. 

  4965. + * 2 along with this work; if not, write to the Free Software Foundation,
    4966. 

  4966. + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4967. 

  4967. + *
    4968. 

  4968. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4969. 

  4969. + * or visit www.oracle.com if you need additional information or have any
    4970. 

  4970. + * questions.
    4971. 

  4971. + */
    4972. 

  4972. +
    4973. 

  4973. +import com.sun.awt.AWTUtilities;
    4974. 

  4974. +import static com.sun.awt.AWTUtilities.Translucency.*;
    4975. 

  4975. +import java.awt.BorderLayout;
    4976. 

  4976. +import java.awt.Color;
    4977. 

  4977. +import java.awt.Dimension;
    4978. 

  4978. +import java.awt.Frame;
    4979. 

  4979. +import java.awt.Graphics;
    4980. 

  4980. +import java.awt.GraphicsConfiguration;
    4981. 

  4981. +import java.awt.GraphicsEnvironment;
    4982. 

  4982. +import java.awt.RenderingHints;
    4983. 

  4983. +import java.awt.event.MouseAdapter;
    4984. 

  4984. +import java.awt.event.MouseEvent;
    4985. 

  4985. +import java.awt.event.WindowAdapter;
    4986. 

  4986. +import java.awt.event.WindowEvent;
    4987. 

  4987. +import java.awt.Canvas;
    4988. 

  4988. +import java.awt.Component;
    4989. 

  4989. +import java.awt.GradientPaint;
    4990. 

  4990. +import java.awt.Graphics2D;
    4991. 

  4991. +import java.awt.Paint;
    4992. 

  4992. +import java.util.Random;
    4993. 

  4993. +import java.awt.geom.Ellipse2D;
    4994. 

  4994. +import javax.swing.JApplet;
    4995. 

  4995. +import javax.swing.JButton;
    4996. 

  4996. +import javax.swing.JComponent;
    4997. 

  4997. +import javax.swing.JFrame;
    4998. 

  4998. +import javax.swing.JPanel;
    4999. 

  4999. +import javax.swing.SwingUtilities;
    5000. 

  5000. +
    5001. 

  5001. +public class TSFrame {
    5002. 

  5002. +
    5003. 

  5003. +    static volatile boolean done = false;
    5004. 

  5004. +
    5005. 

  5005. +    static final boolean useSwing = System.getProperty("useswing") != null;
    5006. 

  5006. +    static final boolean useShape = System.getProperty("useshape") != null;
    5007. 

  5007. +    static final boolean useTransl = System.getProperty("usetransl") != null;
    5008. 

  5008. +    static final boolean useNonOpaque = System.getProperty("usenonop") != null;
    5009. 

  5009. +
    5010. 

  5010. +    static final Random rnd = new Random();
    5011. 

  5011. +    private static void render(Graphics g, int w, int h, boolean useNonOpaque) {
    5012. 

  5012. +        if (useNonOpaque) {
    5013. 

  5013. +            Graphics2D g2d = (Graphics2D)g;
    5014. 

  5014. +            GradientPaint p =
    5015. 

  5015. +                new GradientPaint(0.0f, 0.0f,
    5016. 

  5016. +                                  new Color(rnd.nextInt(0xffffff)),
    5017. 

  5017. +                                  w, h,
    5018. 

  5018. +                                  new Color(rnd.nextInt(0xff),
    5019. 

  5019. +                                            rnd.nextInt(0xff),
    5020. 

  5020. +                                            rnd.nextInt(0xff), 0),
    5021. 

  5021. +                                  true);
    5022. 

  5022. +            g2d.setPaint(p);
    5023. 

  5023. +            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
    5024. 

  5024. +                                 RenderingHints.VALUE_ANTIALIAS_ON);
    5025. 

  5025. +            g2d.fillOval(0, 0, w, h);
    5026. 

  5026. +        } else {
    5027. 

  5027. +            g.setColor(new Color(rnd.nextInt(0xffffff)));
    5028. 

  5028. +            g.fillRect(0, 0, w, h);
    5029. 

  5029. +        }
    5030. 

  5030. +    }
    5031. 

  5031. +
    5032. 

  5032. +    private static class MyCanvas extends Canvas {
    5033. 

  5033. +        @Override
    5034. 

  5034. +        public void paint(Graphics g) {
    5035. 

  5035. +            render(g, getWidth(), getHeight(), false);
    5036. 

  5036. +        }
    5037. 

  5037. +        @Override
    5038. 

  5038. +        public Dimension getPreferredSize() {
    5039. 

  5039. +            return new Dimension(200, 100);
    5040. 

  5040. +        }
    5041. 

  5041. +    }
    5042. 

  5042. +    private static class NonOpaqueJFrame extends JFrame {
    5043. 

  5043. +        NonOpaqueJFrame(GraphicsConfiguration gc) {
    5044. 

  5044. +            super("NonOpaque Swing JFrame", gc);
    5045. 

  5045. +            JPanel p = new JPanel() {
    5046. 

  5046. +                public void paintComponent(Graphics g) {
    5047. 

  5047. +                    super.paintComponent(g);
    5048. 

  5048. +                    render(g, getWidth(), getHeight(), true);
    5049. 

  5049. +                    g.setColor(Color.red);
    5050. 

  5050. +                    g.drawString("Non-Opaque Swing JFrame", 10, 15);
    5051. 

  5051. +                }
    5052. 

  5052. +            };
    5053. 

  5053. +            p.setDoubleBuffered(false);
    5054. 

  5054. +            p.setOpaque(false);
    5055. 

  5055. +            add(p);
    5056. 

  5056. +            setUndecorated(true);
    5057. 

  5057. +        }
    5058. 

  5058. +    }
    5059. 

  5059. +    private static class NonOpaqueJAppletFrame extends JFrame {
    5060. 

  5060. +        JPanel p;
    5061. 

  5061. +        NonOpaqueJAppletFrame(GraphicsConfiguration gc) {
    5062. 

  5062. +            super("NonOpaque Swing JAppletFrame", gc);
    5063. 

  5063. +            JApplet ja = new JApplet() {
    5064. 

  5064. +                public void paint(Graphics g) {
    5065. 

  5065. +                    super.paint(g);
    5066. 

  5066. +                    System.err.println("JAppletFrame paint called");
    5067. 

  5067. +                }
    5068. 

  5068. +            };
    5069. 

  5069. +            p = new JPanel() {
    5070. 

  5070. +                public void paintComponent(Graphics g) {
    5071. 

  5071. +                    super.paintComponent(g);
    5072. 

  5072. +                    render(g, getWidth(), getHeight(), true);
    5073. 

  5073. +                    g.setColor(Color.red);
    5074. 

  5074. +                    g.drawString("Non-Opaque Swing JFrame", 10, 15);
    5075. 

  5075. +                }
    5076. 

  5076. +            };
    5077. 

  5077. +            p.setDoubleBuffered(false);
    5078. 

  5078. +            p.setOpaque(false);
    5079. 

  5079. +            ja.add(p);
    5080. 

  5080. +            add(ja);
    5081. 

  5081. +            setUndecorated(true);
    5082. 

  5082. +        }
    5083. 

  5083. +    }
    5084. 

  5084. +    private static class NonOpaqueFrame extends Frame {
    5085. 

  5085. +        NonOpaqueFrame(GraphicsConfiguration gc) {
    5086. 

  5086. +            super("NonOpaque AWT Frame", gc);
    5087. 

  5087. +            // uncomment to test with hw child
    5088. 

  5088. +//            setLayout(null);
    5089. 

  5089. +//            Component c = new Panel() {
    5090. 

  5090. +//                public void paint(Graphics g) {
    5091. 

  5091. +//                    g.setColor(new Color(1.0f, 1.0f, 1.0f, 0.5f));
    5092. 

  5092. +//                    g.fillRect(0, 0, getWidth(), getHeight());
    5093. 

  5093. +//                }
    5094. 

  5094. +//            };
    5095. 

  5095. +//            c.setSize(100, 100);
    5096. 

  5096. +//            c.setBackground(Color.red);
    5097. 

  5097. +//            c.setForeground(Color.red);
    5098. 

  5098. +//            add(c);
    5099. 

  5099. +//            c.setLocation(130, 130);
    5100. 

  5100. +        }
    5101. 

  5101. +        @Override
    5102. 

  5102. +        public void paint(Graphics g) {
    5103. 

  5103. +            render(g, getWidth(), getHeight(), true);
    5104. 

  5104. +            g.setColor(Color.red);
    5105. 

  5105. +            g.drawString("Non-Opaque AWT Frame", 10, 15);
    5106. 

  5106. +        }
    5107. 

  5107. +    }
    5108. 

  5108. +
    5109. 

  5109. +    private static class MyJPanel extends JPanel {
    5110. 

  5110. +        @Override
    5111. 

  5111. +        public void paintComponent(Graphics g) {
    5112. 

  5112. +            render(g, getWidth(), getHeight(), false);
    5113. 

  5113. +        }
    5114. 

  5114. +    }
    5115. 

  5115. +
    5116. 

  5116. +    public static Frame createGui(GraphicsConfiguration gc,
    5117. 

  5117. +                                  final boolean useSwing,
    5118. 

  5118. +                                  final boolean useShape,
    5119. 

  5119. +                                  final boolean useTransl,
    5120. 

  5120. +                                  final boolean useNonOpaque,
    5121. 

  5121. +                                  final float factor)
    5122. 

  5122. +    {
    5123. 

  5123. +        Frame frame;
    5124. 

  5124. +        done = false;
    5125. 

  5125. +
    5126. 

  5126. +        if (gc == null) {
    5127. 

  5127. +            gc = GraphicsEnvironment.getLocalGraphicsEnvironment().
    5128. 

  5128. +                    getDefaultScreenDevice().getDefaultConfiguration();
    5129. 

  5129. +        }
    5130. 

  5130. +
    5131. 

  5131. +        if (useNonOpaque) {
    5132. 

  5132. +            if (useSwing) {
    5133. 

  5133. +                frame = new NonOpaqueJFrame(gc);
    5134. 

  5134. +//                frame = new NonOpaqueJAppletFrame(gc);
    5135. 

  5135. +            } else {
    5136. 

  5136. +                frame = new NonOpaqueFrame(gc);
    5137. 

  5137. +            }
    5138. 

  5138. +            animateComponent(frame);
    5139. 

  5139. +        } else if (useSwing) {
    5140. 

  5140. +            frame = new JFrame("Swing Frame", gc);
    5141. 

  5141. +            JComponent p = new JButton("Swing!");
    5142. 

  5142. +            p.setPreferredSize(new Dimension(200, 100));
    5143. 

  5143. +            frame.add("North", p);
    5144. 

  5144. +            p = new MyJPanel();
    5145. 

  5145. +            animateComponent(p);
    5146. 

  5146. +            frame.add("Center", p);
    5147. 

  5147. +        } else {
    5148. 

  5148. +            frame = new Frame("AWT Frame", gc) {
    5149. 

  5149. +                public void paint(Graphics g) {
    5150. 

  5150. +                    g.setColor(Color.red);
    5151. 

  5151. +                    g.fillRect(0, 0, 100, 100);
    5152. 

  5152. +                }
    5153. 

  5153. +            };
    5154. 

  5154. +            frame.setLayout(new BorderLayout());
    5155. 

  5155. +            Canvas c = new MyCanvas();
    5156. 

  5156. +            frame.add("North", c);
    5157. 

  5157. +            animateComponent(c);
    5158. 

  5158. +            c = new MyCanvas();
    5159. 

  5159. +            frame.add("Center", c);
    5160. 

  5160. +            animateComponent(c);
    5161. 

  5161. +            c = new MyCanvas();
    5162. 

  5162. +            frame.add("South", c);
    5163. 

  5163. +            animateComponent(c);
    5164. 

  5164. +        }
    5165. 

  5165. +        final Frame finalFrame = frame;
    5166. 

  5166. +        frame.addWindowListener(new WindowAdapter() {
    5167. 

  5167. +            @Override
    5168. 

  5168. +            public void windowClosing(WindowEvent e) {
    5169. 

  5169. +                finalFrame.dispose();
    5170. 

  5170. +                done = true;
    5171. 

  5171. +            }
    5172. 

  5172. +        });
    5173. 

  5173. +        frame.addMouseListener(new MouseAdapter() {
    5174. 

  5174. +            @Override
    5175. 

  5175. +            public void mouseClicked(MouseEvent e) {
    5176. 

  5176. +                finalFrame.dispose();
    5177. 

  5177. +                done = true;
    5178. 

  5178. +            }
    5179. 

  5179. +        });
    5180. 

  5180. +        frame.setPreferredSize(new Dimension(800, 600));
    5181. 

  5181. +
    5182. 

  5182. +        if (useShape) {
    5183. 

  5183. +            frame.setUndecorated(true);
    5184. 

  5184. +        }
    5185. 

  5185. +
    5186. 

  5186. +        frame.setLocation(450, 10);
    5187. 

  5187. +        frame.pack();
    5188. 

  5188. +
    5189. 

  5189. +        if (useShape) {
    5190. 

  5190. +            if (AWTUtilities.isTranslucencySupported(PERPIXEL_TRANSPARENT)) {
    5191. 

  5191. +                System.out.println("applying PERPIXEL_TRANSPARENT");
    5192. 

  5192. +                AWTUtilities.setWindowShape(frame,
    5193. 

  5193. +                    new Ellipse2D.Double(0, 0, frame.getWidth(),
    5194. 

  5194. +                                               frame.getHeight()/3));
    5195. 

  5195. +                frame.setTitle("PERPIXEL_TRANSPARENT");
    5196. 

  5196. +            } else {
    5197. 

  5197. +                System.out.println("Passed: PERPIXEL_TRANSPARENT unsupported");
    5198. 

  5198. +            }
    5199. 

  5199. +        }
    5200. 

  5200. +        if (useTransl) {
    5201. 

  5201. +            if (AWTUtilities.isTranslucencySupported(TRANSLUCENT)) {
    5202. 

  5202. +                System.out.println("applying TRANSLUCENT");
    5203. 

  5203. +                AWTUtilities.setWindowOpacity(frame, factor);
    5204. 

  5204. +                frame.setTitle("TRANSLUCENT");
    5205. 

  5205. +            } else {
    5206. 

  5206. +                System.out.println("Passed: TRANSLUCENT unsupported");
    5207. 

  5207. +            }
    5208. 

  5208. +        }
    5209. 

  5209. +        if (useNonOpaque) {
    5210. 

  5210. +            if (AWTUtilities.isTranslucencySupported(PERPIXEL_TRANSLUCENT) &&
    5211. 

  5211. +                AWTUtilities.isTranslucencyCapable(gc))
    5212. 

  5212. +            {
    5213. 

  5213. +                System.out.println("applying PERPIXEL_TRANSLUCENT");
    5214. 

  5214. +                AWTUtilities.setWindowOpaque(frame, false);
    5215. 

  5215. +                frame.setTitle("PERPIXEL_TRANSLUCENT");
    5216. 

  5216. +            } else {
    5217. 

  5217. +                System.out.println("Passed: PERPIXEL_TRANSLUCENT unsupported");
    5218. 

  5218. +            }
    5219. 

  5219. +        }
    5220. 

  5220. +        frame.setVisible(true);
    5221. 

  5221. +        return frame;
    5222. 

  5222. +    }
    5223. 

  5223. +
    5224. 

  5224. +    public static void stopThreads() {
    5225. 

  5225. +        done = true;
    5226. 

  5226. +    }
    5227. 

  5227. +
    5228. 

  5228. +    private static void animateComponent(final Component comp) {
    5229. 

  5229. +        Thread t = new Thread(new Runnable() {
    5230. 

  5230. +            public void run() {
    5231. 

  5231. +                do {
    5232. 

  5232. +                    try {
    5233. 

  5233. +                        Thread.sleep(50);
    5234. 

  5234. +                    } catch (InterruptedException ex) {}
    5235. 

  5235. +                    comp.repaint();
    5236. 

  5236. +                } while (!done);
    5237. 

  5237. +            }
    5238. 

  5238. +        });
    5239. 

  5239. +        t.start();
    5240. 

  5240. +    }
    5241. 

  5241. +
    5242. 

  5242. +    public static void main(String[] args) throws Exception {
    5243. 

  5243. +        SwingUtilities.invokeLater(new Runnable() {
    5244. 

  5244. +            public void run() {
    5245. 

  5245. +                TSFrame.createGui(null, useSwing,
    5246. 

  5246. +                                  useShape,
    5247. 

  5247. +                                  useTransl,
    5248. 

  5248. +                                  useNonOpaque,
    5249. 

  5249. +                                  0.7f);
    5250. 

  5250. +            }
    5251. 

  5251. +        });
    5252. 

  5252. +    }
    5253. 

  5253. +}
    5254. 

  5254. diff -Nru openjdk.orig/jdk/test/com/sun/awt/Translucency/WindowOpacity.java openjdk/jdk/test/com/sun/awt/Translucency/WindowOpacity.java
    5255. 

  5255. --- openjdk.orig/jdk/test/com/sun/awt/Translucency/WindowOpacity.java	1970-01-01 01:00:00.000000000 +0100
    5256. 

  5256. +++ openjdk/jdk/test/com/sun/awt/Translucency/WindowOpacity.java	2011-02-16 01:27:25.016325311 +0000
    5257. 

  5257. @@ -0,0 +1,461 @@
    5258. 

  5258. +/*
    5259. 

  5259. + * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
    5260. 

  5260. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    5261. 

  5261. + *
    5262. 

  5262. + * This code is free software; you can redistribute it and/or modify it
    5263. 

  5263. + * under the terms of the GNU General Public License version 2 only, as
    5264. 

  5264. + * published by the Free Software Foundation.
    5265. 

  5265. + *
    5266. 

  5266. + * This code is distributed in the hope that it will be useful, but WITHOUT
    5267. 

  5267. + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    5268. 

  5268. + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    5269. 

  5269. + * version 2 for more details (a copy is included in the LICENSE file that
    5270. 

  5270. + * accompanied this code).
    5271. 

  5271. + *
    5272. 

  5272. + * You should have received a copy of the GNU General Public License version
    5273. 

  5273. + * 2 along with this work; if not, write to the Free Software Foundation,
    5274. 

  5274. + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    5275. 

  5275. + *
    5276. 

  5276. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    5277. 

  5277. + * or visit www.oracle.com if you need additional information or have any
    5278. 

  5278. + * questions.
    5279. 

  5279. + */
    5280. 

  5280. +
    5281. 

  5281. +/*
    5282. 

  5282. +  @test %W% %E%
    5283. 

  5283. +  @bug 6594131
    5284. 

  5284. +  @summary Tests the AWTUtilities.get/setWindowOpacity() methods
    5285. 

  5285. +  @author anthony.petrov@...: area=awt.toplevel
    5286. 

  5286. +  @run main WindowOpacity
    5287. 

  5287. +*/
    5288. 

  5288. +
    5289. 

  5289. +import java.awt.*;
    5290. 

  5290. +import java.awt.event.*;
    5291. 

  5291. +
    5292. 

  5292. +import com.sun.awt.AWTUtilities;
    5293. 

  5293. +import sun.awt.SunToolkit;
    5294. 

  5294. +
    5295. 

  5295. +public class WindowOpacity
    5296. 

  5296. +{
    5297. 

  5297. +    //*** test-writer defined static variables go here ***
    5298. 

  5298. +
    5299. 

  5299. +    private static void realSync() {
    5300. 

  5300. +        ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
    5301. 

  5301. +    }
    5302. 

  5302. +
    5303. 

  5303. +
    5304. 

  5304. +    private static void init()
    5305. 

  5305. +    {
    5306. 

  5306. +        //*** Create instructions for the user here ***
    5307. 

  5307. +        String[] instructions =
    5308. 

  5308. +        {
    5309. 

  5309. +            "This is an AUTOMATIC test, simply wait until it is done.",
    5310. 

  5310. +            "The result (passed or failed) will be shown in the",
    5311. 

  5311. +            "message window below."
    5312. 

  5312. +        };
    5313. 

  5313. +        Sysout.createDialog( );
    5314. 

  5314. +        Sysout.printInstructions( instructions );
    5315. 

  5315. +
    5316. 

  5316. +        if (!AWTUtilities.isTranslucencySupported(AWTUtilities.Translucency.TRANSLUCENT)) {
    5317. 

  5317. +            System.out.println("Either the Toolkit or the native system does not support controlling the window opacity level.");
    5318. 

  5318. +            pass();
    5319. 

  5319. +        }
    5320. 

  5320. +
    5321. 

  5321. +        boolean passed;
    5322. 

  5322. +
    5323. 

  5323. +        Frame f = new Frame("Opacity test");
    5324. 

  5324. +
    5325. 

  5325. +        passed = false;
    5326. 

  5326. +        try {
    5327. 

  5327. +            AWTUtilities.getWindowOpacity(null);
    5328. 

  5328. +        } catch (NullPointerException e) {
    5329. 

  5329. +            passed = true;
    5330. 

  5330. +        }
    5331. 

  5331. +        if (!passed) {
    5332. 

  5332. +            fail("getWindowOpacity() allows passing null.");
    5333. 

  5333. +        }
    5334. 

  5334. +
    5335. 

  5335. +
    5336. 

  5336. +        passed = false;
    5337. 

  5337. +        try {
    5338. 

  5338. +            AWTUtilities.setWindowOpacity(null, 0.5f);
    5339. 

  5339. +        } catch (NullPointerException e) {
    5340. 

  5340. +            passed = true;
    5341. 

  5341. +        }
    5342. 

  5342. +        if (!passed) {
    5343. 

  5343. +            fail("setWindowOpacity() allows passing null.");
    5344. 

  5344. +        }
    5345. 

  5345. +
    5346. 

  5346. +
    5347. 

  5347. +        float curOpacity = AWTUtilities.getWindowOpacity(f);
    5348. 

  5348. +        if (curOpacity < 1.0f || curOpacity > 1.0f) {
    5349. 

  5349. +            fail("getWindowOpacity() reports the initial opacity level other than 1.0: " + curOpacity);
    5350. 

  5350. +        }
    5351. 

  5351. +
    5352. 

  5352. +
    5353. 

  5353. +
    5354. 

  5354. +        passed = false;
    5355. 

  5355. +        try {
    5356. 

  5356. +            AWTUtilities.setWindowOpacity(f, -0.5f);
    5357. 

  5357. +        } catch (IllegalArgumentException e) {
    5358. 

  5358. +            passed = true;
    5359. 

  5359. +        }
    5360. 

  5360. +        if (!passed) {
    5361. 

  5361. +            fail("setWindowOpacity() allows passing negative opacity level.");
    5362. 

  5362. +        }
    5363. 

  5363. +
    5364. 

  5364. +
    5365. 

  5365. +
    5366. 

  5366. +        passed = false;
    5367. 

  5367. +        try {
    5368. 

  5368. +            AWTUtilities.setWindowOpacity(f, 1.5f);
    5369. 

  5369. +        } catch (IllegalArgumentException e) {
    5370. 

  5370. +            passed = true;
    5371. 

  5371. +        }
    5372. 

  5372. +        if (!passed) {
    5373. 

  5373. +            fail("setWindowOpacity() allows passing opacity level greater than 1.0.");
    5374. 

  5374. +        }
    5375. 

  5375. +
    5376. 

  5376. +
    5377. 

  5377. +        AWTUtilities.setWindowOpacity(f, 0.5f);
    5378. 

  5378. +
    5379. 

  5379. +        curOpacity = AWTUtilities.getWindowOpacity(f);
    5380. 

  5380. +        if (curOpacity < 0.5f || curOpacity > 0.5f) {
    5381. 

  5381. +            fail("getWindowOpacity() reports the opacity level that differs from the value set with setWindowOpacity: " + curOpacity);
    5382. 

  5382. +        }
    5383. 

  5383. +
    5384. 

  5384. +
    5385. 

  5385. +        AWTUtilities.setWindowOpacity(f, 0.75f);
    5386. 

  5386. +
    5387. 

  5387. +        curOpacity = AWTUtilities.getWindowOpacity(f);
    5388. 

  5388. +        if (curOpacity < 0.75f || curOpacity > 0.75f) {
    5389. 

  5389. +            fail("getWindowOpacity() reports the opacity level that differs from the value set with setWindowOpacity the second time: " + curOpacity);
    5390. 

  5390. +        }
    5391. 

  5391. +
    5392. 

  5392. +
    5393. 

  5393. +        f.setBounds(100, 100, 300, 200);
    5394. 

  5394. +        f.setVisible(true);
    5395. 

  5395. +
    5396. 

  5396. +        realSync();
    5397. 

  5397. +
    5398. 

  5398. +        curOpacity = AWTUtilities.getWindowOpacity(f);
    5399. 

  5399. +        if (curOpacity < 0.75f || curOpacity > 0.75f) {
    5400. 

  5400. +            fail("getWindowOpacity() reports the opacity level that differs from the value set with setWindowOpacity before showing the frame: " + curOpacity);
    5401. 

  5401. +        }
    5402. 

  5402. +
    5403. 

  5403. +
    5404. 

  5404. +
    5405. 

  5405. +        AWTUtilities.setWindowOpacity(f, 0.5f);
    5406. 

  5406. +        realSync();
    5407. 

  5407. +
    5408. 

  5408. +        curOpacity = AWTUtilities.getWindowOpacity(f);
    5409. 

  5409. +        if (curOpacity < 0.5f || curOpacity > 0.5f) {
    5410. 

  5410. +            fail("getWindowOpacity() reports the opacity level that differs from the value set with setWindowOpacity after showing the frame: " + curOpacity);
    5411. 

  5411. +        }
    5412. 

  5412. +
    5413. 

  5413. +        WindowOpacity.pass();
    5414. 

  5414. +
    5415. 

  5415. +    }//End  init()
    5416. 

  5416. +
    5417. 

  5417. +
    5418. 

  5418. +
    5419. 

  5419. +    /*****************************************************
    5420. 

  5420. +     * Standard Test Machinery Section
    5421. 

  5421. +     * DO NOT modify anything in this section -- it's a
    5422. 

  5422. +     * standard chunk of code which has all of the
    5423. 

  5423. +     * synchronisation necessary for the test harness.
    5424. 

  5424. +     * By keeping it the same in all tests, it is easier
    5425. 

  5425. +     * to read and understand someone else's test, as
    5426. 

  5426. +     * well as insuring that all tests behave correctly
    5427. 

  5427. +     * with the test harness.
    5428. 

  5428. +     * There is a section following this for test-
    5429. 

  5429. +     * classes
    5430. 

  5430. +     ******************************************************/
    5431. 

  5431. +    private static boolean theTestPassed = false;
    5432. 

  5432. +    private static boolean testGeneratedInterrupt = false;
    5433. 

  5433. +    private static String failureMessage = "";
    5434. 

  5434. +
    5435. 

  5435. +    private static Thread mainThread = null;
    5436. 

  5436. +
    5437. 

  5437. +    private static int sleepTime = 300000;
    5438. 

  5438. +
    5439. 

  5439. +    // Not sure about what happens if multiple of this test are
    5440. 

  5440. +    //  instantiated in the same VM.  Being static (and using
    5441. 

  5441. +    //  static vars), it aint gonna work.  Not worrying about
    5442. 

  5442. +    //  it for now.
    5443. 

  5443. +    public static void main( String args[] ) throws InterruptedException
    5444. 

  5444. +    {
    5445. 

  5445. +        mainThread = Thread.currentThread();
    5446. 

  5446. +        try
    5447. 

  5447. +        {
    5448. 

  5448. +            init();
    5449. 

  5449. +        }
    5450. 

  5450. +        catch( TestPassedException e )
    5451. 

  5451. +        {
    5452. 

  5452. +            //The test passed, so just return from main and harness will
    5453. 

  5453. +            // interepret this return as a pass
    5454. 

  5454. +            return;
    5455. 

  5455. +        }
    5456. 

  5456. +        //At this point, neither test pass nor test fail has been
    5457. 

  5457. +        // called -- either would have thrown an exception and ended the
    5458. 

  5458. +        // test, so we know we have multiple threads.
    5459. 

  5459. +
    5460. 

  5460. +        //Test involves other threads, so sleep and wait for them to
    5461. 

  5461. +        // called pass() or fail()
    5462. 

  5462. +        try
    5463. 

  5463. +        {
    5464. 

  5464. +            Thread.sleep( sleepTime );
    5465. 

  5465. +            //Timed out, so fail the test
    5466. 

  5466. +            throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
    5467. 

  5467. +        }
    5468. 

  5468. +        catch (InterruptedException e)
    5469. 

  5469. +        {
    5470. 

  5470. +            //The test harness may have interrupted the test.  If so, rethrow the exception
    5471. 

  5471. +            // so that the harness gets it and deals with it.
    5472. 

  5472. +            if( ! testGeneratedInterrupt ) throw e;
    5473. 

  5473. +
    5474. 

  5474. +            //reset flag in case hit this code more than once for some reason (just safety)
    5475. 

  5475. +            testGeneratedInterrupt = false;
    5476. 

  5476. +
    5477. 

  5477. +            if ( theTestPassed == false )
    5478. 

  5478. +            {
    5479. 

  5479. +                throw new RuntimeException( failureMessage );
    5480. 

  5480. +            }
    5481. 

  5481. +        }
    5482. 

  5482. +
    5483. 

  5483. +    }//main
    5484. 

  5484. +
    5485. 

  5485. +    public static synchronized void setTimeoutTo( int seconds )
    5486. 

  5486. +    {
    5487. 

  5487. +        sleepTime = seconds * 1000;
    5488. 

  5488. +    }
    5489. 

  5489. +
    5490. 

  5490. +    public static synchronized void pass()
    5491. 

  5491. +    {
    5492. 

  5492. +        Sysout.println( "The test passed." );
    5493. 

  5493. +        Sysout.println( "The test is over, hit  Ctl-C to stop Java VM" );
    5494. 

  5494. +        //first check if this is executing in main thread
    5495. 

  5495. +        if ( mainThread == Thread.currentThread() )
    5496. 

  5496. +        {
    5497. 

  5497. +            //Still in the main thread, so set the flag just for kicks,
    5498. 

  5498. +            // and throw a test passed exception which will be caught
    5499. 

  5499. +            // and end the test.
    5500. 

  5500. +            theTestPassed = true;
    5501. 

  5501. +            throw new TestPassedException();
    5502. 

  5502. +        }
    5503. 

  5503. +        theTestPassed = true;
    5504. 

  5504. +        testGeneratedInterrupt = true;
    5505. 

  5505. +        mainThread.interrupt();
    5506. 

  5506. +    }//pass()
    5507. 

  5507. +
    5508. 

  5508. +    public static synchronized void fail()
    5509. 

  5509. +    {
    5510. 

  5510. +        //test writer didn't specify why test failed, so give generic
    5511. 

  5511. +        fail( "it just plain failed! :-)" );
    5512. 

  5512. +    }
    5513. 

  5513. +
    5514. 

  5514. +    public static synchronized void fail( String whyFailed )
    5515. 

  5515. +    {
    5516. 

  5516. +        Sysout.println( "The test failed: " + whyFailed );
    5517. 

  5517. +        Sysout.println( "The test is over, hit  Ctl-C to stop Java VM" );
    5518. 

  5518. +        //check if this called from main thread
    5519. 

  5519. +        if ( mainThread == Thread.currentThread() )
    5520. 

  5520. +        {
    5521. 

  5521. +            //If main thread, fail now 'cause not sleeping
    5522. 

  5522. +            throw new RuntimeException( whyFailed );
    5523. 

  5523. +        }
    5524. 

  5524. +        theTestPassed = false;
    5525. 

  5525. +        testGeneratedInterrupt = true;
    5526. 

  5526. +        failureMessage = whyFailed;
    5527. 

  5527. +        mainThread.interrupt();
    5528. 

  5528. +    }//fail()
    5529. 

  5529. +
    5530. 

  5530. +}// class WindowOpacity
    5531. 

  5531. +
    5532. 

  5532. +//This exception is used to exit from any level of call nesting
    5533. 

  5533. +// when it's determined that the test has passed, and immediately
    5534. 

  5534. +// end the test.
    5535. 

  5535. +class TestPassedException extends RuntimeException
    5536. 

  5536. +{
    5537. 

  5537. +}
    5538. 

  5538. +
    5539. 

  5539. +//*********** End Standard Test Machinery Section **********
    5540. 

  5540. +
    5541. 

  5541. +
    5542. 

  5542. +//************ Begin classes defined for the test ****************
    5543. 

  5543. +
    5544. 

  5544. +// if want to make listeners, here is the recommended place for them, then instantiate
    5545. 

  5545. +//  them in init()
    5546. 

  5546. +
    5547. 

  5547. +/* Example of a class which may be written as part of a test
    5548. 

  5548. +class NewClass implements anInterface
    5549. 

  5549. + {
    5550. 

  5550. +   static int newVar = 0;
    5551. 

  5551. +
    5552. 

  5552. +   public void eventDispatched(AWTEvent e)
    5553. 

  5553. +    {
    5554. 

  5554. +      //Counting events to see if we get enough
    5555. 

  5555. +      eventCount++;
    5556. 

  5556. +
    5557. 

  5557. +      if( eventCount == 20 )
    5558. 

  5558. +       {
    5559. 

  5559. +         //got enough events, so pass
    5560. 

  5560. +
    5561. 

  5561. +         WindowOpacity.pass();
    5562. 

  5562. +       }
    5563. 

  5563. +      else if( tries == 20 )
    5564. 

  5564. +       {
    5565. 

  5565. +         //tried too many times without getting enough events so fail
    5566. 

  5566. +
    5567. 

  5567. +         WindowOpacity.fail();
    5568. 

  5568. +       }
    5569. 

  5569. +
    5570. 

  5570. +    }// eventDispatched()
    5571. 

  5571. +
    5572. 

  5572. + }// NewClass class
    5573. 

  5573. +
    5574. 

  5574. +*/
    5575. 

  5575. +
    5576. 

  5576. +
    5577. 

  5577. +//************** End classes defined for the test *******************
    5578. 

  5578. +
    5579. 

  5579. +
    5580. 

  5580. +
    5581. 

  5581. +
    5582. 

  5582. +/****************************************************
    5583. 

  5583. + Standard Test Machinery
    5584. 

  5584. + DO NOT modify anything below -- it's a standard
    5585. 

  5585. +  chunk of code whose purpose is to make user
    5586. 

  5586. +  interaction uniform, and thereby make it simpler
    5587. 

  5587. +  to read and understand someone else's test.
    5588. 

  5588. + ****************************************************/
    5589. 

  5589. +
    5590. 

  5590. +/**
    5591. 

  5591. + This is part of the standard test machinery.
    5592. 

  5592. + It creates a dialog (with the instructions), and is the interface
    5593. 

  5593. +  for sending text messages to the user.
    5594. 

  5594. + To print the instructions, send an array of strings to Sysout.createDialog
    5595. 

  5595. +  WithInstructions method.  Put one line of instructions per array entry.
    5596. 

  5596. + To display a message for the tester to see, simply call Sysout.println
    5597. 

  5597. +  with the string to be displayed.
    5598. 

  5598. + This mimics System.out.println but works within the test harness as well
    5599. 

  5599. +  as standalone.
    5600. 

  5600. + */
    5601. 

  5601. +
    5602. 

  5602. +class Sysout
    5603. 

  5603. +{
    5604. 

  5604. +    private static TestDialog dialog;
    5605. 

  5605. +
    5606. 

  5606. +    public static void createDialogWithInstructions( String[] instructions )
    5607. 

  5607. +    {
    5608. 

  5608. +        dialog = new TestDialog( new Frame(), "Instructions" );
    5609. 

  5609. +        dialog.printInstructions( instructions );
    5610. 

  5610. +        dialog.setVisible(true);
    5611. 

  5611. +        println( "Any messages for the tester will display here." );
    5612. 

  5612. +    }
    5613. 

  5613. +
    5614. 

  5614. +    public static void createDialog( )
    5615. 

  5615. +    {
    5616. 

  5616. +        dialog = new TestDialog( new Frame(), "Instructions" );
    5617. 

  5617. +        String[] defInstr = { "Instructions will appear here. ", "" } ;
    5618. 

  5618. +        dialog.printInstructions( defInstr );
    5619. 

  5619. +        dialog.setVisible(true);
    5620. 

  5620. +        println( "Any messages for the tester will display here." );
    5621. 

  5621. +    }
    5622. 

  5622. +
    5623. 

  5623. +
    5624. 

  5624. +    public static void printInstructions( String[] instructions )
    5625. 

  5625. +    {
    5626. 

  5626. +        dialog.printInstructions( instructions );
    5627. 

  5627. +    }
    5628. 

  5628. +
    5629. 

  5629. +
    5630. 

  5630. +    public static void println( String messageIn )
    5631. 

  5631. +    {
    5632. 

  5632. +        dialog.displayMessage( messageIn );
    5633. 

  5633. +        System.out.println(messageIn);
    5634. 

  5634. +    }
    5635. 

  5635. +
    5636. 

  5636. +}// Sysout  class
    5637. 

  5637. +
    5638. 

  5638. +/**
    5639. 

  5639. +  This is part of the standard test machinery.  It provides a place for the
    5640. 

  5640. +   test instructions to be displayed, and a place for interactive messages
    5641. 

  5641. +   to the user to be displayed.
    5642. 

  5642. +  To have the test instructions displayed, see Sysout.
    5643. 

  5643. +  To have a message to the user be displayed, see Sysout.
    5644. 

  5644. +  Do not call anything in this dialog directly.
    5645. 

  5645. +  */
    5646. 

  5646. +class TestDialog extends Dialog
    5647. 

  5647. +{
    5648. 

  5648. +
    5649. 

  5649. +    TextArea instructionsText;
    5650. 

  5650. +    TextArea messageText;
    5651. 

  5651. +    int maxStringLength = 80;
    5652. 

  5652. +
    5653. 

  5653. +    //DO NOT call this directly, go through Sysout
    5654. 

  5654. +    public TestDialog( Frame frame, String name )
    5655. 

  5655. +    {
    5656. 

  5656. +        super( frame, name );
    5657. 

  5657. +        int scrollBoth = TextArea.SCROLLBARS_BOTH;
    5658. 

  5658. +        instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
    5659. 

  5659. +        add( "North", instructionsText );
    5660. 

  5660. +
    5661. 

  5661. +        messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
    5662. 

  5662. +        add("Center", messageText);
    5663. 

  5663. +
    5664. 

  5664. +        pack();
    5665. 

  5665. +
    5666. 

  5666. +        setVisible(true);
    5667. 

  5667. +    }// TestDialog()
    5668. 

  5668. +
    5669. 

  5669. +    //DO NOT call this directly, go through Sysout
    5670. 

  5670. +    public void printInstructions( String[] instructions )
    5671. 

  5671. +    {
    5672. 

  5672. +        //Clear out any current instructions
    5673. 

  5673. +        instructionsText.setText( "" );
    5674. 

  5674. +
    5675. 

  5675. +        //Go down array of instruction strings
    5676. 

  5676. +
    5677. 

  5677. +        String printStr, remainingStr;
    5678. 

  5678. +        for( int i=0; i < instructions.length; i++ )
    5679. 

  5679. +        {
    5680. 

  5680. +            //chop up each into pieces maxSringLength long
    5681. 

  5681. +            remainingStr = instructions[ i ];
    5682. 

  5682. +            while( remainingStr.length() > 0 )
    5683. 

  5683. +            {
    5684. 

  5684. +                //if longer than max then chop off first max chars to print
    5685. 

  5685. +                if( remainingStr.length() >= maxStringLength )
    5686. 

  5686. +                {
    5687. 

  5687. +                    //Try to chop on a word boundary
    5688. 

  5688. +                    int posOfSpace = remainingStr.
    5689. 

  5689. +                        lastIndexOf( ' ', maxStringLength - 1 );
    5690. 

  5690. +
    5691. 

  5691. +                    if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
    5692. 

  5692. +
    5693. 

  5693. +                    printStr = remainingStr.substring( 0, posOfSpace + 1 );
    5694. 

  5694. +                    remainingStr = remainingStr.substring( posOfSpace + 1 );
    5695. 

  5695. +                }
    5696. 

  5696. +                //else just print
    5697. 

  5697. +                else
    5698. 

  5698. +                {
    5699. 

  5699. +                    printStr = remainingStr;
    5700. 

  5700. +                    remainingStr = "";
    5701. 

  5701. +                }
    5702. 

  5702. +
    5703. 

  5703. +                instructionsText.append( printStr + "\n" );
    5704. 

  5704. +
    5705. 

  5705. +            }// while
    5706. 

  5706. +
    5707. 

  5707. +        }// for
    5708. 

  5708. +
    5709. 

  5709. +    }//printInstructions()
    5710. 

  5710. +
    5711. 

  5711. +    //DO NOT call this directly, go through Sysout
    5712. 

  5712. +    public void displayMessage( String messageIn )
    5713. 

  5713. +    {
    5714. 

  5714. +        messageText.append( messageIn + "\n" );
    5715. 

  5715. +        System.out.println(messageIn);
    5716. 

  5716. +    }
    5717. 

  5717. +
    5718. 

  5718. +}// TestDialog  class
    5719. 

  5719. diff -Nru openjdk.orig/jdk/test/sun/java2d/pipe/RegionOps.java openjdk/jdk/test/sun/java2d/pipe/RegionOps.java
    5720. 

  5720. --- openjdk.orig/jdk/test/sun/java2d/pipe/RegionOps.java	1970-01-01 01:00:00.000000000 +0100
    5721. 

  5721. +++ openjdk/jdk/test/sun/java2d/pipe/RegionOps.java	2011-02-16 01:27:25.016325311 +0000
    5722. 

  5722. @@ -0,0 +1,533 @@
    5723. 

  5723. +/*
    5724. 

  5724. + * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
    5725. 

  5725. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    5726. 

  5726. + *
    5727. 

  5727. + * This code is free software; you can redistribute it and/or modify it
    5728. 

  5728. + * under the terms of the GNU General Public License version 2 only, as
    5729. 

  5729. + * published by the Free Software Foundation.
    5730. 

  5730. + *
    5731. 

  5731. + * This code is distributed in the hope that it will be useful, but WITHOUT
    5732. 

  5732. + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    5733. 

  5733. + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    5734. 

  5734. + * version 2 for more details (a copy is included in the LICENSE file that
    5735. 

  5735. + * accompanied this code).
    5736. 

  5736. + *
    5737. 

  5737. + * You should have received a copy of the GNU General Public License version
    5738. 

  5738. + * 2 along with this work; if not, write to the Free Software Foundation,
    5739. 

  5739. + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    5740. 

  5740. + *
    5741. 

  5741. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    5742. 

  5742. + * or visit www.oracle.com if you need additional information or have any
    5743. 

  5743. + * questions.
    5744. 

  5744. + */
    5745. 

  5745. +
    5746. 

  5746. +/*
    5747. 

  5747. + * @test %W% %E%
    5748. 

  5748. + * @bug 6504874
    5749. 

  5749. + * @summary This test verifies the operation (and performance) of the
    5750. 

  5750. + *          various CAG operations on the internal Region class.
    5751. 

  5751. + * @run main RegionOps
    5752. 

  5752. + */
    5753. 

  5753. +
    5754. 

  5754. +import java.awt.Rectangle;
    5755. 

  5755. +import java.awt.geom.Area;
    5756. 

  5756. +import java.awt.geom.AffineTransform;
    5757. 

  5757. +import java.awt.image.BufferedImage;
    5758. 

  5758. +import java.util.Random;
    5759. 

  5759. +import sun.java2d.pipe.Region;
    5760. 

  5760. +
    5761. 

  5761. +public class RegionOps {
    5762. 

  5762. +    public static final int DEFAULT_NUMREGIONS = 50;
    5763. 

  5763. +    public static final int DEFAULT_MINSUBRECTS = 1;
    5764. 

  5764. +    public static final int DEFAULT_MAXSUBRECTS = 10;
    5765. 

  5765. +
    5766. 

  5766. +    public static final int MINCOORD = -20;
    5767. 

  5767. +    public static final int MAXCOORD = 20;
    5768. 

  5768. +
    5769. 

  5769. +    public static boolean useArea;
    5770. 

  5770. +
    5771. 

  5771. +    static int numops;
    5772. 

  5772. +    static int numErrors;
    5773. 

  5773. +    static Random rand = new Random();
    5774. 

  5774. +    static boolean skipCheck;
    5775. 

  5775. +    static boolean countErrors;
    5776. 

  5776. +
    5777. 

  5777. +    static {
    5778. 

  5778. +        // Instantiating BufferedImage initializes sun.java2d
    5779. 

  5779. +        BufferedImage bimg =
    5780. 

  5780. +            new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
    5781. 

  5781. +    }
    5782. 

  5782. +
    5783. 

  5783. +    public static void usage(String error) {
    5784. 

  5784. +        if (error != null) {
    5785. 

  5785. +            System.err.println("Error: "+error);
    5786. 

  5786. +        }
    5787. 

  5787. +        System.err.println("Usage: java RegionOps "+
    5788. 

  5788. +                           "[-regions N] [-rects M] "+
    5789. 

  5789. +                           "[-[min|max]rects M] [-area]");
    5790. 

  5790. +        System.err.println("                      "+
    5791. 

  5791. +                           "[-add|union] [-sub|diff] "+
    5792. 

  5792. +                           "[-int[ersect]] [-xor]");
    5793. 

  5793. +        System.err.println("                      "+
    5794. 

  5794. +                           "[-seed S] [-nocheck] [-count[errors]] [-help]");
    5795. 

  5795. +        System.exit((error != null) ? 1 : 0);
    5796. 

  5796. +    }
    5797. 

  5797. +
    5798. 

  5798. +    public static void error(RectListImpl a, RectListImpl b, String problem) {
    5799. 

  5799. +        System.err.println("Operating on:  "+a);
    5800. 

  5800. +        if (b != null) {
    5801. 

  5801. +            System.err.println("and:  "+b);
    5802. 

  5802. +        }
    5803. 

  5803. +        if (countErrors) {
    5804. 

  5804. +            System.err.println(problem);
    5805. 

  5805. +            numErrors++;
    5806. 

  5806. +        } else {
    5807. 

  5807. +            throw new RuntimeException(problem);
    5808. 

  5808. +        }
    5809. 

  5809. +    }
    5810. 

  5810. +
    5811. 

  5811. +    public static void main(String argv[]) {
    5812. 

  5812. +        int numregions = DEFAULT_NUMREGIONS;
    5813. 

  5813. +        int minsubrects = DEFAULT_MINSUBRECTS;
    5814. 

  5814. +        int maxsubrects = DEFAULT_MAXSUBRECTS;
    5815. 

  5815. +        boolean doUnion = false;
    5816. 

  5816. +        boolean doIntersect = false;
    5817. 

  5817. +        boolean doSubtract = false;
    5818. 

  5818. +        boolean doXor = false;
    5819. 

  5819. +
    5820. 

  5820. +        for (int i = 0; i < argv.length; i++) {
    5821. 

  5821. +            String arg = argv[i];
    5822. 

  5822. +            if (arg.equalsIgnoreCase("-regions")) {
    5823. 

  5823. +                if (i+1 >= argv.length) {
    5824. 

  5824. +                    usage("missing arg for -regions");
    5825. 

  5825. +                }
    5826. 

  5826. +                numregions = Integer.parseInt(argv[++i]);
    5827. 

  5827. +            } else if (arg.equalsIgnoreCase("-rects")) {
    5828. 

  5828. +                if (i+1 >= argv.length) {
    5829. 

  5829. +                    usage("missing arg for -rects");
    5830. 

  5830. +                }
    5831. 

  5831. +                minsubrects = maxsubrects = Integer.parseInt(argv[++i]);
    5832. 

  5832. +            } else if (arg.equalsIgnoreCase("-minrects")) {
    5833. 

  5833. +                if (i+1 >= argv.length) {
    5834. 

  5834. +                    usage("missing arg for -minrects");
    5835. 

  5835. +                }
    5836. 

  5836. +                minsubrects = Integer.parseInt(argv[++i]);
    5837. 

  5837. +            } else if (arg.equalsIgnoreCase("-maxrects")) {
    5838. 

  5838. +                if (i+1 >= argv.length) {
    5839. 

  5839. +                    usage("missing arg for -maxrects");
    5840. 

  5840. +                }
    5841. 

  5841. +                maxsubrects = Integer.parseInt(argv[++i]);
    5842. 

  5842. +            } else if (arg.equalsIgnoreCase("-area")) {
    5843. 

  5843. +                useArea = true;
    5844. 

  5844. +            } else if (arg.equalsIgnoreCase("-add") ||
    5845. 

  5845. +                       arg.equalsIgnoreCase("-union"))
    5846. 

  5846. +            {
    5847. 

  5847. +                doUnion = true;
    5848. 

  5848. +            } else if (arg.equalsIgnoreCase("-sub") ||
    5849. 

  5849. +                       arg.equalsIgnoreCase("-diff"))
    5850. 

  5850. +            {
    5851. 

  5851. +                doSubtract = true;
    5852. 

  5852. +            } else if (arg.equalsIgnoreCase("-int") ||
    5853. 

  5853. +                       arg.equalsIgnoreCase("-intersect"))
    5854. 

  5854. +            {
    5855. 

  5855. +                doIntersect = true;
    5856. 

  5856. +            } else if (arg.equalsIgnoreCase("-xor")) {
    5857. 

  5857. +                doXor = true;
    5858. 

  5858. +            } else if (arg.equalsIgnoreCase("-seed")) {
    5859. 

  5859. +                if (i+1 >= argv.length) {
    5860. 

  5860. +                    usage("missing arg for -seed");
    5861. 

  5861. +                }
    5862. 

  5862. +                rand.setSeed(Long.decode(argv[++i]).longValue());
    5863. 

  5863. +            } else if (arg.equalsIgnoreCase("-nocheck")) {
    5864. 

  5864. +                skipCheck = true;
    5865. 

  5865. +            } else if (arg.equalsIgnoreCase("-count") ||
    5866. 

  5866. +                       arg.equalsIgnoreCase("-counterrors"))
    5867. 

  5867. +            {
    5868. 

  5868. +                countErrors = true;
    5869. 

  5869. +            } else if (arg.equalsIgnoreCase("-help")) {
    5870. 

  5870. +                usage(null);
    5871. 

  5871. +            } else {
    5872. 

  5872. +                usage("Unknown argument: "+arg);
    5873. 

  5873. +            }
    5874. 

  5874. +        }
    5875. 

  5875. +
    5876. 

  5876. +        if (maxsubrects < minsubrects) {
    5877. 

  5877. +            usage("maximum number of subrectangles less than minimum");
    5878. 

  5878. +        }
    5879. 

  5879. +
    5880. 

  5880. +        if (minsubrects <= 0) {
    5881. 

  5881. +            usage("minimum number of subrectangles must be positive");
    5882. 

  5882. +        }
    5883. 

  5883. +
    5884. 

  5884. +        if (!doUnion && !doSubtract && !doIntersect && !doXor) {
    5885. 

  5885. +            doUnion = doSubtract = doIntersect = doXor = true;
    5886. 

  5886. +        }
    5887. 

  5887. +
    5888. 

  5888. +        long start = System.currentTimeMillis();
    5889. 

  5889. +        RectListImpl rlist[] = new RectListImpl[numregions];
    5890. 

  5890. +        int totalrects = 0;
    5891. 

  5891. +        for (int i = 0; i < rlist.length; i++) {
    5892. 

  5892. +            RectListImpl rli = RectListImpl.getInstance();
    5893. 

  5893. +            int numsubrects =
    5894. 

  5894. +                minsubrects + rand.nextInt(maxsubrects - minsubrects + 1);
    5895. 

  5895. +            for (int j = 0; j < numsubrects; j++) {
    5896. 

  5896. +                addRectTo(rli);
    5897. 

  5897. +                totalrects++;
    5898. 

  5898. +            }
    5899. 

  5899. +            rlist[i] = rli;
    5900. 

  5900. +        }
    5901. 

  5901. +        long end = System.currentTimeMillis();
    5902. 

  5902. +        System.out.println((end-start)+"ms to create "+
    5903. 

  5903. +                           rlist.length+" regions containing "+
    5904. 

  5904. +                           totalrects+" subrectangles");
    5905. 

  5905. +
    5906. 

  5906. +        start = System.currentTimeMillis();
    5907. 

  5907. +        for (int i = 0; i < rlist.length; i++) {
    5908. 

  5908. +            RectListImpl a = rlist[i];
    5909. 

  5909. +            testTranslate(a);
    5910. 

  5910. +            for (int j = i; j < rlist.length; j++) {
    5911. 

  5911. +                RectListImpl b = rlist[j];
    5912. 

  5912. +                if (doUnion) testUnion(a, b);
    5913. 

  5913. +                if (doSubtract) testDifference(a, b);
    5914. 

  5914. +                if (doIntersect) testIntersection(a, b);
    5915. 

  5915. +                if (doXor) testExclusiveOr(a, b);
    5916. 

  5916. +            }
    5917. 

  5917. +        }
    5918. 

  5918. +        end = System.currentTimeMillis();
    5919. 

  5919. +        System.out.println(numops+" ops took "+(end-start)+"ms");
    5920. 

  5920. +
    5921. 

  5921. +        if (numErrors > 0) {
    5922. 

  5922. +            throw new RuntimeException(numErrors+" errors encountered");
    5923. 

  5923. +        }
    5924. 

  5924. +    }
    5925. 

  5925. +
    5926. 

  5926. +    public static void addRectTo(RectListImpl rli) {
    5927. 

  5927. +        int lox = MINCOORD + rand.nextInt(MAXCOORD - MINCOORD + 1);
    5928. 

  5928. +        int hix = MINCOORD + rand.nextInt(MAXCOORD - MINCOORD + 1);
    5929. 

  5929. +        int loy = MINCOORD + rand.nextInt(MAXCOORD - MINCOORD + 1);
    5930. 

  5930. +        int hiy = MINCOORD + rand.nextInt(MAXCOORD - MINCOORD + 1);
    5931. 

  5931. +        rli.addRect(lox, loy, hix, hiy);
    5932. 

  5932. +    }
    5933. 

  5933. +
    5934. 

  5934. +    public static void checkEqual(RectListImpl a, RectListImpl b,
    5935. 

  5935. +                                  String optype)
    5936. 

  5936. +    {
    5937. 

  5937. +        if (a.hashCode() != b.hashCode()) {
    5938. 

  5938. +            error(a, b, "hashcode failed for "+optype);
    5939. 

  5939. +        }
    5940. 

  5940. +        if (!a.equals(b)) {
    5941. 

  5941. +            error(a, b, "equals failed for "+optype);
    5942. 

  5942. +        }
    5943. 

  5943. +    }
    5944. 

  5944. +
    5945. 

  5945. +    public static void testTranslate(RectListImpl a) {
    5946. 

  5946. +        RectListImpl maxTrans =
    5947. 

  5947. +            a.getTranslation(Integer.MAX_VALUE, Integer.MAX_VALUE)
    5948. 

  5948. +            .getTranslation(Integer.MAX_VALUE, Integer.MAX_VALUE)
    5949. 

  5949. +            .getTranslation(Integer.MAX_VALUE, Integer.MAX_VALUE);
    5950. 

  5950. +        if (!maxTrans.checkTransEmpty()) {
    5951. 

  5951. +            error(maxTrans, null, "overflow translated RectList not empty");
    5952. 

  5952. +        }
    5953. 

  5953. +        RectListImpl minTrans =
    5954. 

  5954. +            a.getTranslation(Integer.MIN_VALUE, Integer.MIN_VALUE)
    5955. 

  5955. +            .getTranslation(Integer.MIN_VALUE, Integer.MIN_VALUE)
    5956. 

  5956. +            .getTranslation(Integer.MIN_VALUE, Integer.MIN_VALUE);
    5957. 

  5957. +        if (!minTrans.checkTransEmpty()) {
    5958. 

  5958. +            error(minTrans, null, "overflow translated RectList not empty");
    5959. 

  5959. +        }
    5960. 

  5960. +        testTranslate(a, Integer.MAX_VALUE, Integer.MAX_VALUE, false,
    5961. 

  5961. +                      MINCOORD, 0, MINCOORD, 0);
    5962. 

  5962. +        testTranslate(a, Integer.MAX_VALUE, Integer.MIN_VALUE, false,
    5963. 

  5963. +                      MINCOORD, 0, 0, MAXCOORD);
    5964. 

  5964. +        testTranslate(a, Integer.MIN_VALUE, Integer.MAX_VALUE, false,
    5965. 

  5965. +                      0, MAXCOORD, MINCOORD, 0);
    5966. 

  5966. +        testTranslate(a, Integer.MIN_VALUE, Integer.MIN_VALUE, false,
    5967. 

  5967. +                      0, MAXCOORD, 0, MAXCOORD);
    5968. 

  5968. +        for (int dy = -100; dy <= 100; dy += 50) {
    5969. 

  5969. +            for (int dx = -100; dx <= 100; dx += 50) {
    5970. 

  5970. +                testTranslate(a, dx, dy, true,
    5971. 

  5971. +                              MINCOORD, MAXCOORD,
    5972. 

  5972. +                              MINCOORD, MAXCOORD);
    5973. 

  5973. +            }
    5974. 

  5974. +        }
    5975. 

  5975. +    }
    5976. 

  5976. +
    5977. 

  5977. +    public static void testTranslate(RectListImpl a, int dx, int dy,
    5978. 

  5978. +                                     boolean isNonDestructive,
    5979. 

  5979. +                                     int xmin, int xmax,
    5980. 

  5980. +                                     int ymin, int ymax)
    5981. 

  5981. +    {
    5982. 

  5982. +        RectListImpl theTrans = a.getTranslation(dx, dy); numops++;
    5983. 

  5983. +        if (skipCheck) return;
    5984. 

  5984. +        RectListImpl unTrans = theTrans.getTranslation(-dx, -dy);
    5985. 

  5985. +        if (isNonDestructive) checkEqual(a, unTrans, "Translate");
    5986. 

  5986. +        for (int x = xmin; x < xmax; x++) {
    5987. 

  5987. +            for (int y = ymin; y < ymax; y++) {
    5988. 

  5988. +                boolean inside = a.contains(x, y);
    5989. 

  5989. +                if (theTrans.contains(x+dx, y+dy) != inside) {
    5990. 

  5990. +                    error(a, null, "translation failed for "+
    5991. 

  5991. +                          dx+", "+dy+" at "+x+", "+y);
    5992. 

  5992. +                }
    5993. 

  5993. +            }
    5994. 

  5994. +        }
    5995. 

  5995. +    }
    5996. 

  5996. +
    5997. 

  5997. +    public static void testUnion(RectListImpl a, RectListImpl b) {
    5998. 

  5998. +        RectListImpl aUb = a.getUnion(b); numops++;
    5999. 

  5999. +        RectListImpl bUa = b.getUnion(a); numops++;
    6000. 

  6000. +        if (skipCheck) return;
    6001. 

  6001. +        checkEqual(aUb, bUa, "Union");
    6002. 

  6002. +        testUnion(a, b, aUb);
    6003. 

  6003. +        testUnion(a, b, bUa);
    6004. 

  6004. +    }
    6005. 

  6005. +
    6006. 

  6006. +    public static void testUnion(RectListImpl a, RectListImpl b,
    6007. 

  6007. +                                 RectListImpl theUnion)
    6008. 

  6008. +    {
    6009. 

  6009. +        for (int x = MINCOORD; x < MAXCOORD; x++) {
    6010. 

  6010. +            for (int y = MINCOORD; y < MAXCOORD; y++) {
    6011. 

  6011. +                boolean inside = (a.contains(x, y) || b.contains(x, y));
    6012. 

  6012. +                if (theUnion.contains(x, y) != inside) {
    6013. 

  6013. +                    error(a, b, "union failed at "+x+", "+y);
    6014. 

  6014. +                }
    6015. 

  6015. +            }
    6016. 

  6016. +        }
    6017. 

  6017. +    }
    6018. 

  6018. +
    6019. 

  6019. +    public static void testDifference(RectListImpl a, RectListImpl b) {
    6020. 

  6020. +        RectListImpl aDb = a.getDifference(b); numops++;
    6021. 

  6021. +        RectListImpl bDa = b.getDifference(a); numops++;
    6022. 

  6022. +        if (skipCheck) return;
    6023. 

  6023. +        // Note that difference is not commutative so we cannot check equals
    6024. 

  6024. +        // checkEqual(a, b, "Difference");
    6025. 

  6025. +        testDifference(a, b, aDb);
    6026. 

  6026. +        testDifference(b, a, bDa);
    6027. 

  6027. +    }
    6028. 

  6028. +
    6029. 

  6029. +    public static void testDifference(RectListImpl a, RectListImpl b,
    6030. 

  6030. +                                      RectListImpl theDifference)
    6031. 

  6031. +    {
    6032. 

  6032. +        for (int x = MINCOORD; x < MAXCOORD; x++) {
    6033. 

  6033. +            for (int y = MINCOORD; y < MAXCOORD; y++) {
    6034. 

  6034. +                boolean inside = (a.contains(x, y) && !b.contains(x, y));
    6035. 

  6035. +                if (theDifference.contains(x, y) != inside) {
    6036. 

  6036. +                    error(a, b, "difference failed at "+x+", "+y);
    6037. 

  6037. +                }
    6038. 

  6038. +            }
    6039. 

  6039. +        }
    6040. 

  6040. +    }
    6041. 

  6041. +
    6042. 

  6042. +    public static void testIntersection(RectListImpl a, RectListImpl b) {
    6043. 

  6043. +        RectListImpl aIb = a.getIntersection(b); numops++;
    6044. 

  6044. +        RectListImpl bIa = b.getIntersection(a); numops++;
    6045. 

  6045. +        if (skipCheck) return;
    6046. 

  6046. +        checkEqual(aIb, bIa, "Intersection");
    6047. 

  6047. +        testIntersection(a, b, aIb);
    6048. 

  6048. +        testIntersection(a, b, bIa);
    6049. 

  6049. +    }
    6050. 

  6050. +
    6051. 

  6051. +    public static void testIntersection(RectListImpl a, RectListImpl b,
    6052. 

  6052. +                                        RectListImpl theIntersection)
    6053. 

  6053. +    {
    6054. 

  6054. +        for (int x = MINCOORD; x < MAXCOORD; x++) {
    6055. 

  6055. +            for (int y = MINCOORD; y < MAXCOORD; y++) {
    6056. 

  6056. +                boolean inside = (a.contains(x, y) && b.contains(x, y));
    6057. 

  6057. +                if (theIntersection.contains(x, y) != inside) {
    6058. 

  6058. +                    error(a, b, "intersection failed at "+x+", "+y);
    6059. 

  6059. +                }
    6060. 

  6060. +            }
    6061. 

  6061. +        }
    6062. 

  6062. +    }
    6063. 

  6063. +
    6064. 

  6064. +    public static void testExclusiveOr(RectListImpl a, RectListImpl b) {
    6065. 

  6065. +        RectListImpl aXb = a.getExclusiveOr(b); numops++;
    6066. 

  6066. +        RectListImpl bXa = b.getExclusiveOr(a); numops++;
    6067. 

  6067. +        if (skipCheck) return;
    6068. 

  6068. +        checkEqual(aXb, bXa, "ExclusiveOr");
    6069. 

  6069. +        testExclusiveOr(a, b, aXb);
    6070. 

  6070. +        testExclusiveOr(a, b, bXa);
    6071. 

  6071. +    }
    6072. 

  6072. +
    6073. 

  6073. +    public static void testExclusiveOr(RectListImpl a, RectListImpl b,
    6074. 

  6074. +                                       RectListImpl theExclusiveOr)
    6075. 

  6075. +    {
    6076. 

  6076. +        for (int x = MINCOORD; x < MAXCOORD; x++) {
    6077. 

  6077. +            for (int y = MINCOORD; y < MAXCOORD; y++) {
    6078. 

  6078. +                boolean inside = (a.contains(x, y) != b.contains(x, y));
    6079. 

  6079. +                if (theExclusiveOr.contains(x, y) != inside) {
    6080. 

  6080. +                    error(a, b, "xor failed at "+x+", "+y);
    6081. 

  6081. +                }
    6082. 

  6082. +            }
    6083. 

  6083. +        }
    6084. 

  6084. +    }
    6085. 

  6085. +
    6086. 

  6086. +    public abstract static class RectListImpl {
    6087. 

  6087. +        public static RectListImpl getInstance() {
    6088. 

  6088. +            if (useArea) {
    6089. 

  6089. +                return new AreaImpl();
    6090. 

  6090. +            } else {
    6091. 

  6091. +                return new RegionImpl();
    6092. 

  6092. +            }
    6093. 

  6093. +        }
    6094. 

  6094. +
    6095. 

  6095. +        public abstract void addRect(int lox, int loy, int hix, int hiy);
    6096. 

  6096. +
    6097. 

  6097. +        public abstract RectListImpl getTranslation(int dx, int dy);
    6098. 

  6098. +
    6099. 

  6099. +        public abstract RectListImpl getIntersection(RectListImpl rli);
    6100. 

  6100. +        public abstract RectListImpl getExclusiveOr(RectListImpl rli);
    6101. 

  6101. +        public abstract RectListImpl getDifference(RectListImpl rli);
    6102. 

  6102. +        public abstract RectListImpl getUnion(RectListImpl rli);
    6103. 

  6103. +
    6104. 

  6104. +        // Used for making sure that 3xMAX translates yields an empty region
    6105. 

  6105. +        public abstract boolean checkTransEmpty();
    6106. 

  6106. +
    6107. 

  6107. +        public abstract boolean contains(int x, int y);
    6108. 

  6108. +
    6109. 

  6109. +        public abstract int hashCode();
    6110. 

  6110. +        public abstract boolean equals(RectListImpl other);
    6111. 

  6111. +    }
    6112. 

  6112. +
    6113. 

  6113. +    public static class AreaImpl extends RectListImpl {
    6114. 

  6114. +        Area theArea;
    6115. 

  6115. +
    6116. 

  6116. +        public AreaImpl() {
    6117. 

  6117. +        }
    6118. 

  6118. +
    6119. 

  6119. +        public AreaImpl(Area a) {
    6120. 

  6120. +            theArea = a;
    6121. 

  6121. +        }
    6122. 

  6122. +
    6123. 

  6123. +        public void addRect(int lox, int loy, int hix, int hiy) {
    6124. 

  6124. +            Area a2 = new Area(new Rectangle(lox, loy, hix-lox, hiy-loy));
    6125. 

  6125. +            if (theArea == null) {
    6126. 

  6126. +                theArea = a2;
    6127. 

  6127. +            } else {
    6128. 

  6128. +                theArea.add(a2);
    6129. 

  6129. +            }
    6130. 

  6130. +        }
    6131. 

  6131. +
    6132. 

  6132. +        public RectListImpl getTranslation(int dx, int dy) {
    6133. 

  6133. +            AffineTransform at = AffineTransform.getTranslateInstance(dx, dy);
    6134. 

  6134. +            return new AreaImpl(theArea.createTransformedArea(at));
    6135. 

  6135. +        }
    6136. 

  6136. +
    6137. 

  6137. +        public RectListImpl getIntersection(RectListImpl rli) {
    6138. 

  6138. +            Area a2 = new Area(theArea);
    6139. 

  6139. +            a2.intersect(((AreaImpl) rli).theArea);
    6140. 

  6140. +            return new AreaImpl(a2);
    6141. 

  6141. +        }
    6142. 

  6142. +
    6143. 

  6143. +        public RectListImpl getExclusiveOr(RectListImpl rli) {
    6144. 

  6144. +            Area a2 = new Area(theArea);
    6145. 

  6145. +            a2.exclusiveOr(((AreaImpl) rli).theArea);
    6146. 

  6146. +            return new AreaImpl(a2);
    6147. 

  6147. +        }
    6148. 

  6148. +
    6149. 

  6149. +        public RectListImpl getDifference(RectListImpl rli) {
    6150. 

  6150. +            Area a2 = new Area(theArea);
    6151. 

  6151. +            a2.subtract(((AreaImpl) rli).theArea);
    6152. 

  6152. +            return new AreaImpl(a2);
    6153. 

  6153. +        }
    6154. 

  6154. +
    6155. 

  6155. +        public RectListImpl getUnion(RectListImpl rli) {
    6156. 

  6156. +            Area a2 = new Area(theArea);
    6157. 

  6157. +            a2.add(((AreaImpl) rli).theArea);
    6158. 

  6158. +            return new AreaImpl(a2);
    6159. 

  6159. +        }
    6160. 

  6160. +
    6161. 

  6161. +        // Used for making sure that 3xMAX translates yields an empty region
    6162. 

  6162. +        public boolean checkTransEmpty() {
    6163. 

  6163. +            // Area objects will actually survive 3 MAX translates so just
    6164. 

  6164. +            // pretend that it had the intended effect...
    6165. 

  6165. +            return true;
    6166. 

  6166. +        }
    6167. 

  6167. +
    6168. 

  6168. +        public boolean contains(int x, int y) {
    6169. 

  6169. +            return theArea.contains(x, y);
    6170. 

  6170. +        }
    6171. 

  6171. +
    6172. 

  6172. +        public int hashCode() {
    6173. 

  6173. +            // Area does not override hashCode...
    6174. 

  6174. +            return 0;
    6175. 

  6175. +        }
    6176. 

  6176. +
    6177. 

  6177. +        public boolean equals(RectListImpl other) {
    6178. 

  6178. +            return theArea.equals(((AreaImpl) other).theArea);
    6179. 

  6179. +        }
    6180. 

  6180. +
    6181. 

  6181. +        public String toString() {
    6182. 

  6182. +            return theArea.toString();
    6183. 

  6183. +        }
    6184. 

  6184. +    }
    6185. 

  6185. +
    6186. 

  6186. +    public static class RegionImpl extends RectListImpl {
    6187. 

  6187. +        Region theRegion;
    6188. 

  6188. +
    6189. 

  6189. +        public RegionImpl() {
    6190. 

  6190. +        }
    6191. 

  6191. +
    6192. 

  6192. +        public RegionImpl(Region r) {
    6193. 

  6193. +            theRegion = r;
    6194. 

  6194. +        }
    6195. 

  6195. +
    6196. 

  6196. +        public void addRect(int lox, int loy, int hix, int hiy) {
    6197. 

  6197. +            Region r2 = Region.getInstanceXYXY(lox, loy, hix, hiy);
    6198. 

  6198. +            if (theRegion == null) {
    6199. 

  6199. +                theRegion = r2;
    6200. 

  6200. +            } else {
    6201. 

  6201. +                theRegion = theRegion.getUnion(r2);
    6202. 

  6202. +            }
    6203. 

  6203. +        }
    6204. 

  6204. +
    6205. 

  6205. +        public RectListImpl getTranslation(int dx, int dy) {
    6206. 

  6206. +            return new RegionImpl(theRegion.getTranslatedRegion(dx, dy));
    6207. 

  6207. +        }
    6208. 

  6208. +
    6209. 

  6209. +        public RectListImpl getIntersection(RectListImpl rli) {
    6210. 

  6210. +            Region r2 = ((RegionImpl) rli).theRegion;
    6211. 

  6211. +            r2 = theRegion.getIntersection(r2);
    6212. 

  6212. +            return new RegionImpl(r2);
    6213. 

  6213. +        }
    6214. 

  6214. +
    6215. 

  6215. +        public RectListImpl getExclusiveOr(RectListImpl rli) {
    6216. 

  6216. +            Region r2 = ((RegionImpl) rli).theRegion;
    6217. 

  6217. +            r2 = theRegion.getExclusiveOr(r2);
    6218. 

  6218. +            return new RegionImpl(r2);
    6219. 

  6219. +        }
    6220. 

  6220. +
    6221. 

  6221. +        public RectListImpl getDifference(RectListImpl rli) {
    6222. 

  6222. +            Region r2 = ((RegionImpl) rli).theRegion;
    6223. 

  6223. +            r2 = theRegion.getDifference(r2);
    6224. 

  6224. +            return new RegionImpl(r2);
    6225. 

  6225. +        }
    6226. 

  6226. +
    6227. 

  6227. +        public RectListImpl getUnion(RectListImpl rli) {
    6228. 

  6228. +            Region r2 = ((RegionImpl) rli).theRegion;
    6229. 

  6229. +            r2 = theRegion.getUnion(r2);
    6230. 

  6230. +            return new RegionImpl(r2);
    6231. 

  6231. +        }
    6232. 

  6232. +
    6233. 

  6233. +        // Used for making sure that 3xMAX translates yields an empty region
    6234. 

  6234. +        public boolean checkTransEmpty() {
    6235. 

  6235. +            // Region objects should be empty after 3 MAX translates...
    6236. 

  6236. +            return theRegion.isEmpty();
    6237. 

  6237. +        }
    6238. 

  6238. +
    6239. 

  6239. +        public boolean contains(int x, int y) {
    6240. 

  6240. +            return theRegion.contains(x, y);
    6241. 

  6241. +        }
    6242. 

  6242. +
    6243. 

  6243. +        public int hashCode() {
    6244. 

  6244. +            return theRegion.hashCode();
    6245. 

  6245. +        }
    6246. 

  6246. +
    6247. 

  6247. +        public boolean equals(RectListImpl other) {
    6248. 

  6248. +            return theRegion.equals(((RegionImpl) other).theRegion);
    6249. 

  6249. +        }
    6250. 

  6250. +
    6251. 

  6251. +        public String toString() {
    6252. 

  6252. +            return theRegion.toString();
    6253. 

  6253. +        }
    6254. 

  6254. +    }
    6255. 

  6255. +}
    6256. 

  6256.