src/solaris/native/java/lang/java_props_md.c

rev 8342 : 8025673: [macosx] Disable X11 AWT toolkit
Summary: Disable but not completely remove the XAWT and headless toolkits on Mac OS X
Reviewed-by:
Contributed-by: david.dehaven@oracle.com

*** 450,493 ****
  #endif
  
      /* patches/service packs installed */
      sprops.patch_level = "unknown";
  
!     /* Java 2D properties */
  #ifdef MACOSX
!     PreferredToolkit prefToolkit = getPreferredToolkit();
!     switch (prefToolkit) {
!         case CToolkit:
!         case HToolkit:
              sprops.graphics_env = "sun.awt.CGraphicsEnvironment";
!             break;
!         case XToolkit:
! #endif
!     sprops.graphics_env = "sun.awt.X11GraphicsEnvironment";
! #ifdef MACOSX
!             break;
      }
! #endif
!     /* AWT properties */
  #ifdef JAVASE_EMBEDDED
      sprops.awt_toolkit = getEmbeddedToolkit();
      if (sprops.awt_toolkit == NULL) // default as below
  #endif
- #ifdef MACOSX
-         switch (prefToolkit) {
-             case CToolkit:
-                 sprops.awt_toolkit = "sun.lwawt.macosx.LWCToolkit";
-                 break;
-             case XToolkit:
- #endif
      sprops.awt_toolkit = "sun.awt.X11.XToolkit";
- #ifdef MACOSX
-                 break;
-             default:
-                 sprops.awt_toolkit = "sun.awt.HToolkit";
-                 break;
-         }
  #endif
  
      /* This is used only for debugging of font problems. */
      v = getenv("JAVA2D_FONTPATH");
      sprops.font_dir = v ? v : NULL;
--- 450,477 ----
  #endif
  
      /* patches/service packs installed */
      sprops.patch_level = "unknown";
  
!     /* Java 2D/AWT properties */
!     sprops.awt_headless = NULL; // don't set this (to anything) by default
  #ifdef MACOSX
!     // Always the same GraphicsEnvironment and Toolkit on Mac OS X
      sprops.graphics_env = "sun.awt.CGraphicsEnvironment";
!     sprops.awt_toolkit = "sun.lwawt.macosx.LWCToolkit";
! 
!     PreferredToolkit prefToolkit = getPreferredToolkit();
!     if (prefToolkit == HToolkit) {
!         sprops.awt_headless = "true";
      }
! #else
!     sprops.graphics_env = "sun.awt.X11GraphicsEnvironment";
  #ifdef JAVASE_EMBEDDED
      sprops.awt_toolkit = getEmbeddedToolkit();
      if (sprops.awt_toolkit == NULL) // default as below
  #endif
      sprops.awt_toolkit = "sun.awt.X11.XToolkit";
  #endif
  
      /* This is used only for debugging of font problems. */
      v = getenv("JAVA2D_FONTPATH");
      sprops.font_dir = v ? v : NULL;