Merge branch 'new_fonts' of github.com:/JetBrains/JetBrainsRuntime into new_fonts

Updated the fonts to v0.20

README.md

@@ -43,7 +43,7 @@ $ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
 
 ## Linux (Ubuntu 18.10 desktop)
 ```
-$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev install libcups2-dev libfontconfig1-dev libasound2-dev 
+$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev 
 
 $ cd JetBrainsRuntime
 $ sh ./configure --disable-warnings-as-errors
@@ -54,7 +54,15 @@ $ make images
 #### TBD
 
 ## OSX
-#### TBD
+
+install Xcode console tools, autoconf (via homebrew)
+
+run
+
+```
+sh ./configure --prefix=$(pwd)/build  --disable-warnings-as-errors
+make images
+```
 
 ## Contribution
 We will be happy to receive your pull requests. Before you submit one, please sign our Contributor License Agreement (CLA)  https://www.jetbrains.com/agreements/cla/ 

jb/project/jdk-cmake/.gitignore

@@ -0,0 +1,2 @@
+.idea
+cmake-build-*

jb/project/tools/mac/scripts/entitlements.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>com.apple.security.cs.allow-jit</key>
+        <true/>
+        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+        <true/>
+        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+        <true/>
+        <key>com.apple.security.cs.disable-library-validation</key>
+        <true/>
+        <key>com.apple.security.cs.disable-executable-page-protection</key>
+        <true/>
+    </dict>
+</plist>

jb/project/tools/mac/scripts/notarize.sh

@@ -0,0 +1,120 @@
+#!/bin/bash
+
+APP_DIRECTORY=$1
+APPL_USER=$2
+APPL_PASSWORD=$3
+APP_NAME=$4
+BUNDLE_ID=$5
+FAKE_ROOT="${6:-fake-root}"
+
+if [[ -z "$APP_DIRECTORY" ]] || [[ -z "$APPL_USER" ]] || [[ -z "$APPL_PASSWORD" ]]; then
+  echo "Usage: $0 AppDirectory Username Password"
+  exit 1
+fi
+if [[ ! -d "$APP_DIRECTORY" ]]; then
+  echo "AppDirectory '$APP_DIRECTORY' does not exist or not a directory"
+  exit 1
+fi
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+function publish-log() {
+  id=$1
+  file=$2
+  curl -T "$file" "$ARTIFACTORY_URL/$id" || true
+}
+
+function altool-upload() {
+  # Since altool uses same file for upload token we have to trick it into using different folders for token file location
+  # Also it copies zip into TMPDIR so we override it too, to simplify cleanup
+  OLD_HOME="$HOME"
+  export HOME="$FAKE_ROOT/home"
+  export TMPDIR="$FAKE_ROOT/tmp"
+  mkdir -p "$HOME"
+  mkdir -p "$TMPDIR"
+  export _JAVA_OPTIONS="-Duser.home=$HOME -Djava.io.tmpdir=$TMPDIR"
+  # Reduce amount of downloads, cache transporter libraries
+  shared_itmstransporter="$OLD_HOME/shared-itmstransporter"
+  if [[ -f "$shared_itmstransporter" ]]; then
+    cp -r "$shared_itmstransporter" "$HOME/.itmstransporter"
+  fi
+  # For some reason altool prints everything to stderr, not stdout
+  set +e
+  xcrun altool --notarize-app \
+    --username "$APPL_USER" --password "$APPL_PASSWORD" \
+    --primary-bundle-id "$BUNDLE_ID" \
+    --asc-provider JetBrainssro --file "$1" 2>&1 | tee "altool.init.out"
+  unset TMPDIR
+  export HOME="$OLD_HOME"
+  set -e
+}
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+file="$APP_NAME.zip"
+
+log "Zipping $file..."
+rm -rf "$file"
+ditto -c -k --sequesterRsrc --keepParent "$APP_DIRECTORY/Contents" "$file"
+
+log "Notarizing $file..."
+rm -rf "altool.init.out" "altool.check.out"
+altool-upload "$file"
+
+rm -rf "$file"
+
+notarization_info="$(grep -e "RequestUUID" "altool.init.out" | grep -oE '([0-9a-f-]{36})')"
+
+if [ -z "$notarization_info" ]; then
+  log "Faile to read RequestUUID from altool.init.out"
+  exit 10
+fi
+
+PATH="$PATH:/usr/local/bin/"
+
+log "Notarization request sent, awaiting response"
+spent=0
+
+while true; do
+  # For some reason altool prints everything to stderr, not stdout
+  xcrun altool --username "$APPL_USER" --notarization-info "$notarization_info" --password "$APPL_PASSWORD" >"altool.check.out" 2>&1 || true
+  status="$(grep -oe 'Status: .*' "altool.check.out" | cut -c 9- || true)"
+  log "Current status: $status"
+  if [ "$status" = "invalid" ]; then
+    log "Notarization failed"
+    ec=1
+  elif [ "$status" = "success" ]; then
+    log "Notarization succeeded"
+    ec=0
+  else
+    if [ "$status" != "in progress" ]; then
+      log "Unknown notarization status, waiting more, altool output:"
+      cat "altool.check.out"
+    fi
+    if [[ $spent -gt 60 ]]; then
+      log "Waiting time out (apx 60 minutes)"
+      ec=2
+      break
+    fi
+    sleep 60
+    ((spent += 1))
+    continue
+  fi
+  developer_log="developer_log.json"
+  log "Fetching $developer_log"
+  # TODO: Replace cut with trim or something better
+  url="$(grep -oe 'LogFileURL: .*' "altool.check.out" | cut -c 13-)"
+  wget "$url" -O "$developer_log" && cat "$developer_log" || true
+  if [ $ec != 0 ]; then
+    log "Publishing $developer_log"
+    publish-log "$notarization_info" "$developer_log"
+  fi
+  break
+done
+cat "altool.check.out"
+
+rm -rf "altool.init.out" "altool.check.out"
+exit $ec

jb/project/tools/mac/scripts/sign.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+
+APP_DIRECTORY=$1
+JB_CERT=$2
+
+if [[ -z "$APP_DIRECTORY" ]] || [[ -z "$JB_CERT" ]]; then
+  echo "Usage: $0 AppDirectory CertificateID"
+  exit 1
+fi
+if [[ ! -d "$APP_DIRECTORY" ]]; then
+  echo "AppDirectory '$APP_DIRECTORY' does not exist or not a directory"
+  exit 1
+fi
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+# Cleanup files left from previous sign attempt (if any)
+find "$APP_DIRECTORY" -name '*.cstemp' -exec rm '{}' \;
+
+log "Signing libraries and executables..."
+# -perm +111 searches for executables
+for f in \
+   "Contents/Home/bin" \
+   "Contents/Home/lib"; do
+  if [ -d "$APP_DIRECTORY/$f" ]; then
+    find "$APP_DIRECTORY/$f" \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -perm +111 \) \
+      -exec codesign --timestamp \
+      -v -s "$JB_CERT" --options=runtime \
+      --entitlements entitlements.xml {} \;
+  fi
+done
+
+log "Signing libraries in jars in $PWD"
+
+# todo: add set -euo pipefail; into the inner sh -c
+# `-e` prevents `grep -q && printf` loginc
+# with `-o pipefail` there's no input for 'while' loop
+find "$APP_DIRECTORY" -name '*.jar' \
+  -exec sh -c "set -u; unzip -l \"\$0\" | grep -q -e '\.dylib\$' -e '\.jnilib\$' -e '\.so\$' -e '^jattach\$' && printf \"\$0\0\" " {} \; |
+  while IFS= read -r -d $'\0' file; do
+    log "Processing libraries in $file"
+
+    rm -rf jarfolder jar.jar
+    mkdir jarfolder
+    filename="${file##*/}"
+    log "Filename: $filename"
+    cp "$file" jarfolder && (cd jarfolder && jar xf "$filename" && rm "$filename")
+
+    find jarfolder \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "jattach" \) \
+      -exec codesign --timestamp \
+      -v -s "$JB_CERT" --options=runtime \
+      --entitlements entitlements.xml {} \;
+
+    (cd jarfolder; zip -q -r -o ../jar.jar .)
+    mv jar.jar "$file"
+  done
+
+rm -rf jarfolder jar.jar
+
+log "Signing other files..."
+for f in \
+  "Contents/MacOS"; do
+  if [ -d "$APP_DIRECTORY/$f" ]; then
+    find "$APP_DIRECTORY/$f" \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -perm +111 \) \
+      -exec codesign --timestamp \
+      -v -s "$JB_CERT" --options=runtime \
+      --entitlements entitlements.xml {} \;
+  fi
+done
+
+#log "Signing executable..."
+#codesign --timestamp \
+#    -v -s "$JB_CERT" --options=runtime \
+#    --force \
+#    --entitlements entitlements.xml "$APP_DIRECTORY/Contents/MacOS/idea"
+
+log "Signing whole app..."
+codesign --timestamp \
+  -v -s "$JB_CERT" --options=runtime \
+  --force \
+  --entitlements entitlements.xml "$APP_DIRECTORY"
+
+log "Verifying java is not broken"
+find "$APP_DIRECTORY" \
+  -type f -name 'java' -perm +111 -exec {} -version \;

jb/project/tools/mac/scripts/signapp.sh

@@ -0,0 +1,121 @@
+#!/bin/bash
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
+export COPYFILE_DISABLE=true
+
+INPUT_FILE=$1
+EXPLODED=$2.exploded
+USERNAME=$3
+PASSWORD=$4
+CODESIGN_STRING=$5
+NOTARIZE=$6
+BUNDLE_ID=$7
+
+cd "$(dirname "$0")"
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+log "Deleting $EXPLODED ..."
+if test -d "$EXPLODED"; then
+  find "$EXPLODED" -mindepth 1 -maxdepth 1 -exec chmod -R u+wx '{}' \;
+fi
+rm -rf "$EXPLODED"
+mkdir "$EXPLODED"
+
+log "Unzipping $INPUT_FILE to $EXPLODED ..."
+tar -xzvf "$INPUT_FILE" --directory $EXPLODED --exclude "jmods"
+rm "$INPUT_FILE"
+BUILD_NAME="$(ls "$EXPLODED")"
+#log "$INPUT_FILE unzipped and removed"
+log "$INPUT_FILE extracted and removed"
+
+APPLICATION_PATH="$EXPLODED/$BUILD_NAME"
+
+find "$APPLICATION_PATH/Contents/Home/bin" \
+  -maxdepth 1 -type f -name '*.jnilib' -print0 |
+  while IFS= read -r -d $'\0' file; do
+    if [ -f "$file" ]; then
+      log "Linking $file"
+      b="$(basename "$file" .jnilib)"
+      ln -sf "$b.jnilib" "$(dirname "$file")/$b.dylib"
+    fi
+  done
+
+find "$APPLICATION_PATH/Contents/" \
+  -maxdepth 1 -type f -name '*.txt' -print0 |
+  while IFS= read -r -d $'\0' file; do
+    if [ -f "$file" ]; then
+      log "Moving $file"
+      mv "$file" "$APPLICATION_PATH/Contents/Resources"
+    fi
+  done
+
+non_plist=$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist' | wc -l)
+if [[ $non_plist -gt 0 ]]; then
+  log "Only Info.plist file is allowed in Contents directory but found $non_plist file(s):"
+  log "$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist')"
+  exit 1
+fi
+
+log "Unlocking keychain..."
+# Make sure *.p12 is imported into local KeyChain
+security unlock-keychain -p "$PASSWORD" "/Users/$USERNAME/Library/Keychains/login.keychain"
+
+attempt=1
+limit=3
+set +e
+while [[ $attempt -le $limit ]]; do
+  log "Signing (attempt $attempt) $APPLICATION_PATH ..."
+  ./sign.sh "$APPLICATION_PATH" "$CODESIGN_STRING"
+  ec=$?
+  if [[ $ec -ne 0 ]]; then
+    ((attempt += 1))
+    if [ $attempt -eq $limit ]; then
+      set -e
+    fi
+    log "Signing failed, wait for 30 sec and try to sign again"
+    sleep 30
+  else
+    log "Signing done"
+    codesign -v "$APPLICATION_PATH" -vvvvv
+    log "Check sign done"
+    ((attempt += limit))
+  fi
+done
+
+set -e
+
+if [ "$NOTARIZE" = "yes" ]; then
+  log "Notarizing..."
+  # shellcheck disable=SC1090
+  source "$HOME/.notarize_token"
+  APP_NAME=$(echo ${INPUT_FILE} | awk -F"." '{ print $1 }')
+  # Since notarization tool uses same file for upload token we have to trick it into using different folders, hence fake root
+  # Also it leaves copy of zip file in TMPDIR, so notarize.sh overrides it and uses FAKE_ROOT as location for temp TMPDIR
+  FAKE_ROOT="$(pwd)/fake-root"
+  mkdir -p "$FAKE_ROOT"
+  echo "Notarization will use fake root: $FAKE_ROOT"
+  ./notarize.sh "$APPLICATION_PATH" "$APPLE_USERNAME" "$APPLE_PASSWORD" "$APP_NAME" "$BUNDLE_ID" "$FAKE_ROOT"
+  rm -rf "$FAKE_ROOT"
+
+  set +e
+  log "Stapling..."
+  xcrun stapler staple "$APPLICATION_PATH"
+else
+  log "Notarization disabled"
+  log "Stapling disabled"
+fi
+
+log "Zipping $BUILD_NAME to $INPUT_FILE ..."
+(
+  cd "$EXPLODED"
+  ditto -c -k --sequesterRsrc --keepParent "$BUILD_NAME" "../$INPUT_FILE"
+  log "Finished zipping"
+)
+rm -rf "$EXPLODED"
+log "Done"

jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/PressureEvent.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.apple.eawt.event;
+
+/**
+ * Event indicating a swipe was performed by the user.
+ *
+ * @see PressureListener
+ *
+ * @since Java for Mac OS X 10.10 Update 3, JDK 8
+ */
+public class PressureEvent extends GestureEvent {
+
+    public double getPressure() {
+        return pressure;
+    }
+
+    public double getStage() {
+        return stage;
+    }
+
+    private double pressure;
+    private double stage;
+
+    PressureEvent(double pressure, double stage) {
+        this.pressure = pressure;
+        this.stage = stage;
+    }
+}

jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/PressureListener.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.apple.eawt.event;
+
+/**
+ * Listener interface for receiving pressure events.
+ *
+ * @see PressureEvent
+ * @see GestureUtilities
+ *
+ * @since Java for Mac OS X 10.5 Update 7, Java for Mac OS X 10.6 Update 2
+ */
+public interface PressureListener extends GestureListener {
+    public void pressure(final PressureEvent e);
+}

src/hotspot/share/classfile/classListParser.cpp

@@ -274,9 +274,9 @@ void ClassListParser::error(const char *msg, ...) {
 // This function is used for loading classes for customized class loaders
 // during archive dumping.
 InstanceKlass* ClassListParser::load_class_from_source(Symbol* class_name, TRAPS) {
-#if !(defined(_LP64) && (defined(LINUX)|| defined(SOLARIS)))
-  // The only supported platforms are: (1) Linux/64-bit and (2) Solaris/64-bit
-  //
+#if !(defined(_LP64) && (defined(LINUX)|| defined(SOLARIS) || defined(__APPLE__) || defined(_WINDOWS) ))
+  // The only supported platforms are: (1) Linux/64-bit and (2) Solaris/64-bit and
+  // (3) MacOSX/64-bit and (4) Windows/64-bit
   // This #if condition should be in sync with the areCustomLoadersSupportedForCDS
   // method in test/lib/jdk/test/lib/Platform.java.
   error("AppCDS custom class loaders not supported on this platform");
@@ -364,7 +364,11 @@ Klass* ClassListParser::load_current_class(TRAPS) {
     if (!HAS_PENDING_EXCEPTION && (obj != NULL)) {
       klass = java_lang_Class::as_Klass(obj);
     } else { // load classes in bootclasspath/a
+      tty->print_cr("Class %s was not loaded from the system classloader", this->current_class_name());
       if (HAS_PENDING_EXCEPTION) {
+        oop throwable = PENDING_EXCEPTION;
+        java_lang_Throwable::print(throwable, tty);
+        tty->cr();
         CLEAR_PENDING_EXCEPTION;
       }
 
@@ -373,6 +377,7 @@ Klass* ClassListParser::load_current_class(TRAPS) {
         if (k != NULL) {
           klass = k;
         } else {
+          tty->print_cr("Class %s is not found from SystemDictionary::resolve_or_null(..) == null", this->current_class_name());
           if (!HAS_PENDING_EXCEPTION) {
             THROW_NULL(vmSymbols::java_lang_ClassNotFoundException());
           }

src/hotspot/share/classfile/classLoaderExt.cpp

@@ -270,6 +270,7 @@ InstanceKlass* ClassLoaderExt::load_class(Symbol* name, const char* path, TRAPS)
   ClassFileStream* stream = NULL;
   ClassPathEntry* e = find_classpath_entry_from_cache(path, CHECK_NULL);
   if (e == NULL) {
+    tty->print_cr("Preload Warning: ClassPathEntry is not found for class %s and path %s", class_name, path);
     return NULL;
   }
   {
@@ -336,12 +337,14 @@ ClassPathEntry* ClassLoaderExt::find_classpath_entry_from_cache(const char* path
   struct stat st;
   if (os::stat(path, &st) != 0) {
     // File or directory not found
+    tty->print_cr("Preload Warning: Source path %s is not found", path);
     return NULL;
   }
   ClassPathEntry* new_entry = NULL;
 
   new_entry = create_class_path_entry(path, &st, false, false, CHECK_NULL);
   if (new_entry == NULL) {
+    tty->print_cr("Preload Warning: The create_class_path_entry() call for path %s returned NULL", path);
     return NULL;
   }
   ccpe._path = strdup(path);
@@ -351,5 +354,14 @@ ClassPathEntry* ClassLoaderExt::find_classpath_entry_from_cache(const char* path
 }
 
 Klass* ClassLoaderExt::load_one_class(ClassListParser* parser, TRAPS) {
-  return parser->load_current_class(THREAD);
+  Klass* result = parser->load_current_class(THREAD);
+  if (result == NULL) {
+    tty->print_cr("Preload Warning: Class %s was not loaded", parser->current_class_name());
+    if (HAS_PENDING_EXCEPTION) {
+      oop throwable = PENDING_EXCEPTION;
+      java_lang_Throwable::print(throwable, tty);
+      tty->cr();
+    }
+  }
+  return result;
 }

src/hotspot/share/memory/metaspaceShared.cpp

@@ -1736,10 +1736,16 @@ int MetaspaceShared::preload_classes(const char* class_list_path, TRAPS) {
     while (parser.parse_one_line()) {
       Klass* klass = ClassLoaderExt::load_one_class(&parser, THREAD);
       if (HAS_PENDING_EXCEPTION) {
-        if (klass == NULL &&
-             (PENDING_EXCEPTION->klass()->name() == vmSymbols::java_lang_ClassNotFoundException())) {
-          // print a warning only when the pending exception is class not found
-          tty->print_cr("Preload Warning: Cannot find %s", parser.current_class_name());
+        if (klass == NULL) {
+          if (PENDING_EXCEPTION->klass()->name() == vmSymbols::java_lang_ClassNotFoundException()) {
+            // print a warning only when the pending exception is class not found
+            tty->print_cr("Preload Warning: Cannot find %s", parser.current_class_name());
+          } else {
+            tty->print_cr("Preload Warning: Exception loading class %s", parser.current_class_name());
+            oop throwable = PENDING_EXCEPTION;
+            java_lang_Throwable::print(throwable, tty);
+            tty->cr();
+          }
         }
         CLEAR_PENDING_EXCEPTION;
       }
@@ -1787,6 +1793,11 @@ bool MetaspaceShared::try_link_class(InstanceKlass* ik, TRAPS) {
       ResourceMark rm;
       tty->print_cr("Preload Warning: Verification failed for %s",
                     ik->external_name());
+
+      oop throwable = PENDING_EXCEPTION;
+      java_lang_Throwable::print(throwable, tty);
+      tty->cr();
+
       CLEAR_PENDING_EXCEPTION;
       ik->set_in_error_state();
       _has_error_classes = true;

src/java.desktop/macosx/classes/sun/lwawt/macosx/CCursorManager.java

@@ -44,6 +44,12 @@ final class CCursorManager extends LWCursorManager {
         return theInstance;
     }
 
+    private static void resetCurrentCursor() {
+        if (theInstance != null) {
+            theInstance.currentCursor = null;
+        }
+    }
+
     private volatile Cursor currentCursor;
 
     private CCursorManager() { }

src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java

@@ -877,46 +877,21 @@ public class CInputMethod extends InputMethodAdapter {
             return false;
         }
 
-        static void await(CountDownLatch latch) {
-            try {
-                latch.await();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
         // Executed on AppKit
         static void invoke(Runnable runnable, sun.awt.im.InputContext inputContext, Component targetToAppContext) throws InvocationTargetException {
-            CountDownLatch edtLatch = new CountDownLatch(1);
-            CountDownLatch tkLatch = new CountDownLatch(1);
             AtomicBoolean runOnAppKit = new AtomicBoolean(false);
 
-            // Emulate EventQueue.invokeAndWait(runnable) for the runnable that delegates execution
-            // back to AppKit (JavaFX Event thread), without running secondary loop on AppKit.
-
-            InvocationEvent event = new InvocationEvent(targetToAppContext, () -> {
-                try {
-                    runOnAppKit.set(instanceofJFXPanel(getClientComponent(inputContext)));
-                    if (!runOnAppKit.get()) {
-                        runnable.run();
-                    }
-                } finally {
-                    edtLatch.countDown();
-                    await(tkLatch);
-                }
-            });
-            assert targetToAppContext != null;
-            AppContext appContext = SunToolkit.targetToAppContext(targetToAppContext);
-            SunToolkit.postEvent(appContext, event);
-            SunToolkit.flushPendingEvents(appContext);
-
-            await(edtLatch);
-            try {
-                if (runOnAppKit.get()) {
+            // 1) Do not run secondary msg loop in this case.
+            // 2) Delegate runnable back to FX when applicable.
+            LWCToolkit.invokeAndWait(() -> {
+                runOnAppKit.set(instanceofJFXPanel(getClientComponent(inputContext)));
+                if (!runOnAppKit.get()) {
                     runnable.run();
                 }
-            } finally {
-                tkLatch.countDown();
+            }, targetToAppContext);
+
+            if (runOnAppKit.get()) {
+                runnable.run();
             }
         }
     }

src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java

@@ -480,7 +480,9 @@ public final class LWCToolkit extends LWToolkit {
 
     @Override
     public Insets getScreenInsets(final GraphicsConfiguration gc) {
-        return ((CGraphicsConfig) gc).getDevice().getScreenInsets();
+        CGraphicsDevice gd = ((CGraphicsConfig) gc).getDevice();
+        // Avoid deadlock with input methods
+        return LWCToolkit.SelectorPerformer.perform(gd::getScreenInsets);
     }
 
     @Override
@@ -748,19 +750,21 @@ public final class LWCToolkit extends LWToolkit {
             assert EventQueue.isDispatchThread();
             if (executor == null) {
                 // init on EDT
-                executor = new ThreadPoolExecutor(1, Integer.MAX_VALUE,
-                        60L, TimeUnit.SECONDS,
-                        new SynchronousQueue<>(),
-                        new ThreadFactory() {
-                            private ThreadFactory factory = Executors.privilegedThreadFactory();
-                            @Override
-                            public Thread newThread(Runnable r) {
-                                Thread t = factory.newThread(r);
-                                t.setDaemon(true);
-                                t.setName("AWT-SelectorPerformer " + t.getName());
-                                return t;
-                            }
-                        });
+                AccessController.doPrivileged((PrivilegedAction<?>)() ->
+                    executor = new ThreadPoolExecutor(1, Integer.MAX_VALUE,
+                            60L, TimeUnit.SECONDS,
+                            new SynchronousQueue<>(),
+                            new ThreadFactory() {
+                                private ThreadFactory factory = Executors.privilegedThreadFactory();
+                                @Override
+                                public Thread newThread(Runnable r) {
+                                    Thread t = factory.newThread(r);
+                                    t.setDaemon(true);
+                                    t.setName("AWT-SelectorPerformer " + t.getName());
+                                    return t;
+                                }
+                            })
+                );
             }
             LinkedBlockingQueue<InvocationEvent> currentQueue;
             synchronized (invocations) {

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

@@ -64,6 +64,7 @@ static BOOL shouldUsePressAndHold() {
     return shouldUsePressAndHold;
 }
 
+extern bool isSystemShortcut_NextWindowInApplication(NSUInteger modifiersMask, NSString * chars);
 
 @implementation AWTView
 
@@ -362,9 +363,7 @@ static BOOL shouldUsePressAndHold() {
     NSUInteger deviceIndependentModifierFlagsMask =
         [event modifierFlags] & NSDeviceIndependentModifierFlagsMask;
 
-    return ((deviceIndependentModifierFlagsMask == NSCommandKeyMask)
-        || (deviceIndependentModifierFlagsMask == (NSCommandKeyMask & NSShiftKeyMask)))
-        && [[event characters] isEqualToString:@"`"];
+    return isSystemShortcut_NextWindowInApplication(deviceIndependentModifierFlagsMask, [event characters]);
 }
 
 /**

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h

@@ -73,6 +73,7 @@
 
 // NSWindow overrides delegate methods
 - (BOOL) canBecomeKeyWindow;
+- (void) becomeKeyWindow;
 - (BOOL) canBecomeMainWindow;
 - (BOOL) worksWhenModal;
 - (void)sendEvent:(NSEvent *)event;

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m

@@ -97,10 +97,19 @@ static NSPoint lastTopLeftPoint;
     return [(AWTWindow*)[self delegate] worksWhenModal];        \
 }                                                               \
                                                                 \
+- (void)cursorUpdate:(NSEvent *)event {                         \
+    /* Prevent cursor updates from OS side */                   \
+}                                                               \
+                                                                \
 - (void)sendEvent:(NSEvent *)event {                            \
     [(AWTWindow*)[self delegate] sendEvent:event];              \
     [super sendEvent:event];                                    \
-}
+}                                                               \
+                                                                \
+- (void)becomeKeyWindow {                                       \
+    [super becomeKeyWindow];                                    \
+    [(AWTWindow*)[self delegate] becomeKeyWindow];              \
+}                                                               \
 
 @implementation AWTWindow_Normal
 AWT_NS_WINDOW_IMPLEMENTATION
