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

rev 8343 : 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
rev 8344 : [mq]: 8025673.jdk3

*** 451,470 ****
  
      /* 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
--- 451,467 ----
  
      /* patches/service packs installed */
      sprops.patch_level = "unknown";
  
      /* Java 2D/AWT properties */
  #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";
  
!     // check if we're in a GUI login session and set java.awt.headless=true if not
!     sprops.awt_headless = isInAquaSession() ? NULL : "true";
  #else
      sprops.graphics_env = "sun.awt.X11GraphicsEnvironment";
  #ifdef JAVASE_EMBEDDED
      sprops.awt_toolkit = getEmbeddedToolkit();
      if (sprops.awt_toolkit == NULL) // default as below