src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c

*** 41,51 ****
  #include <jni.h>
  #include <jni_util.h>
  #include <jvm.h>
  #include <jvm_md.h>
  #include <jlong.h>
! 
  #include <stdlib.h>
  
  #include "awt_GraphicsEnv.h"
  #include "awt_util.h"
  #include "gdefs.h"
--- 41,51 ----
  #include <jni.h>
  #include <jni_util.h>
  #include <jvm.h>
  #include <jvm_md.h>
  #include <jlong.h>
! #include "systemScale.h"
  #include <stdlib.h>
  
  #include "awt_GraphicsEnv.h"
  #include "awt_util.h"
  #include "gdefs.h"
*** 2081,2119 ****
  
  /**
   * End DisplayMode/FullScreen support
   */
  
- int getScale(const char *name) {
-     char *uiScale = getenv(name);
-     if (uiScale != NULL) {
-         double scale = strtod(uiScale, NULL);
-         if (errno == ERANGE || scale < 1) {
-             return -1;
-         }
-         return (int) scale;
-     }
-     return -1;
- }
  
  /*
   * Class:     sun_awt_X11GraphicsDevice
   * Method:    getNativeScaleFactor
   * Signature: (I)I
   */
  JNIEXPORT jint JNICALL
  Java_sun_awt_X11GraphicsDevice_getNativeScaleFactor
      (JNIEnv *env, jobject this, jint screen) {
  
!     // for debug purposes
!     static int scale = -2.0;
! 
!     if (scale == -2) {
!         scale = getScale("J2D_UISCALE");
!     }
! 
!     if (scale >= 1) {
!         return scale;
!     }
! 
!     return getScale("GDK_SCALE");
  }
--- 2081,2097 ----
  
  /**
   * End DisplayMode/FullScreen support
   */
  
  
  /*
   * Class:     sun_awt_X11GraphicsDevice
   * Method:    getNativeScaleFactor
   * Signature: (I)I
   */
  JNIEXPORT jint JNICALL
  Java_sun_awt_X11GraphicsDevice_getNativeScaleFactor
      (JNIEnv *env, jobject this, jint screen) {
  
!     return getNativeScaleFactor();
  }