@@ -165,6 +174,15 @@ AWT_NS_WINDOW_IMPLEMENTATION
                     b:[event deltaY]];
 }
 
+- (void)pressureChangeWithEvent:(NSEvent *)event {
+    float pressure = event.pressure;
+    [self postGesture:event
+                       as:com_apple_eawt_event_GestureHandler_PRESSURE
+                        a:pressure
+                        b:(([event respondsToSelector:@selector(stage)]) ? ((NSInteger)[event stage]) : -1)
+    ];
+}
+
 @end
 @implementation AWTWindow_Panel
 AWT_NS_WINDOW_IMPLEMENTATION
@@ -331,12 +349,6 @@ AWT_ASSERT_APPKIT_THREAD;
         [self.nsWindow setTitleVisibility:NSWindowTitleHidden];
     }
 
-    if (IS(self.styleBits, DARK)) {
-        [self.nsWindow setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantDark]];
-    } else {
-        [self.nsWindow setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantLight]];
-    }
-
     return self;
 }
 
@@ -526,6 +538,17 @@ AWT_ASSERT_APPKIT_THREAD;
     return self.isEnabled && (IS(self.styleBits, SHOULD_BECOME_KEY) || [self isSimpleWindowOwnedByEmbeddedFrame]);
 }
 
+- (void) becomeKeyWindow {
+    AWT_ASSERT_APPKIT_THREAD;
+
+    // Reset current cursor in CCursorManager such that any following mouse update event
+    // restores the correct cursor to the frame context specific one.
+    JNIEnv *env = [ThreadUtilities getJNIEnv];
+    static JNF_CLASS_CACHE(jc_CCursorManager, "sun/lwawt/macosx/CCursorManager");
+    static JNF_STATIC_MEMBER_CACHE(sjm_resetCurrentCursor, jc_CCursorManager, "resetCurrentCursor", "()V");
+    JNFCallStaticVoidMethod(env, sjm_resetCurrentCursor);
+}
+
 - (BOOL) canBecomeMainWindow {
 AWT_ASSERT_APPKIT_THREAD;
     if (!self.isEnabled) {
@@ -978,6 +1001,16 @@ JNF_COCOA_ENTER(env);
     NSView *contentView = OBJC(contentViewPtr);
     NSRect frameRect = NSMakeRect(x, y, w, h);
     AWTWindow *owner = [OBJC(ownerPtr) delegate];
+
+    BOOL isIgnoreMouseEvents = NO;
+    static JNF_MEMBER_CACHE(jf_target, jc_CPlatformWindow, "target", "Ljava/awt/Window;");
+    jobject awtWindow = JNFGetObjectField(env, obj, jf_target);
+    if (awtWindow != NULL) {
+        static JNF_CLASS_CACHE(jc_Window, "java/awt/Window");
+        static JNF_MEMBER_CACHE(jm_isIgnoreMouseEvents, jc_Window, "isIgnoreMouseEvents", "()Z");
+        isIgnoreMouseEvents = JNFCallBooleanMethod(env, awtWindow, jm_isIgnoreMouseEvents) == JNI_TRUE ? YES : NO;
+        (*env)->DeleteLocalRef(env, awtWindow);
+    }
     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
 
         window = [[AWTWindow alloc] initWithPlatformWindow:platformWindow
@@ -987,7 +1020,12 @@ JNF_COCOA_ENTER(env);
                                                contentView:contentView];
         // the window is released is CPlatformWindow.nativeDispose()
 
-        if (window) [window.nsWindow retain];
+        if (window) {
+            [window.nsWindow retain];
+            if (isIgnoreMouseEvents) {
+                [window.nsWindow setIgnoresMouseEvents:YES];
+            }
+        }
     }];
 
 JNF_COCOA_EXIT(env);
@@ -1025,6 +1063,12 @@ JNF_COCOA_ENTER(env);
         }
 
         window.styleBits = newBits;
+
+        if (IS(window.styleBits, DARK)) {
+          [nsWindow setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantDark]];
+        } else {
+          [nsWindow setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameVibrantLight]];
+        }
     }];
 
 JNF_COCOA_EXIT(env);

src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m

@@ -165,26 +165,30 @@ canChooseDirectories:(BOOL)inChooseDirectories
                 [CMenuBar activate:menuBar modallyDisabled:isDisabled];
             }
 
-            [thePanel beginSheetModalForWindow:fOwner completionHandler:^(NSInteger result) {
+            [thePanel setAppearance:fOwner.appearance];
 
-                if (result == NSFileHandlingPanelOKButton) {
+            void (^onComplete)(BOOL, BOOL) = ^(BOOL responseOK, BOOL doStopModal) {
+                if (responseOK) {
                     NSOpenPanel *openPanel = (NSOpenPanel *)thePanel;
                     fURLs = (fMode == java_awt_FileDialog_LOAD)
                          ? [openPanel URLs]
                          : [NSArray arrayWithObject:[openPanel URL]];
 
                     fPanelResult = NSFileHandlingPanelOKButton;
-
-                    } else {
-                        fURLs = [NSArray array];
-                    }
-                    [fURLs retain];
-                    [NSApp stopModal];
-                    if (menuBar != nil) {
-                        [CMenuBar activate:menuBar modallyDisabled:NO];
-                    }
+                } else {
+                    fURLs = [NSArray array];
                 }
-            ];
+                [fURLs retain];
+                if (doStopModal)
+                    [NSApp stopModal];
+                if (menuBar != nil) {
+                    [CMenuBar activate:menuBar modallyDisabled:NO];
+                }
+            };
+
+            [thePanel beginSheetModalForWindow:fOwner completionHandler:^(NSInteger result) {
+                onComplete(result == NSFileHandlingPanelOKButton, YES);
+            }];
 
             [NSApp runModalForWindow:thePanel];
         }

src/java.desktop/macosx/native/libawt_lwawt/awt/SystemHotkey.m

@@ -0,0 +1,781 @@
+#import <Foundation/Foundation.h>
+#import <Carbon/Carbon.h>
+#import <Cocoa/Cocoa.h>
+
+#import "CRobotKeyCode.h"
+#import "java_awt_event_KeyEvent.h"
+
+#include <jni.h>
+#include "jni_util.h"
+
+
+extern JavaVM *jvm;
+
+enum LOG_LEVEL {
+    LL_TRACE,
+    LL_DEBUG,
+    LL_INFO,
+    LL_WARNING,
+    LL_ERROR
+};
+
+void plog(int logLevel, const char *formatMsg, ...) {
+    if (!jvm)
+        return;
+    if (logLevel < LL_TRACE || logLevel > LL_ERROR || formatMsg == NULL)
+        return;
+
+    // TODO: check whether current logLevel is enabled in PlatformLogger
+    static jobject loggerObject = NULL;
+    static jclass clazz = NULL;
+    static jmethodID midTrace = NULL, midDebug = NULL, midInfo = NULL, midWarn = NULL, midError = NULL;
+
+    if (loggerObject == NULL) {
+        JNIEnv* env;
+        (*jvm)->AttachCurrentThreadAsDaemon(jvm, (void**)&env, NULL);
+        jclass shkClass = (*env)->FindClass(env, "java/awt/desktop/SystemHotkey");
+        if (shkClass == NULL)
+            return;
+        jfieldID fieldId = (*env)->GetStaticFieldID(env, shkClass, "ourLog", "Lsun/util/logging/PlatformLogger;");
+        if (fieldId == NULL)
+            return;
+        loggerObject = (*env)->GetStaticObjectField(env, shkClass, fieldId);
+        loggerObject = (*env)->NewGlobalRef(env, loggerObject);
+
+        clazz = (*env)->GetObjectClass(env, loggerObject);
+        if (clazz == NULL) {
+            NSLog(@"plogImpl: can't find PlatformLogger class");
+            return;
+        }
+
+        midTrace = (*env)->GetMethodID(env, clazz, "finest", "(Ljava/lang/String;)V");
+        midDebug = (*env)->GetMethodID(env, clazz, "fine", "(Ljava/lang/String;)V");
+        midInfo = (*env)->GetMethodID(env, clazz, "info", "(Ljava/lang/String;)V");
+        midWarn = (*env)->GetMethodID(env, clazz, "warning", "(Ljava/lang/String;)V");
+        midError = (*env)->GetMethodID(env, clazz, "severe", "(Ljava/lang/String;)V");
+    }
+
+    jmethodID mid = midTrace;
+    switch (logLevel) {
+        case LL_DEBUG: mid = midDebug; break;
+        case LL_INFO: mid = midInfo; break;
+        case LL_WARNING: mid = midWarn; break;
+        case LL_ERROR: mid = midError; break;
+    }
+    if (mid == NULL) {
+        NSLog(@"plogImpl: undefined log-method for level %d", logLevel);
+        return;
+    }
+
+    va_list args;
+    va_start(args, formatMsg);
+    const int bufSize = 512;
+    char buf[bufSize];
+    vsnprintf(buf, bufSize, formatMsg, args);
+    va_end(args);
+
+    JNIEnv* env;
+    jstring jstr;
+    (*jvm)->AttachCurrentThreadAsDaemon(jvm, (void**)&env, NULL);
+    jstr = (*env)->NewStringUTF(env, buf);
+
+    (*env)->CallVoidMethod(env, loggerObject, mid, jstr);
+    (*env)->DeleteLocalRef(env, jstr);
+}
+
+static const char * toCString(id obj) {
+    return obj == nil ? "nil" : [NSString stringWithFormat:@"%@", obj].UTF8String;
+}
+
+// Copy of java.awt.event.KeyEvent.[MODIFIER]_DOWN_MASK
+static const int AWT_SHIFT_DOWN_MASK = 1 << 6;
+static const int AWT_CTRL_DOWN_MASK = 1 << 7;
+static const int AWT_META_DOWN_MASK = 1 << 8;
+static const int AWT_ALT_DOWN_MASK = 1 << 9;
+
+static int symbolicHotKeysModifiers2java(int mask) {
+    // NOTE: these masks doesn't coincide with macos events masks
+    // and can be used only to parse data from settings domain "com.apple.symbolichotkeys"
+    const int MACOS_SHIFT_MASK      = 0x020000;
+    const int MACOS_CONTROL_MASK    = 0x040000;
+    const int MACOS_OPTION_MASK     = 0x080000;
+    const int MACOS_CMD_MASK        = 0x100000;
+
+    int result = 0;
+    if (mask & MACOS_SHIFT_MASK)
+        result |= AWT_SHIFT_DOWN_MASK;
+    if (mask & MACOS_CONTROL_MASK)
+        result |= AWT_CTRL_DOWN_MASK;
+    if (mask & MACOS_OPTION_MASK)
+        result |= AWT_ALT_DOWN_MASK;
+    if (mask & MACOS_CMD_MASK)
+        result |= AWT_META_DOWN_MASK;
+    return result;
+}
+
+static NSString * getAppleSymbolicHotKeysDescription(int hotKeyId) {
+    static NSDictionary * hotkeyId2DescMap = nil;
+    if (hotkeyId2DescMap == nil) {
+        hotkeyId2DescMap = [NSDictionary dictionaryWithObjectsAndKeys:
+                @"Move focus to the menu bar", [NSNumber numberWithInt:7],
+                @"Move focus to the Dock", [NSNumber numberWithInt:8],
+                @"Move focus to active or next window", [NSNumber numberWithInt:9],
+                @"Move focus to window toolbar", [NSNumber numberWithInt:10],
+                @"Move focus to floating window", [NSNumber numberWithInt:11],
+                @"Change the way Tab moves focus", [NSNumber numberWithInt:13],
+                @"Turn zoom on or off", [NSNumber numberWithInt:15],
+                @"Zoom in", [NSNumber numberWithInt:17],
+                @"Zoom out", [NSNumber numberWithInt:19],
+                @"Reverse Black and White", [NSNumber numberWithInt:21],
+                @"Turn image smoothing on or off", [NSNumber numberWithInt:23],
+                @"Increase Contrast", [NSNumber numberWithInt:25],
+                @"Decrease Contrast", [NSNumber numberWithInt:26],
+                @"Move focus to the next window in application", [NSNumber numberWithInt:27],
+                @"Save picture of screen as file", [NSNumber numberWithInt:28],
+                @"Copy picture of screen to clipboard", [NSNumber numberWithInt:29],
+                @"Save picture of selected area as file", [NSNumber numberWithInt:30],
+                @"Copy picture of selected area to clipboard", [NSNumber numberWithInt:31],
+                @"All Windows", [NSNumber numberWithInt:32],
+                @"Application Windows", [NSNumber numberWithInt:33],
+                @"All Windows (Slow)", [NSNumber numberWithInt:34],
+                @"Application Windows (Slow)", [NSNumber numberWithInt:35],
+                @"Desktop", [NSNumber numberWithInt:36],
+                @"Desktop (Slow)", [NSNumber numberWithInt:37],
+                @"Move focus to the window drawer", [NSNumber numberWithInt:51],
+                @"Turn Dock Hiding On/Off", [NSNumber numberWithInt:52],
+                @"Move focus to the status menus", [NSNumber numberWithInt:57],
+                @"Turn VoiceOver on / off", [NSNumber numberWithInt:59],
+                @"Select the previous input source", [NSNumber numberWithInt:60],
+                @"Select the next source in the Input Menu", [NSNumber numberWithInt:61],
+                @"Dashboard", [NSNumber numberWithInt:62],
+                @"Dashboard (Slow)", [NSNumber numberWithInt:63],
+                @"Show Spotlight search field", [NSNumber numberWithInt:64],
+                @"Show Spotlight window", [NSNumber numberWithInt:65],
+                @"Dictionary MouseOver", [NSNumber numberWithInt:70],
+                @"Hide and show Front Row", [NSNumber numberWithInt:73],
+                @"Activate Spaces", [NSNumber numberWithInt:75],
+                @"Activate Spaces (Slow)", [NSNumber numberWithInt:76],
+                @"Spaces Left", [NSNumber numberWithInt:79],
+                @"Spaces Right", [NSNumber numberWithInt:81],
+                @"Spaces Down", [NSNumber numberWithInt:83],
+                @"Spaces Up", [NSNumber numberWithInt:85],
+                @"Show Help Menu", [NSNumber numberWithInt:91],
+                @"Show Help Menu", [NSNumber numberWithInt:92],
+                @"Show Help Menu", [NSNumber numberWithInt:98],
+                @"Switch to Space 1", [NSNumber numberWithInt:118],
+                @"Switch to Space 2", [NSNumber numberWithInt:119],
+                @"Switch to Space 3", [NSNumber numberWithInt:120],
+                @"Switch to Space 4", [NSNumber numberWithInt:121],
+                @"Show Launchpad", [NSNumber numberWithInt:160],
+                @"Show Accessibility Controls", [NSNumber numberWithInt:162],
+                @"Show Notification Center", [NSNumber numberWithInt:163],
+                @"Turn Do-Not-Disturb On/Off", [NSNumber numberWithInt:175],
+                @"Turn focus following On/Off", [NSNumber numberWithInt:179],
+                nil
+        ];
+
+        [hotkeyId2DescMap retain];
+    }
+
+    return [hotkeyId2DescMap objectForKey : [NSNumber numberWithInt : hotKeyId]];
+}
+
+@interface DefaultParams: NSObject
+@property (assign) BOOL enabled;
+@property (strong) NSString *key_equivalent;
++(DefaultParams *) create:(NSString *)key_equivalent enabled:(BOOL)enabled;
+@end
+
+@implementation DefaultParams
++(DefaultParams *) create:(NSString *)key_equivalent enabled:(BOOL)enabled {
+    DefaultParams * result = [[[DefaultParams alloc] init] autorelease];
+    result.enabled = enabled;
+    result.key_equivalent = key_equivalent;
+    return result;
+}
+@end
+
+static NSMutableDictionary * createDefaultParams();
+
+static int NSModifiers2java(int mask) {
+    int result = 0;
+    if (mask & shiftKey)
+        result |= AWT_SHIFT_DOWN_MASK;
+    if (mask & controlKey)
+        result |= AWT_CTRL_DOWN_MASK;
+    if (mask & optionKey)
+        result |= AWT_ALT_DOWN_MASK;
+    if (mask & cmdKey)
+        result |= AWT_META_DOWN_MASK;
+    return result;
+}
+
+static int javaModifiers2NS(int jmask) {
+    int result = 0;
+    if (jmask & AWT_SHIFT_DOWN_MASK)
+        result |= NSShiftKeyMask;
+    if (jmask & AWT_CTRL_DOWN_MASK)
+        result |= NSControlKeyMask;
+    if (jmask & AWT_ALT_DOWN_MASK)
+        result |= NSAlternateKeyMask;
+    if (jmask & AWT_META_DOWN_MASK)
+        result |= NSCommandKeyMask;
+    return result;
+}
+
+typedef bool (^ Visitor)(int, const char *, int, const char *, int);
+
+static void visitServicesShortcut(Visitor visitorBlock, NSString * key_equivalent, NSString * desc) {
+    // @ - command
+    // $ - shift
+    // ^ - control
+    // ~ - alt(option)
+    const bool modIsSHIFT = [key_equivalent containsString:@"$"];
+    const bool modIsCONTROL = [key_equivalent containsString:@"^"];
+    const bool modIsOPTION = [key_equivalent containsString:@"~"];
+    const bool modIsCMD = [key_equivalent containsString:@"@"];
+    int modifiers = 0;
+    if (modIsSHIFT)
+        modifiers |= AWT_SHIFT_DOWN_MASK;
+    if (modIsCONTROL)
+        modifiers |= AWT_CTRL_DOWN_MASK;
+    if (modIsOPTION)
+        modifiers |= AWT_ALT_DOWN_MASK;
+    if (modIsCMD)
+        modifiers |= AWT_META_DOWN_MASK;
+
+    NSCharacterSet * excludeSet = [NSCharacterSet characterSetWithCharactersInString:@"@$^~"];
+    NSString * keyChar = [key_equivalent stringByTrimmingCharactersInSet:excludeSet];
+
+    visitorBlock(-1, keyChar.UTF8String, modifiers, desc.UTF8String, -1);
+}
+
+void readSystemHotkeysImpl(Visitor visitorBlock) {
+    // 1. read from com.apple.symbolichotkeys.plist (domain with custom (user defined) shortcuts)
+    @try {
+
+    NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
+    NSDictionary<NSString *,id> * shk = [defaults persistentDomainForName:@"com.apple.symbolichotkeys"];
+    if (shk != nil) {
+        //        AppleSymbolicHotKeys =     {
+        //                10 =         {
+        //                        enabled = 1;
+        //                        value =             {
+        //                            parameters =                 (
+        //                                    65535,
+        //                                            96,
+        //                                            8650752
+        //                            );
+        //                            type = standard;
+        //                        };
+        //                };
+        //          ......
+        //         }
+        id hotkeys = [shk valueForKey:@"AppleSymbolicHotKeys"];
+        if (hotkeys == nil)
+            plog(LL_DEBUG, "key AppleSymbolicHotKeys doesn't exist in domain com.apple.symbolichotkeys");
+        else if (![hotkeys isKindOfClass:[NSDictionary class]])
+            plog(LL_DEBUG, "object for key 'AppleSymbolicHotKeys' isn't NSDictionary (class=%s)", [hotkeys className].UTF8String);
+        else {
+            for (id keyObj in hotkeys) {
+                if (![keyObj isKindOfClass:[NSString class]]) {
+                    plog(LL_DEBUG, "key '%s' isn't instance of NSString (class=%s)", toCString(keyObj), [keyObj className].UTF8String);
+                    continue;
+                }
+                NSString *hkNumber = keyObj;
+                id hkDesc = hotkeys[hkNumber];
+                if (![hkDesc isKindOfClass:[NSDictionary class]]) {
+                    plog(LL_DEBUG, "hotkey descriptor '%s' isn't instance of NSDictionary (class=%s)", toCString(hkDesc), [hkDesc className].UTF8String);
+                    continue;
+                }
+                NSDictionary<id, id> *sdict = hkDesc;
+                id objValue = sdict[@"value"];
+                if (objValue == nil)
+                    continue;
+
+                if (![objValue isKindOfClass:[NSDictionary class]]) {
+                    plog(LL_DEBUG, "property 'value' %s isn't instance of NSDictionary (class=%s)", toCString(objValue), [objValue className].UTF8String);
+                    continue;
+                }
+
+                id objEnabled = sdict[@"enabled"];
+                BOOL enabled = objEnabled != nil && [objEnabled boolValue] == YES;
+
+                if (!enabled)
+                    continue;
+
+                NSDictionary * value = objValue;
+                id objParams = value[@"parameters"];
+                if (![objParams isKindOfClass:[NSArray class]]) {
+                    plog(LL_DEBUG, "property 'parameters' %s isn't instance of NSArray (class=%s)", toCString(objParams), [objParams className].UTF8String);
+                    continue;
+                }
+
+                NSArray *parameters = objParams;
+                if ([parameters count] < 3) {
+                    plog(LL_DEBUG, "too small lenght of parameters %d", [parameters count]);
+                    continue;
+                }
+
+                id p0 = parameters[0];
+                id p1 = parameters[1];
+                id p2 = parameters[2];
+
+                if (![p0 isKindOfClass:[NSNumber class]] || ![p1 isKindOfClass:[NSNumber class]] || ![p2 isKindOfClass:[NSNumber class]]) {
+                    plog(LL_DEBUG, "some of parameters isn't instance of NSNumber (%s, %s, %s)", [p0 className].UTF8String, [p1 className].UTF8String, [p2 className].UTF8String);
+                    continue;
+                }
+
+                //parameter 1: ASCII code of the character (or 65535 - hex 0xFFFF - for non-ASCII characters).
+                //parameter 2: the keyboard key code for the character.
+                //Parameter 3: the sum of the control, command, shift and option keys. these are bits 17-20 in binary: shift is bit 17, control is bit 18, option is bit 19, and command is bit 20.
+                //      0x020000 => "Shift",
+                //      0x040000 => "Control",
+                //      0x080000 => "Option",
+                //      0x100000 => "Command"
+
+                int asciiCode = p0 == nil ? 0xFFFF : [p0 intValue];
+                int vkeyCode = p1 == nil ? -1 : [p1 intValue];
+                int modifiers = p2 == nil ? 0 : [p2 intValue];
+
+                char keyCharBuf[64];
+                const char * keyCharStr = keyCharBuf;
+                if (asciiCode >= 0 && asciiCode <= 0xFF) {
+                    sprintf(keyCharBuf, "%c", asciiCode);
+                } else
+                    keyCharStr = NULL;
+                NSString * description = getAppleSymbolicHotKeysDescription([hkNumber intValue]);
+                visitorBlock(vkeyCode, keyCharStr, symbolicHotKeysModifiers2java(modifiers), description == nil ? NULL : description.UTF8String, [hkNumber intValue]);
+            }
+        }
+    } else {
+        plog(LL_DEBUG, "domain com.apple.symbolichotkeys doesn't exist");
+    }
+
+    // 2. read from Pbs (domain with services shortcuts)
+    NSMutableDictionary * allDefParams = createDefaultParams();
+    NSDictionary<NSString *,id> * pbs = [defaults persistentDomainForName:@"pbs"];
+    if (pbs) {
+//        NSServicesStatus =     {
+//                "com.apple.Terminal - Open man Page in Terminal - openManPage" =         {
+//                        "key_equivalent" = "@$m";
+//                };
+//                "com.apple.Terminal - Search man Page Index in Terminal - searchManPages" =         {
+//                    "enabled_context_menu" = 0;
+//                    "enabled_services_menu" = 0;
+//                    "key_equivalent" = "@$a";
+//                    "presentation_modes" =             {
+//                            ContextMenu = 0;
+//                            ServicesMenu = 0;
+//                    };
+//                };
+//        };
+//    }
+
+        NSDictionary<NSString *, id> *services = [pbs valueForKey:@"NSServicesStatus"];
+        if (services) {
+            for (NSString *key in services) {
+                id value = services[key];
+                if (![value isKindOfClass:[NSDictionary class]]) {
+                    plog(LL_DEBUG, "'%s' isn't instance of NSDictionary (class=%s)", toCString(value), [value className].UTF8String);
+                    continue;
+                }
+                // NOTE: unchanged default params will not appear here, check allDefParams at the end of this loop
+                DefaultParams * defParams = [allDefParams objectForKey:key];
+                [allDefParams removeObjectForKey:key];
+
+                NSDictionary<NSString *, id> *sdict = value;
+                NSString *key_equivalent = sdict[@"key_equivalent"];
+                if (!key_equivalent && defParams != nil) {
+                    key_equivalent = defParams.key_equivalent;
+                }
+                if (!key_equivalent)
+                    continue;
+
+                NSString *enabled = sdict[@"enabled_services_menu"];
+                if (enabled != nil && [enabled boolValue] == NO) {
+                    continue;
+                }
+                if (enabled == nil && defParams != nil && !defParams.enabled) {
+                    continue;
+                }
+
+                visitServicesShortcut(visitorBlock, key_equivalent, key);
+            }
+        }
+    }
+
+    // Iterate through rest of allDefParams
+    for (NSString* key in allDefParams) {
+        DefaultParams * defParams = allDefParams[key];
+        if (!defParams.enabled) {
+            continue;
+        }
+        visitServicesShortcut(visitorBlock, defParams.key_equivalent, key);
+    }
+
+#ifdef USE_CARBON_CopySymbolicHotKeys
+    // 3. read from core services
+    CFArrayRef registeredHotKeys;
+    if(CopySymbolicHotKeys(&registeredHotKeys) == noErr) {
+        CFIndex count = CFArrayGetCount(registeredHotKeys);
+        for(CFIndex i = 0; i < count; i++) {
+            CFDictionaryRef hotKeyInfo = CFArrayGetValueAtIndex(registeredHotKeys, i);
+            CFNumberRef hotKeyCode = CFDictionaryGetValue(hotKeyInfo, kHISymbolicHotKeyCode);
+            CFNumberRef hotKeyModifiers = CFDictionaryGetValue(hotKeyInfo, kHISymbolicHotKeyModifiers);
+            CFBooleanRef hotKeyEnabled = CFDictionaryGetValue(hotKeyInfo, kHISymbolicHotKeyEnabled);
+
+            int64_t vkeyCode = -1;
+            CFNumberGetValue(hotKeyCode, kCFNumberSInt64Type, &vkeyCode);
+            int64_t keyModifiers = 0;
+            CFNumberGetValue(hotKeyModifiers, kCFNumberSInt64Type, &keyModifiers);
+            Boolean enabled = CFBooleanGetValue(hotKeyEnabled);
+            if (!enabled)
+                continue;
+
+            visitorBlock(vkeyCode, NULL, NSModifiers2java(keyModifiers), NULL, -1);
+        }
+
+        CFRelease(registeredHotKeys);
+    }
+#endif // USE_CARBON_CopySymbolicHotKeys
+    }
+    @catch (NSException *exception) {
+        NSLog(@"readSystemHotkeys: catched exception, reason '%@'", exception.reason);
+    }
+}
+
+bool isSystemShortcut_NextWindowInApplication(NSUInteger modifiersMask, NSString * chars) {
+    const int shortcutUid_NextWindowInApplication = 27;
+    static NSString * shortcutCharacter = nil;
+    static int shortcutMask = 0;
+    if (shortcutCharacter == nil) {
+        readSystemHotkeysImpl(
+            ^bool(int vkeyCode, const char * keyCharStr, int jmodifiers, const char * descriptionStr, int hotkeyUid) {
+                if (hotkeyUid != shortcutUid_NextWindowInApplication)
+                    return true;
+
+                if (keyCharStr != NULL) {
+                    shortcutCharacter = [[NSString stringWithFormat:@"%s", keyCharStr] retain];
+                    shortcutMask = javaModifiers2NS(jmodifiers);
+                }
+                return false;
+            }
+        );
+        if (shortcutCharacter == nil) {
+            shortcutCharacter = @"`";
+            shortcutMask = NSCommandKeyMask;
+        }
+    }
+
+    return ((modifiersMask == shortcutMask)
+        || (modifiersMask == (shortcutMask & NSShiftKeyMask)))
+        && [chars isEqualToString:shortcutCharacter];
+}
+
+void Java_java_awt_desktop_SystemHotkeyReader_readSystemHotkeys(JNIEnv* env, jobject reader) {
+    jclass clsReader = (*env)->GetObjectClass(env, reader);
+    jmethodID methodAdd = (*env)->GetMethodID(env, clsReader, "add", "(ILjava/lang/String;ILjava/lang/String;)V");
+
+    readSystemHotkeysImpl(
+        ^bool(int vkeyCode, const char * keyCharStr, int jmodifiers, const char * descriptionStr, int hotkeyUid){
+            jstring jkeyChar = keyCharStr == NULL ? NULL : (*env)->NewStringUTF(env, keyCharStr);
+            jstring jdesc = descriptionStr == NULL ? NULL : (*env)->NewStringUTF(env, descriptionStr);
+            (*env)->CallVoidMethod(
+                    env, reader, methodAdd, (jint)vkeyCode, jkeyChar, (jint)jmodifiers, jdesc
+            );
+            return true;
+        }
+    );
+}
+
+jint Java_java_awt_desktop_SystemHotkeyReader_osx2java(JNIEnv* env, jclass clazz, jint osxKeyCode) {
+    static NSDictionary * osx2javaMap = nil;
+    if (osx2javaMap == nil) {
+        osx2javaMap = [NSDictionary dictionaryWithObjectsAndKeys:
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_BACK_SPACE], [NSNumber numberWithInt:OSX_Delete],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_TAB], [NSNumber numberWithInt:OSX_kVK_Tab],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_ENTER], [NSNumber numberWithInt:OSX_kVK_Return],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_CLEAR], [NSNumber numberWithInt:OSX_kVK_ANSI_KeypadClear],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_SHIFT], [NSNumber numberWithInt:OSX_Shift],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_CONTROL], [NSNumber numberWithInt:OSX_Control],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_ALT], [NSNumber numberWithInt:OSX_Option],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_ALT_GRAPH], [NSNumber numberWithInt:OSX_RightOption],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_CAPS_LOCK], [NSNumber numberWithInt:OSX_CapsLock],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_ESCAPE], [NSNumber numberWithInt:OSX_Escape],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_SPACE], [NSNumber numberWithInt:OSX_kVK_Space],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_PAGE_UP], [NSNumber numberWithInt:OSX_PageUp],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_PAGE_DOWN], [NSNumber numberWithInt:OSX_PageDown],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_END], [NSNumber numberWithInt:OSX_End],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_HOME], [NSNumber numberWithInt:OSX_Home],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_LEFT], [NSNumber numberWithInt:OSX_LeftArrow],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_UP], [NSNumber numberWithInt:OSX_UpArrow],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_RIGHT], [NSNumber numberWithInt:OSX_RightArrow],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_DOWN], [NSNumber numberWithInt:OSX_DownArrow],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_COMMA], [NSNumber numberWithInt:OSX_kVK_ANSI_Comma],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_MINUS], [NSNumber numberWithInt:OSX_kVK_ANSI_Minus],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_PERIOD], [NSNumber numberWithInt:OSX_kVK_ANSI_Period],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_SLASH], [NSNumber numberWithInt:OSX_kVK_ANSI_Slash],
+
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_0], [NSNumber numberWithInt:OSX_kVK_ANSI_0],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_1], [NSNumber numberWithInt:OSX_kVK_ANSI_1],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_2], [NSNumber numberWithInt:OSX_kVK_ANSI_2],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_3], [NSNumber numberWithInt:OSX_kVK_ANSI_3],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_4], [NSNumber numberWithInt:OSX_kVK_ANSI_4],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_5], [NSNumber numberWithInt:OSX_kVK_ANSI_5],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_6], [NSNumber numberWithInt:OSX_kVK_ANSI_6],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_7], [NSNumber numberWithInt:OSX_kVK_ANSI_7],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_8], [NSNumber numberWithInt:OSX_kVK_ANSI_8],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_9], [NSNumber numberWithInt:OSX_kVK_ANSI_9],
+
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_SEMICOLON], [NSNumber numberWithInt:OSX_kVK_ANSI_Semicolon],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_EQUALS], [NSNumber numberWithInt:OSX_kVK_ANSI_Equal],
+
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_A], [NSNumber numberWithInt:OSX_kVK_ANSI_A],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_B], [NSNumber numberWithInt:OSX_kVK_ANSI_B],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_C], [NSNumber numberWithInt:OSX_kVK_ANSI_C],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_D], [NSNumber numberWithInt:OSX_kVK_ANSI_D],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_E], [NSNumber numberWithInt:OSX_kVK_ANSI_E],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F], [NSNumber numberWithInt:OSX_kVK_ANSI_F],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_G], [NSNumber numberWithInt:OSX_kVK_ANSI_G],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_H], [NSNumber numberWithInt:OSX_kVK_ANSI_H],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_I], [NSNumber numberWithInt:OSX_kVK_ANSI_I],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_J], [NSNumber numberWithInt:OSX_kVK_ANSI_J],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_K], [NSNumber numberWithInt:OSX_kVK_ANSI_K],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_L], [NSNumber numberWithInt:OSX_kVK_ANSI_L],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_M], [NSNumber numberWithInt:OSX_kVK_ANSI_M],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_N], [NSNumber numberWithInt:OSX_kVK_ANSI_N],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_O], [NSNumber numberWithInt:OSX_kVK_ANSI_O],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_P], [NSNumber numberWithInt:OSX_kVK_ANSI_P],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_Q], [NSNumber numberWithInt:OSX_kVK_ANSI_Q],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_R], [NSNumber numberWithInt:OSX_kVK_ANSI_R],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_S], [NSNumber numberWithInt:OSX_kVK_ANSI_S],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_T], [NSNumber numberWithInt:OSX_kVK_ANSI_T],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_U], [NSNumber numberWithInt:OSX_kVK_ANSI_U],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_V], [NSNumber numberWithInt:OSX_kVK_ANSI_V],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_W], [NSNumber numberWithInt:OSX_kVK_ANSI_W],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_X], [NSNumber numberWithInt:OSX_kVK_ANSI_X],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_Y], [NSNumber numberWithInt:OSX_kVK_ANSI_Y],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_Z], [NSNumber numberWithInt:OSX_kVK_ANSI_Z],
+
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_OPEN_BRACKET], [NSNumber numberWithInt:OSX_kVK_ANSI_LeftBracket],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_BACK_SLASH], [NSNumber numberWithInt:OSX_kVK_ANSI_Backslash],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_CLOSE_BRACKET], [NSNumber numberWithInt:OSX_kVK_ANSI_RightBracket],
+
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_NUMPAD0], [NSNumber numberWithInt:OSX_kVK_ANSI_Keypad0],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_NUMPAD1], [NSNumber numberWithInt:OSX_kVK_ANSI_Keypad1],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_NUMPAD2], [NSNumber numberWithInt:OSX_kVK_ANSI_Keypad2],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_NUMPAD3], [NSNumber numberWithInt:OSX_kVK_ANSI_Keypad3],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_NUMPAD4], [NSNumber numberWithInt:OSX_kVK_ANSI_Keypad4],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_NUMPAD5], [NSNumber numberWithInt:OSX_kVK_ANSI_Keypad5],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_NUMPAD6], [NSNumber numberWithInt:OSX_kVK_ANSI_Keypad6],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_NUMPAD7], [NSNumber numberWithInt:OSX_kVK_ANSI_Keypad7],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_NUMPAD8], [NSNumber numberWithInt:OSX_kVK_ANSI_Keypad8],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_NUMPAD9], [NSNumber numberWithInt:OSX_kVK_ANSI_Keypad9],
+
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_MULTIPLY], [NSNumber numberWithInt:OSX_kVK_ANSI_KeypadMultiply],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_ADD], [NSNumber numberWithInt:OSX_kVK_ANSI_KeypadPlus],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_SUBTRACT], [NSNumber numberWithInt:OSX_kVK_ANSI_KeypadMinus],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_DECIMAL], [NSNumber numberWithInt:OSX_kVK_ANSI_KeypadDecimal],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_DIVIDE], [NSNumber numberWithInt:OSX_kVK_ANSI_KeypadDivide],
+
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F1], [NSNumber numberWithInt:OSX_F1],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F2], [NSNumber numberWithInt:OSX_F2],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F3], [NSNumber numberWithInt:OSX_F3],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F4], [NSNumber numberWithInt:OSX_F4],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F5], [NSNumber numberWithInt:OSX_F5],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F6], [NSNumber numberWithInt:OSX_F6],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F7], [NSNumber numberWithInt:OSX_F7],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F8], [NSNumber numberWithInt:OSX_F8],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F9], [NSNumber numberWithInt:OSX_F9],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F10], [NSNumber numberWithInt:OSX_F10],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F11], [NSNumber numberWithInt:OSX_F11],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F12], [NSNumber numberWithInt:OSX_F12],
+
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_DELETE], [NSNumber numberWithInt:OSX_ForwardDelete],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_HELP], [NSNumber numberWithInt:OSX_Help],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_META], [NSNumber numberWithInt:OSX_Command],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_BACK_QUOTE], [NSNumber numberWithInt:OSX_kVK_ANSI_Grave],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_QUOTE], [NSNumber numberWithInt:OSX_kVK_ANSI_Quote],
+
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F13], [NSNumber numberWithInt:OSX_F13],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F14], [NSNumber numberWithInt:OSX_F14],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F15], [NSNumber numberWithInt:OSX_F15],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F16], [NSNumber numberWithInt:OSX_F16],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F17], [NSNumber numberWithInt:OSX_F17],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F18], [NSNumber numberWithInt:OSX_F18],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F19], [NSNumber numberWithInt:OSX_F19],
+                [NSNumber numberWithInt:java_awt_event_KeyEvent_VK_F20], [NSNumber numberWithInt:OSX_F20],
+                nil
+        ];
+
+        [osx2javaMap retain];
+    }
+
+    id val = [osx2javaMap objectForKey : [NSNumber numberWithInt : osxKeyCode]];
+    if (nil != val)
+        return [val intValue];
+
+    return java_awt_event_KeyEvent_VK_UNDEFINED;
+}
+
+jstring Java_java_awt_desktop_SystemHotkey_osxKeyCodeDescription(JNIEnv* env, jclass clazz, jint osxKeyCode) {
+    static NSDictionary * osxCode2DescMap = nil;
+    if (osxCode2DescMap == nil) {
+        osxCode2DescMap = [NSDictionary dictionaryWithObjectsAndKeys:
+                @"A", [NSNumber numberWithInt:kVK_ANSI_A],
+                @"S", [NSNumber numberWithInt:kVK_ANSI_S],
+                @"D", [NSNumber numberWithInt:kVK_ANSI_D],
+                @"F", [NSNumber numberWithInt:kVK_ANSI_F],
+                @"H", [NSNumber numberWithInt:kVK_ANSI_H],
+                @"G", [NSNumber numberWithInt:kVK_ANSI_G],
+                @"Z", [NSNumber numberWithInt:kVK_ANSI_Z],
+                @"X", [NSNumber numberWithInt:kVK_ANSI_X],
+                @"C", [NSNumber numberWithInt:kVK_ANSI_C],
+                @"V", [NSNumber numberWithInt:kVK_ANSI_V],
+                @"B", [NSNumber numberWithInt:kVK_ANSI_B],
+                @"Q", [NSNumber numberWithInt:kVK_ANSI_Q],
+                @"W", [NSNumber numberWithInt:kVK_ANSI_W],
+                @"E", [NSNumber numberWithInt:kVK_ANSI_E],
+                @"R", [NSNumber numberWithInt:kVK_ANSI_R],
+                @"Y", [NSNumber numberWithInt:kVK_ANSI_Y],
+                @"T", [NSNumber numberWithInt:kVK_ANSI_T],
+                @"1", [NSNumber numberWithInt:kVK_ANSI_1],
+                @"2", [NSNumber numberWithInt:kVK_ANSI_2],
+                @"3", [NSNumber numberWithInt:kVK_ANSI_3],
+                @"4", [NSNumber numberWithInt:kVK_ANSI_4],
+                @"6", [NSNumber numberWithInt:kVK_ANSI_6],
+                @"5", [NSNumber numberWithInt:kVK_ANSI_5],
+                @"Equal", [NSNumber numberWithInt:kVK_ANSI_Equal],
+                @"9", [NSNumber numberWithInt:kVK_ANSI_9],
+                @"7", [NSNumber numberWithInt:kVK_ANSI_7],
+                @"Minus", [NSNumber numberWithInt:kVK_ANSI_Minus],
+                @"8", [NSNumber numberWithInt:kVK_ANSI_8],
+                @"0", [NSNumber numberWithInt:kVK_ANSI_0],
+                @"RightBracket", [NSNumber numberWithInt:kVK_ANSI_RightBracket],
+                @"O", [NSNumber numberWithInt:kVK_ANSI_O],
+                @"U", [NSNumber numberWithInt:kVK_ANSI_U],
+                @"LeftBracket", [NSNumber numberWithInt:kVK_ANSI_LeftBracket],
+                @"I", [NSNumber numberWithInt:kVK_ANSI_I],
+                @"P", [NSNumber numberWithInt:kVK_ANSI_P],
+                @"L", [NSNumber numberWithInt:kVK_ANSI_L],
+                @"J", [NSNumber numberWithInt:kVK_ANSI_J],
+                @"Quote", [NSNumber numberWithInt:kVK_ANSI_Quote],
+                @"K", [NSNumber numberWithInt:kVK_ANSI_K],
+                @"Semicolon", [NSNumber numberWithInt:kVK_ANSI_Semicolon],
+                @"Backslash", [NSNumber numberWithInt:kVK_ANSI_Backslash],
+                @"Comma", [NSNumber numberWithInt:kVK_ANSI_Comma],
+                @"Slash", [NSNumber numberWithInt:kVK_ANSI_Slash],
+                @"N", [NSNumber numberWithInt:kVK_ANSI_N],
+                @"M", [NSNumber numberWithInt:kVK_ANSI_M],
+                @"Period", [NSNumber numberWithInt:kVK_ANSI_Period],
+                @"Grave", [NSNumber numberWithInt:kVK_ANSI_Grave],
+                @"KeypadDecimal", [NSNumber numberWithInt:kVK_ANSI_KeypadDecimal],
+                @"KeypadMultiply", [NSNumber numberWithInt:kVK_ANSI_KeypadMultiply],
+                @"KeypadPlus", [NSNumber numberWithInt:kVK_ANSI_KeypadPlus],
+                @"KeypadClear", [NSNumber numberWithInt:kVK_ANSI_KeypadClear],
+                @"KeypadDivide", [NSNumber numberWithInt:kVK_ANSI_KeypadDivide],
+                @"KeypadEnter", [NSNumber numberWithInt:kVK_ANSI_KeypadEnter],
+                @"KeypadMinus", [NSNumber numberWithInt:kVK_ANSI_KeypadMinus],
+                @"KeypadEquals", [NSNumber numberWithInt:kVK_ANSI_KeypadEquals],
+                @"Keypad0", [NSNumber numberWithInt:kVK_ANSI_Keypad0],
+                @"Keypad1", [NSNumber numberWithInt:kVK_ANSI_Keypad1],
+                @"Keypad2", [NSNumber numberWithInt:kVK_ANSI_Keypad2],
+                @"Keypad3", [NSNumber numberWithInt:kVK_ANSI_Keypad3],
+                @"Keypad4", [NSNumber numberWithInt:kVK_ANSI_Keypad4],
+                @"Keypad5", [NSNumber numberWithInt:kVK_ANSI_Keypad5],
+                @"Keypad6", [NSNumber numberWithInt:kVK_ANSI_Keypad6],
+                @"Keypad7", [NSNumber numberWithInt:kVK_ANSI_Keypad7],
+                @"Keypad8", [NSNumber numberWithInt:kVK_ANSI_Keypad8],
+                @"Keypad9", [NSNumber numberWithInt:kVK_ANSI_Keypad9],
+
+                    /* keycodes for keys that are independent of keyboard layout*/
+                @"Return", [NSNumber numberWithInt:kVK_Return],
+                @"Tab", [NSNumber numberWithInt:kVK_Tab],
+                @"Space", [NSNumber numberWithInt:kVK_Space],
+                @"Delete", [NSNumber numberWithInt:kVK_Delete],
+                @"Escape", [NSNumber numberWithInt:kVK_Escape],
+                @"Command", [NSNumber numberWithInt:kVK_Command],
+                @"Shift", [NSNumber numberWithInt:kVK_Shift],
+                @"CapsLock", [NSNumber numberWithInt:kVK_CapsLock],
+                @"Option", [NSNumber numberWithInt:kVK_Option],
+                @"Control", [NSNumber numberWithInt:kVK_Control],
+                @"RightCommand", [NSNumber numberWithInt:kVK_RightCommand],
+                @"RightShift", [NSNumber numberWithInt:kVK_RightShift],
+                @"RightOption", [NSNumber numberWithInt:kVK_RightOption],
+                @"RightControl", [NSNumber numberWithInt:kVK_RightControl],
+                @"Function", [NSNumber numberWithInt:kVK_Function],
+                @"F17", [NSNumber numberWithInt:kVK_F17],
+                @"VolumeUp", [NSNumber numberWithInt:kVK_VolumeUp],
+                @"VolumeDown", [NSNumber numberWithInt:kVK_VolumeDown],
+                @"Mute", [NSNumber numberWithInt:kVK_Mute],
+                @"F18", [NSNumber numberWithInt:kVK_F18],
+                @"F19", [NSNumber numberWithInt:kVK_F19],
+                @"F20", [NSNumber numberWithInt:kVK_F20],
+                @"F5", [NSNumber numberWithInt:kVK_F5],
+                @"F6", [NSNumber numberWithInt:kVK_F6],
+                @"F7", [NSNumber numberWithInt:kVK_F7],
+                @"F3", [NSNumber numberWithInt:kVK_F3],
+                @"F8", [NSNumber numberWithInt:kVK_F8],
+                @"F9", [NSNumber numberWithInt:kVK_F9],
+                @"F11", [NSNumber numberWithInt:kVK_F11],
+                @"F13", [NSNumber numberWithInt:kVK_F13],
+                @"F16", [NSNumber numberWithInt:kVK_F16],
+                @"F14", [NSNumber numberWithInt:kVK_F14],
+                @"F10", [NSNumber numberWithInt:kVK_F10],
+                @"F12", [NSNumber numberWithInt:kVK_F12],
+                @"F15", [NSNumber numberWithInt:kVK_F15],
+                @"Help", [NSNumber numberWithInt:kVK_Help],
+                @"Home", [NSNumber numberWithInt:kVK_Home],
+                @"PageUp", [NSNumber numberWithInt:kVK_PageUp],
+                @"ForwardDelete", [NSNumber numberWithInt:kVK_ForwardDelete],
+                @"F4", [NSNumber numberWithInt:kVK_F4],
+                @"End", [NSNumber numberWithInt:kVK_End],
+                @"F2", [NSNumber numberWithInt:kVK_F2],
+                @"PageDown", [NSNumber numberWithInt:kVK_PageDown],
+                @"F1", [NSNumber numberWithInt:kVK_F1],
+                @"LeftArrow", [NSNumber numberWithInt:kVK_LeftArrow],
+                @"RightArrow", [NSNumber numberWithInt:kVK_RightArrow],
+                @"DownArrow", [NSNumber numberWithInt:kVK_DownArrow],
+                @"UpArrow", [NSNumber numberWithInt:kVK_UpArrow],
+                nil
+        ];
+
+        [osxCode2DescMap retain];
+    }
+
+    NSString * val = [osxCode2DescMap objectForKey : [NSNumber numberWithInt : osxKeyCode]];
+    if (val == nil)
+        return NULL;
+
+    return (*env)->NewStringUTF(env, val.UTF8String);
+}
+
+static NSDictionary * getDefaultParams() {
+    static NSDictionary * sid2defaults = nil;
+    if (sid2defaults == nil) {
+        sid2defaults = [NSDictionary dictionaryWithObjectsAndKeys:
+                [DefaultParams create:@"@$b" enabled:NO], @"com.apple.BluetoothFileExchange - Send File To Bluetooth Device - sendFileUsingBluetoothOBEXService",
+                [DefaultParams create:@"@^$c" enabled:YES], @"com.apple.ChineseTextConverterService - Convert Text from Simplified to Traditional Chinese - convertTextToTraditionalChinese",
+                [DefaultParams create:@"@~^$c" enabled:YES], @"com.apple.ChineseTextConverterService - Convert Text from Traditional to Simplified Chinese - convertTextToSimplifiedChinese",
+                [DefaultParams create:@"@$l" enabled:YES], @"com.apple.Safari - Search With %WebSearchProvider@ - searchWithWebSearchProvider",
+                [DefaultParams create:@"@*" enabled:NO], @"com.apple.ScriptEditor2 - Script Editor/Get Result of AppleScript - runAsAppleScript",
+                [DefaultParams create:@"@$f" enabled:NO], @"com.apple.SpotlightService - SEARCH_WITH_SPOTLIGHT - doSearchWithSpotlight",
+                [DefaultParams create:@"@$y" enabled:YES], @"com.apple.Stickies - Make Sticky - makeStickyFromTextService",
+                [DefaultParams create:@"@$m" enabled:YES], @"com.apple.Terminal - Open man Page in Terminal - openManPage",
+                [DefaultParams create:@"@$a" enabled:YES], @"com.apple.Terminal - Search man Page Index in Terminal - searchManPages",
+                nil
+        ];
+
+        [sid2defaults retain];
+    }
+
+    return sid2defaults;
+}
+
+static NSMutableDictionary * createDefaultParams() {
+    NSDictionary * sid2defaults = getDefaultParams();
+    NSMutableDictionary * result = [NSMutableDictionary dictionaryWithCapacity:[sid2defaults count]];
+    [result setDictionary:sid2defaults];
+    return result;
+}

src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m

@@ -1222,18 +1222,10 @@ static NSDictionary* prebuiltFamilyNames() {
              @"FiraCode-Regular" : @"Fira Code",
              @"FiraCode-Retina" : @"Fira Code",
              @"Inconsolata" : @"Inconsolata",
-             @"JetBrainsMono520-Bold" : @"JetBrains Mono 520",
-             @"JetBrainsMono520-Regular" : @"JetBrains Mono 520",
-             @"JetBrainsMono520-Thin" : @"JetBrains Mono 520",
-             @"JetBrainsMonoExpanded-BoldExp" : @"JetBrains Mono Expanded",
-             @"JetBrainsMonoExpanded-Exp" : @"JetBrains Mono Expanded",
-             @"JetBrainsMonoExpanded-Thin" : @"JetBrains Mono Expanded",
-             @"JetBrainsMonoExpanded520-BdEx" : @"JetBrains Mono Expanded 520",
-             @"JetBrainsMonoExpanded520-Exp" : @"JetBrains Mono Expanded 520",
-             @"JetBrainsMonoExpanded520-Thin" : @"JetBrains Mono Expanded 520",
-             @"JetBrainsmono-Bold" : @"JetBrains Mono",
-             @"JetBrainsmono-Regular" : @"JetBrains Mono",
-             @"JetBrainsmono-Thin" : @"JetBrains Mono",
+             @"JetBrainsMono-Bold" : @"JetBrains Mono",
+             @"JetBrainsMono-Regular" : @"JetBrains Mono",
+             @"JetBrainsMono-Italic" : @"JetBrains Mono",
+             @"JetBrainsMono-BoldItalic" : @"JetBrains Mono",
              @"Roboto-Light" : @"Roboto",
              @"Roboto-Thin" : @"Roboto",
              @"SourceCodePro-Bold" : @"Source Code Pro",

src/java.desktop/share/classes/java/awt/Component.java

@@ -615,7 +615,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
      */
     long eventMask = AWTEvent.INPUT_METHODS_ENABLED_MASK;
 
-    private static final boolean INPUT_METHODS_DISABLED;
+    private static boolean INPUT_METHODS_DISABLED;
 
     /**
      * Static properties for incremental drawing.
@@ -10530,5 +10530,11 @@ public abstract class Component implements ImageObserver, MenuContainer,
     void updateZOrder() {
         peer.setZOrder(getHWPeerAboveMe());
     }
-
+    /**
+     * Disable IM-events dispatching (global).
+     * Usage of IM under Linux can cause freezes and crashes, disabling increases stability
+     */
+    public static void disableInputMethodSupport() {
+        INPUT_METHODS_DISABLED = true;
+    }
 }

src/java.desktop/share/classes/java/awt/Window.java

@@ -3984,6 +3984,19 @@ public class Window extends Container implements Accessible {
         hasCustomDecoration = true;
     }
 
+    private volatile boolean ignoreMouseEvents;
+
+    boolean isIgnoreMouseEvents() {
+        return ignoreMouseEvents;
+    }
+
+    /**
+     * Set via reflection (JB JdkEx API).
+     */
+    void setIgnoreMouseEvents(boolean ignore) {
+        ignoreMouseEvents = ignore;
+    }
+
     // ************************** MIXING CODE *******************************
 
     // A window has an owner, but it does NOT have a container

src/java.desktop/share/classes/java/awt/desktop/SystemHotkey.java

@@ -0,0 +1,87 @@
+package java.awt.desktop;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+
+import sun.util.logging.PlatformLogger;
+
+import javax.swing.*;
+import java.awt.event.KeyEvent;
+import java.awt.event.InputEvent;
+
+/**
+ * Provides info about system hotkeys
+ */
+public class SystemHotkey extends AWTKeyStroke {
+    private static final PlatformLogger ourLog = PlatformLogger.getLogger(java.awt.desktop.SystemHotkey.class.getName());
+    private static final Map<Integer, String> ourCodeDescriptionCache = new HashMap<>();
+
+    private final int myNativeKeyCode;
+    private final String myDescription;
+    
+    SystemHotkey(char keyChar, int javaKeyCode, int javaModifiers, String description, int nativeKeyCode) {
+      super(keyChar, javaKeyCode, javaModifiers, true);
+      this.myNativeKeyCode = nativeKeyCode;
+      this.myDescription = description;
+    }
+    
+    public String toString() {
+      return String.format("desc='%s' char=%s mod='%s' nativeKeyCode=0x%X ['%s'] javaKeyCode=0x%X",
+              String.valueOf(myDescription), String.valueOf(getKeyChar()), InputEvent.getModifiersExText(getModifiers()),
+              myNativeKeyCode, getOsxKeyCodeDescription(myNativeKeyCode), getKeyCode());
+    }
+
+    /**
+     * Gets hotkey description
+     * @return hotkey description
+     */
+    public String getDescription() {
+        return myDescription;
+    }
+
+    /**
+     * Reads all registered hotkeys
+     * @return list of all registered hotkeys
+     */
+    public static List<SystemHotkey> readSystemHotkeys() {
+        final SystemHotkeyReader reader = new SystemHotkeyReader();
+        reader.readSystemHotkeys();
+        return reader.getResult();
+    }
+
+    /**
+     * Gets virtual code description
+     * @param code (virtual keycode)
+     * @return virtual keycode description
+     */
+    private static String getOsxKeyCodeDescription(int code) {
+        return ourCodeDescriptionCache.computeIfAbsent(code, (c)->{
+            final String desc = osxKeyCodeDescription(c);
+            return desc == null || desc.isEmpty() ? String.format("Unknown_key_code_0x%X", c) : desc;
+        });
+    }
+
+    private static native String osxKeyCodeDescription(int osxCode);
+}
+
+class SystemHotkeyReader {
+    private final List<SystemHotkey> myResult = new ArrayList<>();
+
+    void add(int keyCode, String keyChar, int modifiers, String desc) {
+        myResult.add(new SystemHotkey(
+                keyChar == null || keyChar.isEmpty() ? KeyEvent.CHAR_UNDEFINED : keyChar.charAt(0),
+                keyCode == -1 ? KeyEvent.VK_UNDEFINED : osx2java(keyCode),
+                modifiers, desc, keyCode
+        ));
+    }
+
+    List<SystemHotkey> getResult() { return myResult; }
+
+    native void readSystemHotkeys();
+
+    private static native int osx2java(int osxCode);
+}

src/java.desktop/share/classes/javax/swing/BufferStrategyPaintManager.java

@@ -496,18 +496,9 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
                     }
                 }
 
-                if (isPaint) {
-                    // Fallback to normal painting in undecorated non-opaque dialogs
-                    // and frames to resolve black background problem
-                    Window window = SunToolkit.getContainingWindow(c);
-                    if ((window instanceof Dialog && ((Dialog)window).isUndecorated() ||
-                            window instanceof Frame && ((Frame)window).isUndecorated()) &&
-                            bsg != null && !window.isOpaque() &&
-                            ((SunGraphics2D)bsg).getSurfaceData().getTransparency() ==
-                                    Transparency.OPAQUE) {
-                        return false;
-                    }
-                }
+                if (bsg != null && !c.isOpaque() &&
+                        ((SunGraphics2D)bsg).getSurfaceData().getTransparency() ==
+                                Transparency.OPAQUE) return false;
 
                 if (isPaint && c == rootJ && x == 0 && y == 0 &&
                       c.getWidth() == w && c.getHeight() == h) {

src/java.desktop/share/classes/sun/font/FileFont.java

@@ -111,6 +111,10 @@ public abstract class FileFont extends PhysicalFont {
         return 1; // DEFAULT_CHARSET
     }
 
+    int getFontDataSize() {
+        return fileSize;
+    }
+
     /*
      * This is the public interface. The subclasses need to implement
      * this. The returned block may be longer than the requested length.

src/java.desktop/share/classes/sun/font/FileFontStrike.java

@@ -404,7 +404,8 @@ public class FileFontStrike extends PhysicalStrike {
                                                   int glyphCode,
                                                   boolean fracMetrics,
                                                   int rotation,
-                                                  byte charset);
+                                                  byte charset,
+                                                  int fontDataSize);
 
     private native long _getGlyphImageFromWindowsUsingDirectWrite(String family,
                                                                   int style,
@@ -441,7 +442,12 @@ public class FileFontStrike extends PhysicalStrike {
         }
         if (ptr == 0) {
             boolean fm = desc.fmHint == INTVAL_FRACTIONALMETRICS_ON;
-            ptr = _getGlyphImageFromWindows(family, style, size, glyphCode, fm, rotation, charset);
+            ptr = _getGlyphImageFromWindows(family, style, size, glyphCode, fm, rotation, charset,
+                                            fileFont.getFontDataSize());
+            if (ptr == 0 && FontUtilities.isLogging()) {
+                FontUtilities.getLogger().warning("Failed to render glyph via GDI: code=" + glyphCode
+                        + ", fontFamily=" + family + ", style=" + style + ", size=" + size + ", rotation=" + rotation);
+            }
             if (ptr != 0 && fm) {
                 Point2D.Float metrics = new Point2D.Float();
                 fileFont.getGlyphMetrics(pScalerContext, glyphCode, metrics);

src/java.desktop/share/classes/sun/font/Font2D.java

@@ -55,15 +55,16 @@ public abstract class Font2D {
     public static final int DEFAULT_RANK = 4;
 
     private static final String[] boldNames = {
-        "bold", "demibold", "demi-bold", "demi bold", "negreta", "demi", };
+        "bold", "demibold", "demi-bold", "demi bold", "negreta", "demi", "black", "coder-b"};
 
     private static final String[] italicNames = {
-        "italic", "cursiva", "oblique", "inclined", };
+        "italic", "cursiva", "oblique", "inclined", "-it", "-lightit", "coder-i"};
 
     private static final String[] boldItalicNames = {
           "bolditalic", "bold-italic", "bold italic",
           "boldoblique", "bold-oblique", "bold oblique",
-          "demibold italic", "negreta cursiva","demi oblique", };
+          "demibold italic", "negreta cursiva","demi oblique",
+          "-boldit", "-blackit", "coder-bi"};
 
     private static final FontRenderContext DEFAULT_FRC =
         new FontRenderContext(null, false, false);

src/java.desktop/share/classes/sun/font/FontFamily.java

@@ -28,12 +28,8 @@ package sun.font;
 import java.io.File;
 import java.awt.Font;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.HashMap;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.Locale;
 
 public class FontFamily {
 
@@ -263,6 +259,9 @@ public class FontFamily {
             if (initialized) {
                 return;
             }
+            if (FontUtilities.isMacOSX) {
+                fontSequence.sort(Comparator.comparing(FontAndStyle::getWeight));
+            }
             for (FontAndStyle fontAndStyle : fontSequence) {
                 doSetFont(fontAndStyle.font, fontAndStyle.style);
             }
@@ -494,6 +493,10 @@ public class FontFamily {
             font = inFont;
             style = inStyle;
         }
+
+        int getWeight() {
+            return font.getWeight();
+        }
     }
 
 }

src/java.desktop/share/classes/sun/font/SunFontManager.java

@@ -329,10 +329,10 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
 
         jreFontMap.put("JetBrains Mono Bold", "JetBrainsMono-Bold.ttf");
         jreFontMap.put("JetBrains Mono Regular", "JetBrainsMono-Regular.ttf");
+        jreFontMap.put("JetBrains Mono Italic", "JetBrainsMono-Italic.ttf");
+        jreFontMap.put("JetBrains Mono Bold Italic", "JetBrainsMono-Bold-Italic.ttf");
 
-        for (String ffile : jreFontMap.values()) {
-            jreBundledFontFiles.add(ffile);
-        }
+        jreBundledFontFiles.addAll(jreFontMap.values());
     }
 
     static {

src/java.desktop/share/classes/sun/font/TrueTypeFont.java

@@ -181,6 +181,7 @@ public class TrueTypeFont extends FileFont {
     private String localeFullName;
 
     private Byte supportedCharset;
+    private int fontDataSize;
 
     public TrueTypeFont(String platname, Object nativeNames, int fIndex,
                  boolean javaRasterizer)
@@ -539,11 +540,13 @@ public class TrueTypeFont extends FileFont {
                 fontIndex = fIndex;
                 buffer = readBlock(TTCHEADERSIZE+4*fIndex, 4);
                 headerOffset = buffer.getInt();
+                fontDataSize = Math.max(0, fileSize - headerOffset);
                 break;
 
             case v1ttTag:
             case trueTag:
             case ottoTag:
+                fontDataSize = fileSize;
                 break;
 
             default:
@@ -1780,6 +1783,11 @@ public class TrueTypeFont extends FileFont {
 
     private static native void getSupportedCharsetsForFamily(String familyName, Map<String, Byte> supportedCharsets);
 
+    @Override
+    int getFontDataSize() {
+        return fontDataSize;
+    }
+
     @Override
     public String toString() {
         return "** TrueType Font: Family="+familyName+ " Name="+fullName+

src/java.desktop/share/fonts/fonts.dir

@@ -1,4 +1,4 @@
-405
+449
 DroidSans-Bold.ttf -misc-droid sans-bold-r-normal--0-0-0-0-p-0-adobe-standard
 DroidSans-Bold.ttf -misc-droid sans-bold-r-normal--0-0-0-0-p-0-ascii-0
 DroidSans-Bold.ttf -misc-droid sans-bold-r-normal--0-0-0-0-p-0-iso10646-1
@@ -279,18 +279,62 @@ Inconsolata.ttf -misc-inconsolata-medium-r-normal--0-0-0-0-c-0-iso8859-1
 Inconsolata.ttf -misc-inconsolata-medium-r-normal--0-0-0-0-c-0-iso8859-15
 Inconsolata.ttf -misc-inconsolata-medium-r-normal--0-0-0-0-c-0-iso8859-2
 Inconsolata.ttf -misc-inconsolata-medium-r-normal--0-0-0-0-c-0-iso8859-9
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-ascii-0
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso10646-1
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-1
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-10
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-13
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-15
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-16
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-2
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-3
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-4
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-iso8859-9
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-koi8-r
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-koi8-u
+JetBrainsMono-Bold-Italic.ttf -misc-jetbrains mono-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-ascii-0
 JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso10646-1
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-1
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-10
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-13
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-15
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-16
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-2
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-3
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-4
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-iso8859-9
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-koi8-r
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-koi8-u
+JetBrainsMono-Bold.ttf -misc-jetbrains mono-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-ascii-0
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso10646-1
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso8859-1
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso8859-10
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso8859-13
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso8859-15
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso8859-16
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso8859-2
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso8859-3
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso8859-4
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-iso8859-9
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-koi8-r
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-koi8-u
+JetBrainsMono-Italic.ttf -misc-jetbrains mono-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-ascii-0
 JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-iso10646-1
-JetBrainsMono-Thin.ttf -misc-jetbrains mono thin-thin-r-normal--0-0-0-0-p-0-iso10646-1
-JetBrainsMono520-Bold.ttf -misc-jetbrains mono 520-bold-r-normal--0-0-0-0-p-0-iso10646-1
-JetBrainsMono520-Regular.ttf -misc-jetbrains mono 520-medium-r-normal--0-0-0-0-p-0-iso10646-1
-JetBrainsMono520-Thin.ttf -misc-jetbrains mono 520 thin-thin-r-normal--0-0-0-0-p-0-iso10646-1
-JetBrainsMonoExpanded-Bold.ttf -misc-jetbrains mono expanded exp-bold-r-expanded--0-0-0-0-p-0-iso10646-1
-JetBrainsMonoExpanded-Regular.ttf -misc-jetbrains mono expanded exp-medium-r-expanded--0-0-0-0-p-0-iso10646-1
-JetBrainsMonoExpanded-Thin.ttf -misc-jetbrains mono expanded th ex-thin-r-expanded--0-0-0-0-p-0-iso10646-1
-JetBrainsMonoExpanded520-Bold.ttf -misc-jetbrains mono expanded 520 exp-bold-r-expanded--0-0-0-0-p-0-iso10646-1
-JetBrainsMonoExpanded520-Regular.ttf -misc-jetbrains mono expanded 520 exp-medium-r-expanded--0-0-0-0-p-0-iso10646-1
-JetBrainsMonoExpanded520-Thin.ttf -misc-jetbrains mono expanded 520 th e-thin-r-expanded--0-0-0-0-p-0-iso10646-1
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-iso8859-1
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-iso8859-10
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-iso8859-13
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-iso8859-15
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-iso8859-16
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-iso8859-2
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-iso8859-3
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-iso8859-4
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-iso8859-9
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-koi8-r
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-koi8-u
+JetBrainsMono-Regular.ttf -misc-jetbrains mono-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
 Roboto-Light.ttf -misc-roboto light-light-r-normal--0-0-0-0-p-0-adobe-standard
 Roboto-Light.ttf -misc-roboto light-light-r-normal--0-0-0-0-p-0-ascii-0
 Roboto-Light.ttf -misc-roboto light-light-r-normal--0-0-0-0-p-0-iso10646-1

src/java.desktop/share/native/libfontmanager/freetypeScaler.c

@@ -30,14 +30,12 @@
 #include "sun_font_FreetypeFontScaler.h"
 
 #include <stdlib.h>
-#if defined(_WIN32) || defined(MACOSX)
-#define DISABLE_FONTCONFIG
-#endif
-
 #include <math.h>
 
-#ifndef DISABLE_FONTCONFIG
+#if !defined(_WIN32) && !defined(__APPLE_)
 #include <dlfcn.h>
+#else
+#define DISABLE_FONTCONFIG
 #endif
 
 #include "ft2build.h"
@@ -48,6 +46,7 @@
 #include FT_SIZES_H
 #include FT_OUTLINE_H
 #include FT_SYNTHESIS_H
+#include FT_MODULE_H
 #include FT_LCD_FILTER_H
 
 #ifndef DISABLE_FONTCONFIG
@@ -447,6 +446,52 @@ static unsigned long ReadTTFontFileFunc(FT_Stream stream,
     }
 }
 
+typedef FT_Error (*FT_Prop_Set_Func)(FT_Library library,
+                                     const FT_String*  module_name,
+                                     const FT_String*  property_name,
+                                     const void*       value );
+
+/**
+ * Prefer the older v35 freetype byte code interpreter.
+ */
+static void setInterpreterVersion(FT_Library library) {
+
+    char* props = getenv("FREETYPE_PROPERTIES");
+    int version = 35;
+    const char* module = "truetype";
+    const char* property = "interpreter-version";
+
+    /* If some one is setting this, don't override it */
+    if (props != NULL && strstr(property, props)) {
+        return;
+    }
+    /*
+     * FT_Property_Set was introduced in 2.4.11.
+     * Some older supported Linux OSes may not include it so look
+     * this up dynamically.
+     * And if its not available it doesn't matter, since the reason
+     * we need it dates from 2.7.
+     * On Windows & Mac the library is always bundled so it is safe
+     * to use directly in those cases.
+     */
+#if defined(_WIN32) || defined(__APPLE__)
+    FT_Property_Set(library, module, property, (void*)(&version));
+#else
+    void *lib = dlopen("libfreetype.so", RTLD_LOCAL|RTLD_LAZY);
+    if (lib == NULL) {
+        lib = dlopen("libfreetype.so.6", RTLD_LOCAL|RTLD_LAZY);
+        if (lib == NULL) {
+            return;
+        }
+    }
+    FT_Prop_Set_Func func = (FT_Prop_Set_Func)dlsym(lib, "FT_Property_Set");
+    if (func != NULL) {
+        func(library, module, property, (void*)(&version));
+    }
+    dlclose(lib);
+#endif
+}
+
 /*
  * Class:     sun_font_FreetypeFontScaler
  * Method:    initNativeScaler
@@ -486,6 +531,7 @@ Java_sun_font_FreetypeFontScaler_initNativeScaler(
         free(scalerInfo);
         return 0;
     }
+    setInterpreterVersion(scalerInfo->library);
 
 #define TYPE1_FROM_JAVA        2
 
@@ -662,16 +708,40 @@ static void setupLoadRenderFlags(FTScalerContext *context, int fcHintStyle, FcBo
 }
 #endif
 
+// values used by FreeType (as of version 2.10.1) for italics transformation matrix in FT_GlyphSlot_Oblique
+#define FT_MATRIX_ONE 0x10000
+#define FT_MATRIX_OBLIQUE_XY 0x0366A
+
+static void setupTransform(FT_Matrix* target, FTScalerContext *context) {
+    FT_Matrix* transform = &context->transform;
+    if (context->doItalize) {
+        // we cannot use FT_GlyphSlot_Oblique as it doesn't work well with arbitrary transforms,
+        // so we add corresponding shear transform to the requested glyph transformation
+        target->xx = FT_MATRIX_ONE;
+        target->xy = FT_MATRIX_OBLIQUE_XY;
+        target->yx = 0;
+        target->yy = FT_MATRIX_ONE;
+        FT_Matrix_Multiply(transform, target);
+    } else {
+        target->xx = transform->xx;
+        target->xy = transform->xy;
+        target->yx = transform->yx;
+        target->yy = transform->yy;
+    }
+}
+
 static int setupFTContext(JNIEnv *env, jobject font2D, FTScalerInfo *scalerInfo, FTScalerContext *context,
                           FT_Bool configureFont) {
+    FT_Matrix matrix;
     int errCode = 0;
     scalerInfo->env = env;
     scalerInfo->font2D = font2D;
 
     if (context != NULL) {
-        FT_UInt dpi = (FT_UInt) getScreenResolution(env);
-        FT_Set_Transform(scalerInfo->face, &context->transform, NULL);
+        setupTransform(&matrix, context);
+        FT_Set_Transform(scalerInfo->face, &matrix, NULL);
 
+        FT_UInt dpi = (FT_UInt) getScreenResolution(env);
         errCode = FT_Set_Char_Size(scalerInfo->face, 0, ADJUST_FONT_SIZE(context->ptsz, dpi), dpi, dpi);
         if (errCode) return errCode;
 
@@ -869,11 +939,8 @@ static int setupFTContext(JNIEnv *env, jobject font2D, FTScalerInfo *scalerInfo,
     return 0;
 }
 
-/* ftsynth.c uses (0x10000, 0x0366A, 0x0, 0x10000) matrix to get oblique
-   outline.  Therefore x coordinate will change by 0x0366A*y.
-   Note that y coordinate does not change. These values are based on
-   libfreetype version 2.9.1. */
-#define OBLIQUE_MODIFIER(y)  (context->doItalize ? ((y)*0x366A/0x10000) : 0)
+// using same values as for the transformation matrix
+#define OBLIQUE_MODIFIER(y)  (context->doItalize ? ((y)*FT_MATRIX_OBLIQUE_XY/FT_MATRIX_ONE) : 0)
 
 /* FT_GlyphSlot_Embolden (ftsynth.c) uses FT_MulFix(units_per_EM, y_scale) / 24
  * strength value when glyph format is FT_GLYPH_FORMAT_OUTLINE. This value has
@@ -1242,9 +1309,6 @@ Java_sun_font_FreetypeFontScaler_getGlyphImageNative(
     if (context->doBold) { /* if bold style */
         FT_GlyphSlot_Embolden(ftglyph);
     }
-    if (context->doItalize) { /* if oblique */
-        FT_GlyphSlot_Oblique(ftglyph);
-    }
 
     /* generate bitmap if it is not done yet
      e.g. if algorithmic styling is performed and style was added to outline */
@@ -1470,9 +1534,6 @@ static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D,
     if (context->doBold) { /* if bold style */
         FT_GlyphSlot_Embolden(ftglyph);
     }
-    if (context->doItalize) { /* if oblique */
-        FT_GlyphSlot_Oblique(ftglyph);
-    }
 
     FT_Outline_Translate(&ftglyph->outline,
                          FloatToF26Dot6(xpos),

src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java

@@ -25,23 +25,7 @@
 
 package sun.awt.X11;
 
-import java.awt.AWTEvent;
-import java.awt.Component;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.Frame;
-import java.awt.Graphics;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.Image;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.SystemColor;
-import java.awt.Window;
+import java.awt.*;
 import java.awt.event.ComponentEvent;
 import java.awt.event.FocusEvent;
 import java.awt.event.InvocationEvent;
@@ -52,6 +36,7 @@ import java.io.UnsupportedEncodingException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.*;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
@@ -1302,9 +1287,20 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
          */
         if (isSimpleWindow()) {
             if (target == XKeyboardFocusManagerPeer.getInstance().getCurrentFocusedWindow()) {
-                Window owner = getDecoratedOwner((Window)target);
-                ((XWindowPeer)AWTAccessor.getComponentAccessor().getPeer(owner)).
-                        requestWindowFocus(() -> {}, () -> {});
+                // fix for: JBR-1762 Flotating navigation bar closes on navigate
+                // Use the same logic as in MacOS (see LWWindowPeer, was introduced in:
+                // 54bb2dd097 'JBR-1417 JBR 11 does not support chain of popups)'
+                Window targetOwner = ((Window)target).getOwner();
+                while (targetOwner != null && (targetOwner.getOwner() != null && !targetOwner.isFocusableWindow())) {
+                    targetOwner = targetOwner.getOwner();
+                }
+
+                if (targetOwner != null) {
+                    final XWindowPeer xwndpeer = ((XWindowPeer)AWTAccessor.getComponentAccessor().getPeer(targetOwner));
+                    if (xwndpeer != null) {
+                        xwndpeer.requestWindowFocus(() -> {}, () -> {});
+                    }
+                }
             }
         }
     }

src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java

@@ -66,8 +66,8 @@ public final class X11GraphicsDevice extends GraphicsDevice
     private boolean shutdownHookRegistered;
     private int scale;
     private final AtomicBoolean isScaleFactorDefault = new AtomicBoolean(false);
-    private static final int XRM_XFT_DPI;
-    private static volatile int XFT_DPI;
+    private static volatile int xrmXftDpi;
+    private static volatile int xftDpi;
     private static final int GDK_SCALE;
     private static final double GDK_DPI_SCALE;
     private static final double GDK_SCALE_MULTIPLIER;
@@ -91,7 +91,7 @@ public final class X11GraphicsDevice extends GraphicsDevice
         if (!GraphicsEnvironment.isHeadless()) {
             initIDs();
         }
-        XRM_XFT_DPI = getXrmXftDpi(-1);
+        xrmXftDpi = getXrmXftDpi(-1);
         GDK_SCALE = (int)getGdkScale("GDK_SCALE", -1);
         GDK_DPI_SCALE = getGdkScale("GDK_DPI_SCALE", -1);
         GDK_SCALE_MULTIPLIER = GDK_SCALE != -1 ? GDK_SCALE * (GDK_DPI_SCALE != -1 ? GDK_DPI_SCALE : 1) : 1;
@@ -505,6 +505,7 @@ public final class X11GraphicsDevice extends GraphicsDevice
      * X11GraphicsEnvironment when the display mode has been changed.
      */
     public synchronized void displayChanged() {
+        xrmXftDpi = getXrmXftDpi(-1);
         scale = initScaleFactor(1);
         // On X11 the visuals do not change, and therefore we don't need
         // to reset the defaultConfig, config, doubleBufferVisuals,
@@ -540,9 +541,9 @@ public final class X11GraphicsDevice extends GraphicsDevice
     }
 
     public static void setXftDpi(int dpi) {
-        XFT_DPI = dpi;
+        xftDpi = dpi;
         boolean uiScaleEnabled = SunGraphicsEnvironment.isUIScaleEnabled(dpi);
-        double xftDpiScale = uiScaleEnabled ? XFT_DPI / 96.0 : 1.0;
+        double xftDpiScale = uiScaleEnabled ? xftDpi / 96.0 : 1.0;
         for (GraphicsDevice gd : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) {
             X11GraphicsDevice x11gd = (X11GraphicsDevice)gd;
             synchronized (x11gd.isScaleFactorDefault) {
@@ -567,11 +568,11 @@ public final class X11GraphicsDevice extends GraphicsDevice
             if (nativeScale > 0) {
                 return (int)Math.round(nativeScale * gdkScaleMult);
             }
-            if (XRM_XFT_DPI > 0) {
-                return (int)Math.round((XRM_XFT_DPI / 96.0) * gdkScaleMult);
+            if (xrmXftDpi > 0) {
+                return (int)Math.round((xrmXftDpi / 96.0) * gdkScaleMult);
             }
-            if (XFT_DPI > 0) {
-                return (int)Math.round((XFT_DPI / 96.0) * gdkScaleMult);
+            if (xftDpi > 0) {
+                return (int)Math.round((xftDpi / 96.0) * gdkScaleMult);
             }
         }
         return defValue;
@@ -581,8 +582,8 @@ public final class X11GraphicsDevice extends GraphicsDevice
      * Used externally for diagnostic purpose.
      */
     public String[][] getDpiInfo() {
-        int xftDpi = XRM_XFT_DPI != -1 ? XRM_XFT_DPI : XFT_DPI;
-        String xftDpiStr = xftDpi != -1 ? String.valueOf(xftDpi) : "undefined";
+        int dpi = xrmXftDpi != -1 ? xrmXftDpi : xftDpi;
+        String xftDpiStr = dpi != -1 ? String.valueOf(dpi) : "undefined";
         double gsettingsScale = getNativeScaleFactor(screen, -1);
         String gsettingsScaleStr = gsettingsScale != -1 ? String.valueOf(gsettingsScale) : "undefined";
         String gdkScaleStr = GDK_SCALE != -1 ? String.valueOf(GDK_SCALE) : "undefined";

src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp

@@ -30,6 +30,7 @@
 #include "awt_IconCursor.h"
 #include "awt_Win32GraphicsDevice.h"
 #include "ComCtl32Util.h"
+#include "shellapi.h"
 
 #include <windowsx.h>
 #include <uxtheme.h>
@@ -780,6 +781,24 @@ AwtFrame::Show()
         } else {
             ::ShowWindow(hwnd, SW_SHOWMAXIMIZED);
         }
+
+        // [tav] Workaround for unclear platform behaviour.
+        // When a custom decor frame is being shown maximized at the moment
+        // some another AWT window is still foreground - the frame can go
+        // in background when shown if:
+        // 1) the other AWT window is closed the moment after frame's show
+        // 2) some another maximized window is behind the frame, it steals activation
+        if (HasCustomDecoration()) {
+            HWND fgHWnd = ::GetForegroundWindow();
+            if (fgHWnd != NULL &&
+                GetComponent(fgHWnd) != NULL && // it's awt window
+                IsFocusableWindow() &&
+                IsAutoRequestFocus() &&
+                !::IsWindow(GetModalBlocker(GetHWnd())))
+            {
+                ::SetForegroundWindow(GetHWnd());
+            }
+        }
     }
     else if (m_isInputMethodWindow) {
         // Don't activate input methow window
@@ -1824,7 +1843,15 @@ MsgRouting AwtFrame::WmNcCalcSize(BOOL wParam, LPNCCALCSIZE_PARAMS lpncsp, LRESU
         // [moklev] Workaround for RIDER-27069, IDEA-211327
         if (!this->IsUndecorated()) {
             rect->right += this->ScaleUpX(1);
-            rect->bottom -= 1;
+            // [tav] Decrement NC bottom only when taskbar is bottom/autohide (JBR-1786)
+            APPBARDATA abData;
+            abData.cbSize = sizeof(abData);
+            if (::SHAppBarMessage(ABM_GETTASKBARPOS, &abData) &&
+                abData.uEdge == ABE_BOTTOM &&
+                ::SHAppBarMessage(ABM_GETSTATE, &abData) == ABS_AUTOHIDE)
+            {
+                rect->bottom -= 1;
+            }
         }
     }
     else {

src/java.desktop/windows/native/libfontmanager/lcdglyph.c

@@ -171,8 +171,8 @@ JNIEXPORT jboolean JNICALL
 
 JNIEXPORT jlong JNICALL
 Java_sun_font_FileFontStrike__1getGlyphImageFromWindows
-(JNIEnv *env, jobject unused,
- jstring fontFamily, jint style, jint size, jint glyphCode, jboolean fm, jint rotation, jbyte charset) {
+(JNIEnv *env, jobject unused, jstring fontFamily, jint style, jint size,
+jint glyphCode, jboolean fm, jint rotation, jbyte charset, jint fontDataSize) {
 
     GLYPHMETRICS glyphMetrics;
     LOGFONTW lf;
@@ -188,6 +188,7 @@ Java_sun_font_FileFontStrike__1getGlyphImageFromWindows
     LPWSTR name;
     HFONT oldFont, hFont;
     MAT2 mat2;
+    DWORD actualFontDataSize;
 
     unsigned short width;
     unsigned short height;
@@ -255,6 +256,17 @@ Java_sun_font_FileFontStrike__1getGlyphImageFromWindows
     }
     oldFont = SelectObject(hMemoryDC, hFont);
 
+    if (fontDataSize > 0) {
+        // We cannot specify via GDI which font file to use,
+        // so we check that it picks the exact font we need by validating font size.
+        // If it doesn't match, we cannot proceed, as same glyph code can correspond
+        // to a completely different glyph in the selected font.
+        actualFontDataSize = GetFontData(hMemoryDC, 0, 0, NULL, 0);
+        if (actualFontDataSize != fontDataSize) {
+            FREE_AND_RETURN;
+        }
+    }
+
     tmpBitmap = CreateCompatibleBitmap(hDesktopDC, 1, 1);
     if (tmpBitmap == NULL) {
         FREE_AND_RETURN;

test/hotspot/jtreg/jbProblemList.txt

@@ -42,18 +42,20 @@ applications/jcstress/acqrel/Test.java generic-all
 
 # :hotspot_compiler
 
-compiler/ciReplay/TestSAServer.java 8029528 generic-all
-compiler/codecache/stress/OverloadCompileQueueTest.java 8166554 generic-all
-compiler/codegen/Test6896617.java 8193479 generic-all
-compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8140405 generic-all
-compiler/jvmci/compilerToVM/GetFlagValueTest.java 8204459 generic-all
-compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java 8158860 generic-all
-compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java 8163894 generic-all
-compiler/tiered/LevelTransitionTest.java 8067651 generic-all
-compiler/types/correctness/CorrectnessTest.java 8066173 generic-all
-compiler/types/correctness/OffTest.java 8066173 generic-all
+compiler/ciReplay/TestSAServer.java                                                 8029528 generic-all
+compiler/codecache/stress/OverloadCompileQueueTest.java                             8166554 generic-all
+compiler/codegen/Test6896617.java                                                   8193479 generic-all
+compiler/codegen/aes/TestCipherBlockChainingEncrypt.java                            8219513 generic-all
+compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java                     8140405 generic-all
+compiler/jsr292/ContinuousCallSiteTargetChange.java                                 8222030 generic-all
+compiler/jvmci/compilerToVM/GetFlagValueTest.java                                   8204459 generic-all
+compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java                            8158860 generic-all
+compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java                        8163894 generic-all
+compiler/tiered/LevelTransitionTest.java                                            8067651 generic-all
+compiler/types/correctness/CorrectnessTest.java                                     8066173 generic-all
+compiler/types/correctness/OffTest.java                                             8066173 generic-all
 
-compiler/c2/Test6852078.java 8194310 generic-all
+compiler/c2/Test6852078.java                                                        8194310 generic-all
 
 applications/ctw/modules/java_desktop.java 8189604 windows-all
 applications/ctw/modules/java_desktop_2.java 8189604,8204842 generic-all
@@ -65,14 +67,15 @@ compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 8190680 generic-all
 
 # :hotspot_gc
 
-gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java 8156755 generic-all
-gc/survivorAlignment/TestPromotionToSurvivor.java 8129886 generic-all
-gc/g1/logging/TestG1LoggingFailure.java 8169634 generic-all
-gc/g1/humongousObjects/TestHeapCounters.java 8178918 generic-all
-gc/stress/gclocker/TestGCLockerWithParallel.java 8180622 generic-all
-gc/stress/gclocker/TestGCLockerWithG1.java 8180622 generic-all
-gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java 8177765 generic-all
-gc/stress/TestJNIBlockFullGC/TestJNIBlockFullGC.java 8192647 generic-all
+gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java                  8156755 generic-all
+gc/survivorAlignment/TestPromotionToSurvivor.java                                   8129886 generic-all
+gc/g1/logging/TestG1LoggingFailure.java                                             8169634 generic-all
+gc/g1/humongousObjects/TestHeapCounters.java                                        8178918 generic-all
+gc/stress/gclocker/TestGCLockerWithParallel.java                                    8180622 generic-all
+gc/stress/gclocker/TestGCLockerWithG1.java                                          8180622 generic-all
+gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java            8177765 generic-all
+gc/stress/TestJNIBlockFullGC/TestJNIBlockFullGC.java                                8192647 generic-all
+gc/stress/TestReclaimStringsLeaksMemory.java                                        8224847 generic-all
 
 #############################################################################
 
@@ -80,6 +83,9 @@ gc/stress/TestJNIBlockFullGC/TestJNIBlockFullGC.java 8192647 generic-all
 
 runtime/CompressedOops/UseCompressedOops.java                                       8079353 generic-all
 runtime/NMT/MallocStressTest.java                                                   8079353 generic-all
+runtime/SelectionResolution/InvokeInterfaceICCE.java                                8224795 generic-all
+runtime/SelectionResolution/InvokeVirtualICCE.java                                  8224795 generic-all
+runtime/SelectionResolution/InvokeVirtualSuccessTest.java                           8224795 generic-all
 runtime/SharedArchiveFile/SASymbolTableTest.java                                    8193639 solaris-all
 vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x001/TestDescription.java                 8013728 generic-all
 runtime/memory/ReadFromNoaccessArea.java                                            nobug   generic-all crash is the expected behaviour

test/jdk/javax/swing/JEditorPane/JEditorPanePreferredSizeTest/JEditorPanePreferredSizeTest3.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import javax.swing.*;
+import java.awt.*;
+
+public class JEditorPanePreferredSizeTest3 {
+    public static void main(String[] args) throws Exception {
+        Exception[] exception = new Exception[1];
+        SwingUtilities.invokeAndWait(() -> {
+            JEditorPane editorPane = createEditor();
+            Dimension initialSize = editorPane.getPreferredSize();
+            JEditorPane anotherPane = createEditor();
+            anotherPane.setSize(initialSize.width / 2, initialSize.height);
+            Dimension newSize = anotherPane.getPreferredSize();
+            if (newSize.height <= initialSize.height) {
+                exception[0] = new RuntimeException("Unexpected size: " + newSize + ", initial size: " + initialSize);
+            }
+        });
+        if (exception[0] != null) throw exception[0];
+    }
+
+    private static JEditorPane createEditor() {
+        return new JEditorPane("text/html", "Very long line");
+    }
+}

test/jdk/jb/java/awt/Focus/ChainOfPopupsFocusTest.java

@@ -0,0 +1,186 @@
+/*
+ * Copyright 2000-2019 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.KeyStroke;
+import javax.swing.Popup;
+import javax.swing.PopupFactory;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.FocusTraversalPolicy;
+import java.awt.KeyboardFocusManager;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.KeyEvent;
+
+/**
+ * @test
+ * @summary Regression test for JBR-1417: JBR 11 does not support chain of popups
+ * @requires (jdk.version.major >= 8)
+ * @run main ChainOfPopupsFocusTest
+ */
+
+/*
+ * Description: Test checks that focus goes to the parent popup when child popup is closed.
+ * Test opens several popups one by one, setting current popup as a parent for the next one.
+ * Then the popups are closed one by one. Test fails if focus went somewhere else than the parent popup.
+ */
+
+public class ChainOfPopupsFocusTest implements Runnable, ActionListener {
+
+    private static final int DEPTH = 5;
+    private static final String FRAMENAME = "MainFrame";
+    private static final String POPUPNAME = "Popup";
+
+    private static volatile Component focusOwner;
+    private static volatile int popupsCount;
+    private static Robot robot;
+    private JFrame frame;
+
+    public static void main(String[] args) throws Exception {
+
+        robot = new Robot();
+        robot.setAutoDelay(50);
+
+        ChainOfPopupsFocusTest test = new ChainOfPopupsFocusTest();
+        SwingUtilities.invokeAndWait(test);
+        robot.delay(3000);
+
+        try {
+            SwingUtilities.invokeAndWait(() ->
+                    focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner());
+            if(focusOwner == null || !focusOwner.getName().equals(FRAMENAME)) {
+                throw new RuntimeException("Test ERROR: " + FRAMENAME + " is not focused");
+            }
+
+            for (int count = 1; count <= DEPTH; count++) {
+                pressCtrlKey(KeyEvent.VK_N);
+                robot.delay(1000);
+            }
+
+            if(popupsCount != DEPTH) {
+                throw new RuntimeException("Test ERROR: Number of open popups is "
+                        + popupsCount + ", but " + DEPTH + " is expected");
+            }
+            for (int count = DEPTH-1; count >= 0; count--) {
+                pressCtrlKey(KeyEvent.VK_X);
+                robot.delay(1000);
+                SwingUtilities.invokeAndWait(() ->
+                        focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner());
+                String focusedComponent = (focusOwner != null ? focusOwner.getName() : "Nothing");
+                String expectedComponent = (count == 0 ? FRAMENAME : POPUPNAME + count);
+                if(!focusedComponent.equals(expectedComponent)) {
+                    throw new RuntimeException("Test FAILED: "
+                            + focusedComponent + " is focused instead of " + expectedComponent);
+                }
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> test.frame.dispose());
+            robot.delay(2000);
+        }
+        System.out.println("Test PASSED");
+    }
+
+    private static void pressCtrlKey(int vk) {
+        robot.keyPress(KeyEvent.VK_CONTROL);
+        robot.keyPress(vk);
+        robot.keyRelease(vk);
+        robot.keyRelease(KeyEvent.VK_CONTROL);
+    }
+
+    @Override
+    public void run() {
+        JTextArea area = createTextArea(FRAMENAME);
+        frame = new JFrame(getClass().getSimpleName());
+        frame.add(new JScrollPane(area));
+        frame.pack();
+        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+        frame.toFront();
+        area.requestFocusInWindow();
+    }
+
+    private JTextArea createTextArea(String locatedOn) {
+        JTextArea area = new JTextArea(20, 40);
+        area.setName(locatedOn);
+        area.registerKeyboardAction(this, "show", KeyStroke.getKeyStroke("control N"), JComponent.WHEN_FOCUSED);
+        area.registerKeyboardAction(event -> SwingUtilities.getWindowAncestor((Component) event.getSource()).setVisible(false), KeyStroke.getKeyStroke("control X"), JComponent.WHEN_FOCUSED);
+        area.addComponentListener(new ComponentAdapter() {
+            @Override
+            public void componentShown(ComponentEvent event) {
+                area.requestFocus();
+            }
+        });
+        return area;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent event) {
+        Component source = (Component) event.getSource();
+        switch (event.getActionCommand()) {
+            case "show":
+                Point point = source.getLocationOnScreen();
+                Component area = createTextArea(POPUPNAME + ++popupsCount);
+                Popup popup = PopupFactory.getSharedInstance().getPopup(source, new JScrollPane(area), point.x + 10, point.y + 10);
+                Window window = SwingUtilities.getWindowAncestor(area);
+                window.setAutoRequestFocus(true);
+                window.setFocusable(true);
+                window.setFocusableWindowState(true);
+                window.setFocusTraversalPolicy(new FocusTraversalPolicy() {
+                    @Override
+                    public Component getComponentAfter(Container container, Component component) {
+                        return area;
+                    }
+
+                    @Override
+                    public Component getComponentBefore(Container container, Component component) {
+                        return area;
+                    }
+
+                    @Override
+                    public Component getFirstComponent(Container container) {
+                        return area;
+                    }
+
+                    @Override
+                    public Component getLastComponent(Container container) {
+                        return area;
+                    }
+
+                    @Override
+                    public Component getDefaultComponent(Container container) {
+                        return area;
+                    }
+                });
+                popup.show();
+                break;
+            case "hide":
+                SwingUtilities.getWindowAncestor(source).setVisible(false);
+                break;
+        }
+    }
+}

test/jdk/jbProblemList.txt

@@ -137,6 +137,8 @@ java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java
 java/awt/Debug/DumpOnKey/DumpOnKey.java                                             8202667 windows-all,linux-all
 java/awt/Dialog/DialogAboveFrame/DialogAboveFrame.java                              8214923 windows-all,macosx-all
 java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java                          8215105 macosx-all,windows-all
+java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java                8225790 linux-all
+java/awt/Dialog/SiblingChildOrder/SiblingChildOrderTest.java                        8215105,8221383 macosx-all,windows-all
 java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java             8159069 windows-all
 java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java         8203047 macosx-all,linux-all,windows-all
 java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html                     8073636 macosx-all
@@ -197,6 +199,7 @@ java/awt/FontMetrics/MaxAdvanceIsMax.java
 java/awt/Frame/DisposeParentGC/DisposeParentGC.java                                 8079786,8055833 macosx-all,linux-all
 java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java 8198237 macosx-all
 java/awt/Frame/FramesGC/FramesGC.java                                               8079069 macosx-all
+java/awt/Frame/FrameLocation/FrameLocation.java                                     8019803 macosx-all
 java/awt/Frame/InvisibleOwner/InvisibleOwner.java                                   8169111 macosx-all,windows-all
 java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java                       8169472 windows-all
 java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java                       8022302 generic-all
@@ -207,27 +210,29 @@ java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameRes
 java/awt/Frame/WindowDragTest/WindowDragTest.java                                   8169470 generic-all
 java/awt/FullScreen/8013581/bug8013581.java                                         8169471 macosx-all,windows-all,linux-all
 java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java                            8047218 generic-all
-java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java                    8169469 windows-all,linux-all (linux: NPE commit testing)
+java/awt/FullScreen/DisplayChangeVITest/DisplayChangeVITest.java                    8169469,JBR-1897 windows-all,macosx-all,linux-all (linux: NPE commit testing)
 java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java                          7019055 windows-all,linux-all,macosx-all
-java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java    8169468 windows-all
+java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java    8169468 windows-all,macosx-all
+java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java 7188711 macosx-all
 java/awt/Graphics/CopyScaledArea/CopyScaledAreaTest.java                            8153299 windows-all
 java/awt/Graphics/LineClipTest.java                                                 JRE-898 macosx-all
-java/awt/Graphics2D/CopyAreaOOB.java                                                7001973 windows-all,macosx-all
+java/awt/Graphics2D/CopyAreaOOB.java                                                7001973 windows-all,macosx-all,linux-all
 java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java               8197796 generic-all
 java/awt/Graphics2D/DrawString/RotTransText.java                                    8197797 generic-all
 java/awt/Graphics2D/DrawString/TextRenderingTest.java                               8169464 windows-all
 java/awt/Graphics2D/FillTexturePaint/FillTexturePaint.java                          8169463 windows-all
 java/awt/Graphics2D/FlipDrawImage/FlipDrawImage.java                                8169462 windows-all
 java/awt/Graphics2D/ScaledTransform/ScaledTransform.java                            8165951 windows-all,linux-all
+java/awt/GraphicsDevice/CheckDisplayModes.java                                      8213119 macosx-all
 java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java                              8197814 macosx-all,linux-all,windows-all
 java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java              8197814 macosx-all,linux-all,windows-all
 java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java                            8000171 windows-all
 java/awt/JAWT/JAWT.sh                                                               8197798 windows-all
 java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html JRE-898 macosx-all,linux-all
 java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogButtonTest/EnqueueWithDialogButtonTest.java 8198623 macosx-all,windows-all,linux-all
-java/awt/KeyboardFocusmanager/TypeAhead/FreezeTest/FreezeTest.java                  8198623 macosx-all,windows-all
+java/awt/KeyboardFocusmanager/TypeAhead/FreezeTest/FreezeTest.java                  8198623 macosx-all,windows-all,linux-all
 java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html        8198624 macosx-all,linux-all,windows-all
-java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html                    8198626 macosx-all,windows-all
+java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html                    8198626 macosx-all,windows-all,linux-all
 java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java        8159252 generic-all
 java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html                          8169461 windows-all
 java/awt/List/KeyEventsTest/KeyEventsTest.html                                      8047703 windows-all
@@ -529,7 +534,7 @@ java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java
 java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java                                8196441 macosx-all,windows-all,linux-all
 java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java                                8196441 macosx-all,windows-all,linux-all
 java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java                                8196441 macosx-all,windows-all,linux-all
-java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java                        8177326 macosx-all,windows-all
+java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java                        8177326 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/DragWindowTest.java                                  8023562 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/ModalDialogEnterExitEventsTest.java                  JRE-898 macosx-all,windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java                               8005021 macosx-all,windows-all,linux-all
@@ -547,6 +552,7 @@ java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html
 java/awt/MouseInfo/GetPointerInfoTest.java                                          8158798 windows-all
 java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java             7124230 generic-all
 java/awt/Multiscreen/MultiScreenLocationTest/MultiScreenLocationTest.java           8155744 windows-all,linux-all
+java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html                     8168132 macosx-all,linux-all
 java/awt/Paint/PaintNativeOnUpdate.java                                             8028000 generic-all
 java/awt/Paint/bug8024864.java                                                      8176512 windows-all,macosx-all,linux-all
 java/awt/PrintJob/PrinterException.java                                             8194045 generic-all
@@ -559,6 +565,7 @@ java/awt/Scrollbar/ScrollbarMouseWheelTest/ScrollbarMouseWheelTest.java
 java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java          8061235,8159592,8134231 macosx-all,windows-all,linux-all
 java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java 8203004 linux-all
 java/awt/TextArea/AutoScrollOnSelectAndAppend/AutoScrollOnSelectAndAppend.java      8213120 macosx-all,linux-all, windows-all (windows, linux - time out)
+java/awt/TextArea/DisposeTest/TestDispose.java                                      JBR-1905 generic-all
 java/awt/TextArea/TextAreaScrolling/TextAreaScrolling.java                          8196300 windows-all
 java/awt/TextField/SelectionInvisibleTest/SelectionInvisibleTest.java               8169533 macosx-all,windows-all
 java/awt/Toolkit/DesktopProperties/rfe4758438.java                                  8193547 linux-all
@@ -579,7 +586,7 @@ java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java
 java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java                          8197575,8150540 macosx-all,windows-all
 java/awt/TrayIcon/TrayIconPopup/TrayIconPopupClickTest.java                         8197575,8150540 macosx-all,windows-all
 java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java                              8197575,8150540 macosx-all,windows-all
-java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java                          8196440 linux-all
+java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java                          8196440 linux-all,macosx-all (commit: mac OOME)
 java/awt/Window/8159168/SetShapeTest.java                                           8208507 generic-all
 java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java                  8142536 generic-all
 java/awt/Window/Grab/GrabTest.java                                                  8196019 macosx-all,windows-all,linux-all
@@ -594,6 +601,7 @@ java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java
 java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java                  8078999,8198690 macosx-all,linux-all,windows-all
 java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java       8013450 macosx-all,linux-all,windows-all (windows: commit testing time out)
 java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java                   8198690,8165218 macosx-all,linux-all,windows-all
+java/awt/Window/ShapedAndTranslucentWindows/Translucent.java                        8222328 linux-all,windows-all
 java/awt/Window/ShapedAndTranslucentWindows/TranslucentChoice.java                  8194129 macosx-all,windows-all,linux-all
 java/awt/Window/ShapedAndTranslucentWindows/TranslucentWindowClick.java             8194129 macosx-all,windows-all,linux-all
 java/awt/Window/AlwaysOnTop/AutoTestOnTop.java                                      6847593,8194045 macosx-all,windows-all,linux-all
@@ -609,7 +617,7 @@ java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java
 java/awt/dnd/BadSerializaionTest/BadSerializationTest.java                          8039082 generic-all
 java/awt/dnd/Button2DragTest/Button2DragTest.java                                   8157172 macosx-all,linux-all,windows-all
 java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java                    8202790 macosx-all,linux-all
-java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html               8215538 windows-all
+java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html               8215538 windows-all,macosx-all,linux-all (macosx-all,linux-all: commit)
 java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java                        8029680 macosx-all,linux-all,windows-all
 java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java                        8028998,8159694 macosx-all,windows-all,linux-all
 java/awt/dnd/ImageTransferTest/ImageTransferTest.java                               8176556 generic-all
@@ -917,7 +925,7 @@ javax/swing/JColorChooser/Test6541987.java
 javax/swing/JColorChooser/Test6827032.java                                          8197825 windows-all
 javax/swing/JColorChooser/Test7194184.java                                          8194126,8072110 linux-all,macosx-all,windows-all
 javax/swing/JColorChooser/Test8051548.java                                          8197552 macosx-all,windows-all,linux-all
-javax/swing/JComboBox/4743225/bug4743225.java                                       8171302 windows-all,macosx-all
+javax/swing/JComboBox/4743225/bug4743225.java                                       8171302 windows-all,macosx-all,linux-all
 javax/swing/JComboBox/6236162/bug6236162.java                                       8028707 windows-all,macosx-all
 javax/swing/JComboBox/6559152/bug6559152.java                                       8196090 windows-all,macosx-all,linux-all
 javax/swing/JComboBox/6607130/bug6607130.java                                       8196091 windows-all
@@ -937,6 +945,7 @@ javax/swing/JComponent/4337267/bug4337267.java
 javax/swing/JComponent/6683775/bug6683775.java                                      8172337 generic-all
 javax/swing/JComponent/7154030/bug7154030.java                                      7190978 generic-all
 javax/swing/DataTransfer/8059739/bug8059739.java                                    8199074 generic-all
+javax/swing/GraphicsConfigNotifier/StalePreferredSize.java                          8213121 macosx-all,windows-all
 javax/swing/GroupLayout/6613904/bug6613904.java                                     8199072 generic-all
 javax/swing/JEditorPane/5076514/bug5076514.java                                     8198321 generic-all
 javax/swing/JEditorPane/6917744/bug6917744.java                                     8213124 macosx-all,windows-all
@@ -954,6 +963,7 @@ javax/swing/JFileChooser/DeserializedJFileChooser/DeserializedJFileChooserTest.j
 javax/swing/JFrame/8016356/bug8016356.java                                          8169955 windows-all
 javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java                           8193942 generic-all
 javax/swing/JInternalFrame/5066752/bug5066752.java                                  8207850 macosx-all,windows-all
+javax/swing/JInternalFrame/8020708/bug8020708.java                                  8226230 linux-all
 javax/swing/JInternalFrame/8069348/bug8069348.java                                  8208570 macosx-all,windows-all,linux-all
 javax/swing/JInternalFrame/8145060/TestJInternalFrameMinimize.java                  8203918 windows-all,linux-all
 javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java                  8194944 macosx-all,windows-all,linux-all
@@ -961,7 +971,7 @@ javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java
 javax/swing/JInternalFrame/8160248/JInternalFrameDraggingTest.java                  8186513 generic-all
 javax/swing/JInternalFrame/DockIconRepaint/DockIconRepaint.java                     8208289 macosx-all
 javax/swing/JInternalFrame/Test6325652.java                                         8160880,8196467 linux-all,macosx-all,windows-all
-javax/swing/JInternalFrame/Test6505027.java                                         8172535 macosx-all,windows-all
+javax/swing/JInternalFrame/Test6505027.java                                         8172535 macosx-all,windows-all,linux-all
 javax/swing/JLabel/6596966/bug6596966.java                                          8197552,8040914 macosx-all,windows-all,linux-all
 javax/swing/JList/6462008/bug6462008.java                                           7156347 generic-all
 javax/swing/JMenu/4213634/bug4213634.java                                           8197552 macosx-all,windows-all,linux-all
@@ -976,7 +986,7 @@ javax/swing/JMenuItem/4171437/bug4171437.java
 javax/swing/JMenuItem/4654927/bug4654927.java                                       8172536 macosx-all,windows-all,linux-all
 javax/swing/JMenuItem/6209975/bug6209975.java                                       8204062 macosx-all,windows-all
 javax/swing/JMenuItem/6249972/bug6249972.java                                       8197552 macosx-all,windows-all,linux-all
-javax/swing/JPopupMenu/4458079/bug4458079.java                                      8040917 macosx-all,windows-all
+javax/swing/JPopupMenu/4458079/bug4458079.java                                      8040917 macosx-all,windows-all,linux-all
 javax/swing/JPopupMenu/4769039/bug4769039.java                                      8194045 generic-all
 javax/swing/JPopupMenu/4870644/bug4870644.java                                      8194130 macosx-all,linux-all
 javax/swing/JPopupMenu/4966112/bug4966112.java                                      8064915,7151826 macosx-all,linux-all
@@ -1021,7 +1031,7 @@ javax/swing/JTextArea/TextViewOOM/TextViewOOM.java
 javax/swing/JTextField/4306756/bug4306756.java                                      8194045 generic-all
 javax/swing/JTextField/8036819/bug8036819.java                                      8197552 macosx-all,windows-all,linux-all
 javax/swing/JToolTip/4846413/bug4846413.java                                        8172407 macosx-all,windows-all
-javax/swing/JTree/4330357/bug4330357.java                                           8029682,8003839 macosx-all,windows-all
+javax/swing/JTree/4330357/bug4330357.java                                           8029682,8003839 macosx-all,windows-all,linux-all
 javax/swing/JTree/4633594/JTreeFocusTest.java                                       8173125 macosx-all
 javax/swing/JTree/4908142/bug4908142.java                                           8197552,8172065 macosx-all,windows-all,linux-all
 javax/swing/JTree/4927934/bug4927934.java                                           8197552,8172063 macosx-all,windows-all,linux-all
@@ -1043,7 +1053,7 @@ javax/swing/Popup/TaskbarPositionTest.java
 javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java                        8065099,8208565 macosx-all,windows-all,linux-all
 javax/swing/PopupFactory/8048506/bug8048506.java                                    8202660 windows-all
 javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java                      8197552 macosx-all,windows-all,linux-all
-javax/swing/RepaintManager/IconifyTest/IconifyTest.java                             8072110 linux-all,windows-all
+javax/swing/RepaintManager/IconifyTest/IconifyTest.java                             8072110,8221903 linux-all,windows-all,macosx-all (commit: macosx)
 javax/swing/SpringLayout/4726194/bug4726194.java                                    8198399 generic-all
 javax/swing/SwingUtilities/4917669/bug4917669.java                                  8197552,8172064 macosx-all,windows-all,linux-all
 javax/swing/SwingUtilities/6797139/bug6797139.java                                  8198400 generic-all
@@ -1182,6 +1192,7 @@ com/sun/jdi/RedefineCrossEvent.java
 ############################################################################
 
 jdk/internal/platform/cgroup/TestCgroupMetrics.java                                 8222533 linux-all
+jdk/internal/platform/docker/TestSystemMetrics.java                                 8224502 linux-all
 
 # jdk_jfr
 

test/jdk/jbcommitProblemList.txt

@@ -2,12 +2,12 @@ java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
 java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java                          nobug macosx-all,windows-all
 java/awt/Choice/GetSizeTest/GetSizeTest.java                                                nobug macosx-all,windows-all
 java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java                          nobug windows-all,linux-all
+java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java                                    nobug macosx-all
 java/awt/Component/F10TopToplevel/F10TopToplevel.html                                       nobug linux-all
 java/awt/Component/PaintAll/PaintAll.java                                                   nobug linux-all
 java/awt/Container/isRemoveNotifyNeeded/JInternalFrameTest.java                             nobug generic-all
 java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java                            nobug macosx-all,windows-all
 java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java                              nobug macosx-all,windows-all
-java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java                        nobug macosx-all,windows-all,linux-all
 java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java        nobug macosx-all,windows-all
 java/awt/Dialog/SiblingChildOrder/SiblingChildOrderTest.java                                nobug macosx-all,windows-all
 java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html                             nobug macosx-all,windows-all
@@ -29,6 +29,7 @@ java/awt/Focus/NonFocusableResizableTooSmall/NonFocusableResizableTooSmall.java
 java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java                            nobug macosx-all,windows-all,linux-all
 java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java                                   nobug macosx-all
 java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java                         nobug macosx-all
+java/awt/Focus/RequestFocusByCause/RequestFocusByCauseTest.java                             nobug linux-all,macosx-all,windows-all reproduced with Adopt, OpenJDK
 java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java nobug macosx-all,windows-all
 java/awt/Frame/8158918/SetExtendedState.java                                                nobug linux-all
 java/awt/Frame/FrameLocation/FrameLocation.java                                             nobug linux-all
@@ -109,7 +110,6 @@ java/awt/datatransfer/Independence/IndependenceAWTTest.java
 java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html                          nobug macosx-all,windows-all
 java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java                         nobug linux-all
 java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java                           nobug macosx-all,windows-all,linux-all
-java/awt/dnd/DragInterceptorAppletTest/DragInterceptorAppletTest.html                       nobug macosx-all,linux-all,windows-all
 java/awt/dnd/DnDTestWithHIDPI/DragTestWithHIDPI.java                                        nobug macosx-all,windows-all,linux-all
 java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html                           nobug macosx-all,linux-all,windows-all
 java/awt/dnd/InterJVMGetDropSuccessTest/InterJVMGetDropSuccessTest.html                     nobug macosx-all,windows-all,linux-all
@@ -142,6 +142,7 @@ java/awt/hidpi/properties/HiDPIPropertiesUnixTest.java
 java/awt/hidpi/properties/HiDPIPropertiesWindowsTest.java                                   nobug windows-all
 java/awt/image/DrawImage/EABlitTest.java                                                    nobug windows-all
 java/awt/image/DrawImage/IncorrectOffset.java                                               nobug windows-all
+java/awt/image/DrawImage/UnmanagedDrawImagePerformance.java                                 JBR-1801 windows-all
 java/awt/image/VolatileImage/DrawBufImgOp.java                                              nobug windows-all
 java/awt/image/VolatileImage/DrawHugeImageTest.java                                         nobug windows-all
 java/awt/image/VolatileImage/TransparentVImage.java                                         nobug windows-all
@@ -172,6 +173,7 @@ javax/swing/JLabel/7004134/bug7004134.java
 javax/swing/JList/6510999/bug6510999.java                                                   nobug linux-all,macosx-all,windows-all
 javax/swing/JList/BasicListTest.java                                                        nobug macosx-all
 javax/swing/JMenu/6538132/bug6538132.java                                                   nobug windows-all
+javax/swing/JMenu/8178430/LabelDotTest.java                                                 nobug linux-all
 javax/swing/JMenuItem/8139169/ScreenMenuBarInputTwice.java                                  nobug macosx-all
 javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java                            nobug windows-all
 javax/swing/JOptionPane/6428694/bug6428694.java                                             nobug windows-all
@@ -184,11 +186,12 @@ javax/swing/JRadioButton/8041561/bug8041561.java
 javax/swing/JScrollBar/7163696/Test7163696.java                                             nobug windows-all
 javax/swing/JScrollBar/bug4202954/bug4202954.java                                           nobug windows-all
 javax/swing/JSlider/6401380/bug6401380.java                                                 nobug windows-all
-javax/swing/JTabbedPane/7161568/bug7161568.java                                             nobug windows-all
+javax/swing/JTabbedPane/7161568/bug7161568.java                                             nobug windows-all,linux-all
 javax/swing/JTabbedPane/7170310/bug7170310.java                                             nobug macosx-all,linux-all
 javax/swing/JTextArea/8149849/DNDTextToScaledArea.java                                      nobug windows-all
 javax/swing/JToolTip/6219960/bug6219960.java                                                nobug macosx-all,windows-all
 javax/swing/JTree/4633594/JTreeFocusTest.java                                               nobug macosx-all,windows-all
+javax/swing/JTree/6578666/bug6578666.java                                                   nobug macosx-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucent.java                    nobug windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java            nobug windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java      nobug macosx-all,linux-all,windows-all
@@ -199,7 +202,7 @@ javax/swing/event/RightAltKeyTest.java
 javax/swing/plaf/metal/MetalGradient/8163193/ButtonGradientTest.java                        nobug linux-all,windows-all
 javax/swing/plaf/nimbus/8041642/ScrollBarThumbVisibleTest.java                              nobug windows-all
 javax/swing/plaf/nimbus/8041642/bug8041642.java                                             nobug windows-all
-javax/swing/plaf/nimbus/8057791/bug8057791.java                                             nobug windows-all
+javax/swing/plaf/nimbus/8057791/bug8057791.java                                             nobug windows-all,linux-all
 javax/swing/plaf/nimbus/TestNimbusOverride.java                                             nobug windows-all
 javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java                                nobug windows-all
 javax/swing/plaf/synth/SynthScrollbarThumbPainter/SynthScrollbarThumbPainterTest.java       nobug windows-all

test/jdk/jbu/performance/rendering/RenderPerfTest.java

@@ -36,6 +36,7 @@ import java.awt.geom.QuadCurve2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -44,6 +45,7 @@ import static org.junit.Assert.assertTrue;
 
 public class RenderPerfTest {
     private final static int N = 1000;
+    private final static int K = 5;
     private final static float WIDTH = 800;
     private final static float HEIGHT = 800;
     private final static float R = 25;
@@ -187,6 +189,32 @@ public class RenderPerfTest {
         }
     }
 
+    static class RandomTextParticleRenderer extends TextParticleRenderer {
+        StringBuffer buffer = new StringBuffer();
+        Random rnd = new Random();
+        int sLen;
+
+
+        RandomTextParticleRenderer(int n, int k, float r, Object hint) {
+            super(n, r, hint);
+            sLen = k;
+        }
+
+        @Override
+        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
+            g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, hint);
+
+            setPaint(g2d, id);
+            buffer.setLength(0);
+            for (int i = 0; i < sLen; i++) {
+                buffer.appendCodePoint(0x20 + (Math.abs(rnd.nextInt()) % 0xfd0));
+            }
+
+            g2d.drawString(buffer.toString(),
+                    (int)(x[id] - r), (int)(y[id] - r));
+        }
+
+    }
     static class FlatOvalRotParticleRenderer extends FlatParticleRenderer {
 
 
@@ -516,6 +544,8 @@ public class RenderPerfTest {
     private static final ParticleRenderer whiteTextRendererGray =
             new WhiteTextParticleRenderer(R, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
 
+    private static final ParticleRenderer randomTextRendererGray =
+            new RandomTextParticleRenderer(N, K, R, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
 
     @Test
     public void testFlatBubbles() throws Exception {
@@ -752,6 +782,25 @@ public class RenderPerfTest {
         report("TextLCD", fps);
     }
 
+    @Test
+    public void testRandomTextBubblesGray() throws Exception {
+
+        double fps = (new PerfMeter()).exec(new Renderable() {
+            @Override
+            public void render(Graphics2D g2d) {
+                balls.render(g2d, randomTextRendererGray);
+            }
+
+            @Override
+            public void update() {
+                balls.update();
+            }
+        });
+
+        report("RandomTextGray", fps);
+
+    }
+
     @Test
     public void testTextBubblesGray() throws Exception {
 

test/jdk/jbu/quality/text/BundledFontTest.java

@@ -126,4 +126,14 @@ public class BundledFontTest {
     public void testJetBrainsMonoBold() throws Exception {
         doTestFont("JetBrains Mono", Font.BOLD);
     }
+
+    @Test
+    public void testJetBrainsMonoItalic() throws Exception {
+        doTestFont("JetBrains Mono", Font.ITALIC);
+    }
+
+    @Test
+    public void testJetBrainsMonoBoldItalic() throws Exception {
+        doTestFont("JetBrains Mono", Font.BOLD | Font.ITALIC);
+    }
 }

test/lib/jdk/test/lib/Platform.java

@@ -354,10 +354,6 @@ public class Platform {
      * This should match the #if condition in ClassListParser::load_class_from_source().
      */
     public static boolean areCustomLoadersSupportedForCDS() {
-        boolean isLinux = Platform.isLinux();
-        boolean is64 = Platform.is64bit();
-        boolean isSolaris = Platform.isSolaris();
-
-        return (is64 && (isLinux || isSolaris));
+        return (is64bit() && (isLinux() || isSolaris() || isOSX() || isWindows()));
     }
 }