add simple cmakelists generator

2025-12-09 02:49:40 +01:00 · 2019-11-12 14:19:59 +03:00
40 changed files with 254 additions and 869 deletions
--- a/README.md
+++ b/README.md
@@ -26,10 +26,6 @@ git clone git@github.com:JetBrains/JetBrainsRuntime.git
 ```

 # Configure Local Build Environment
-[OpenJDK build docs](http://hg.openjdk.java.net/jdk/jdk11/raw-file/tip/doc/building.html)  
-Tip for all platforms: run ./configure and check output.  
-Usually, it has meaningful advice how to solve your problem.
-
 ## Linux (docker)
 ```
 $ cd jb/project/docker
@@ -55,29 +51,7 @@ $ make images
 ```

 ## Windows
-Install:
-
-* [Cygwin x64](http://www.cygwin.com/)  
-  Required packages: autoconf, binutils, cpio, diffutils, file, gawk, gcc-core, make, m4, unzip, zip.  
-  **Install them while installing cygwin**.
-* Visual Studio compiler toolset [Download](https://visualstudio.microsoft.com/downloads/)  
-  Visual Studio 2015 has support by default.  
-  **Install with desktop development kit, it includes Windows SDK and compilers**.
-* [Java 11](http://www.oracle.com/technetwork/java/javase/downloads/index.html)  
-  If you have problems while configuring [read java tips on cygwin](http://horstmann.com/articles/cygwin-tips.html)
-
-From command line 
-```
-"c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
-```
-First command will set env vars, the second will run cygwin shell with proper environment.  
-In cygwin shell 
-```    
-cd JetBrainsRuntime
-./configure --disable-warnings-as-errors
-make images
-```
+#### TBD

 ## OSX

--- a/bin/clion.sh
+++ b/bin/clion.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+#
+# Simple collect all possible include dirs
+#
+
+function traverseInclude() {
+for file in "$1"/*
+do
+    if [ -d "${file}" ] ; then
+        echo "${file}" >> $2
+        traverseInclude "${file}" "$2"
+    fi
+done
+}
+
+WORKING_DIR=`pwd`
+cd ..
+
+
+ROOT_DIR="."
+SRC_ROOT_DIR="$ROOT_DIR/src"
+INCLUDE_DIRS_LIST_TMP_FILE="include.list.tmp"
+
+traverseInclude "$SRC_ROOT_DIR/hotspot/os/posix/include" 	$INCLUDE_DIRS_LIST_TMP_FILE
+
+traverseInclude "$SRC_ROOT_DIR/java.base/share/native" 	    $INCLUDE_DIRS_LIST_TMP_FILE
+traverseInclude "$SRC_ROOT_DIR/java.desktop/share/native" 	$INCLUDE_DIRS_LIST_TMP_FILE
+traverseInclude "$SRC_ROOT_DIR/java.desktop/macosx/native" 	$INCLUDE_DIRS_LIST_TMP_FILE
+
+traverseInclude "$SRC_ROOT_DIR/../build/macosx-x86_64-server-release/support/headers/java.desktop/" $INCLUDE_DIRS_LIST_TMP_FILE
+
+# TODO: obtain CONF from make
+
+
+#
+# Collect all src files by extension
+#
+
+function traverseSources() {
+for file in "$1"/*
+do
+    if [ ! -d "${file}" ] ; then
+        filename=$(basename "$file")
+        ext="${filename##*.}"
+    	# echo "the ext for $file is: "$ext
+        if [ "$ext" = "m" ] || [ "$ext" = "c" ] || [ "$ext" = "cpp" ] || [ "$ext" = "cc" ] || [ "$ext" = "mm" ]
+        then
+        	echo "${file}" >> $2
+        fi
+    else
+        traverseSources "${file}" "$2"
+    fi
+done
+}
+
+SOURCES_LIST_TMP_FILE="sources.list.tmp"
+
+traverseSources "$SRC_ROOT_DIR/java.desktop/share/native" 	$SOURCES_LIST_TMP_FILE
+traverseSources "$SRC_ROOT_DIR/java.desktop/macosx/native" 	$SOURCES_LIST_TMP_FILE
+
+#
+# Replace stubs in template
+#
+
+#copy
+cp "$ROOT_DIR/make/clion/template/CMakeLists.txt" "$ROOT_DIR"
+CMAKE_LISTS_FILE="$ROOT_DIR/CMakeLists.txt"
+
+#replace includes
+awk 'FNR==NR{s=s"\n"$0;next;} /_CMAKE_INCLUDE_DIRS_LIST_/{$0=substr(s,2);} 1' $INCLUDE_DIRS_LIST_TMP_FILE $CMAKE_LISTS_FILE > $CMAKE_LISTS_FILE.tmp
+mv $CMAKE_LISTS_FILE.tmp $CMAKE_LISTS_FILE
+
+#replace sources
+awk 'FNR==NR{s=s"\n"$0;next;} /_CMAKE_SOURCE_FILES_LIST_/{$0=substr(s,2);} 1' $SOURCES_LIST_TMP_FILE $CMAKE_LISTS_FILE > $CMAKE_LISTS_FILE.tmp
+mv $CMAKE_LISTS_FILE.tmp $CMAKE_LISTS_FILE
+
+rm $INCLUDE_DIRS_LIST_TMP_FILE
+rm $SOURCES_LIST_TMP_FILE
--- a/make/clion/template/CMakeLists.txt
+++ b/make/clion/template/CMakeLists.txt
@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 3.8)
+project(jdk)
+
+include_directories(
+    _CMAKE_INCLUDE_DIRS_LIST_
+)
+
+add_custom_target(
+        configure
+        COMMAND bash configure
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+)
+
+add_custom_target(
+        build_images
+        COMMAND make COMPILER_WARNINGS_FATAL=false images
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        DEPENDS ${SOURCE_FILES}
+)
+
+set(
+    SOURCE_FILES
+    _CMAKE_SOURCE_FILES_LIST_
+)
+
+add_executable(jdk ${SOURCE_FILES})
+
+# TODO:
+# This CMakeLists.txt has only one goal - code navigation via CLion.
+# Is it necessary/usefull to set compiler flags and target_link_libraries ?
--- a/make/data/charsetmapping/stdcs-windows
+++ b/make/data/charsetmapping/stdcs-windows
@@ -2,7 +2,6 @@
 #   generate these charsets into sun.nio.cs
 #
 GBK
-GB18030
 Johab
 MS1255
 MS1256
--- a/make/data/fontconfig/windows.fontconfig.properties
+++ b/make/data/fontconfig/windows.fontconfig.properties
@@ -42,7 +42,7 @@ allfonts.myanmar=Myanmar Text
 allfonts.dingbats=Wingdings
 allfonts.symbol=Symbol
 allfonts.symbols=Segoe UI Symbol
-allfonts.thai=Tahoma
+allfonts.thai=DokChampa
 allfonts.georgian=Sylfaen

 serif.plain.alphabetic=Times New Roman
@@ -50,140 +50,140 @@ serif.plain.chinese-ms950=MingLiU
 serif.plain.chinese-ms950-extb=MingLiU-ExtB
 serif.plain.hebrew=David
 serif.plain.japanese=MS Mincho
-serif.plain.korean=Malgun Gothic
+serif.plain.korean=Batang

 serif.bold.alphabetic=Times New Roman Bold
 serif.bold.chinese-ms950=PMingLiU
 serif.bold.chinese-ms950-extb=PMingLiU-ExtB
 serif.bold.hebrew=David Bold
 serif.bold.japanese=MS Mincho
-serif.bold.korean=Malgun Gothic
+serif.bold.korean=Batang

 serif.italic.alphabetic=Times New Roman Italic
 serif.italic.chinese-ms950=PMingLiU
 serif.italic.chinese-ms950-extb=PMingLiU-ExtB
 serif.italic.hebrew=David
 serif.italic.japanese=MS Mincho
-serif.italic.korean=Malgun Gothic
+serif.italic.korean=Batang

 serif.bolditalic.alphabetic=Times New Roman Bold Italic
 serif.bolditalic.chinese-ms950=PMingLiU
 serif.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 serif.bolditalic.hebrew=David Bold
 serif.bolditalic.japanese=MS Mincho
-serif.bolditalic.korean=Malgun Gothic
+serif.bolditalic.korean=Batang

 sansserif.plain.alphabetic=Arial
 sansserif.plain.chinese-ms950=MingLiU
 sansserif.plain.chinese-ms950-extb=MingLiU-ExtB
 sansserif.plain.hebrew=David
 sansserif.plain.japanese=MS Gothic
-sansserif.plain.korean=Malgun Gothic
+sansserif.plain.korean=Gulim

 sansserif.bold.alphabetic=Arial Bold
 sansserif.bold.chinese-ms950=PMingLiU
 sansserif.bold.chinese-ms950-extb=PMingLiU-ExtB
 sansserif.bold.hebrew=David Bold
 sansserif.bold.japanese=MS Gothic
-sansserif.bold.korean=Malgun Gothic
+sansserif.bold.korean=Gulim

 sansserif.italic.alphabetic=Arial Italic
 sansserif.italic.chinese-ms950=PMingLiU
 sansserif.italic.chinese-ms950-extb=PMingLiU-ExtB
 sansserif.italic.hebrew=David
 sansserif.italic.japanese=MS Gothic
-sansserif.italic.korean=Malgun Gothic
+sansserif.italic.korean=Gulim

 sansserif.bolditalic.alphabetic=Arial Bold Italic
 sansserif.bolditalic.chinese-ms950=PMingLiU
 sansserif.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 sansserif.bolditalic.hebrew=David Bold
 sansserif.bolditalic.japanese=MS Gothic
-sansserif.bolditalic.korean=Malgun Gothic
+sansserif.bolditalic.korean=Gulim

 monospaced.plain.alphabetic=Courier New
 monospaced.plain.chinese-ms950=MingLiU
 monospaced.plain.chinese-ms950-extb=MingLiU-ExtB
 monospaced.plain.hebrew=Courier New
 monospaced.plain.japanese=MS Gothic
-monospaced.plain.korean=Malgun Gothic
+monospaced.plain.korean=GulimChe

 monospaced.bold.alphabetic=Courier New Bold
 monospaced.bold.chinese-ms950=PMingLiU
 monospaced.bold.chinese-ms950-extb=PMingLiU-ExtB
 monospaced.bold.hebrew=Courier New Bold
 monospaced.bold.japanese=MS Gothic
-monospaced.bold.korean=Malgun Gothic
+monospaced.bold.korean=GulimChe

 monospaced.italic.alphabetic=Courier New Italic
 monospaced.italic.chinese-ms950=PMingLiU
 monospaced.italic.chinese-ms950-extb=PMingLiU-ExtB
 monospaced.italic.hebrew=Courier New
 monospaced.italic.japanese=MS Gothic
-monospaced.italic.korean=Malgun Gothic
+monospaced.italic.korean=GulimChe

 monospaced.bolditalic.alphabetic=Courier New Bold Italic
 monospaced.bolditalic.chinese-ms950=PMingLiU
 monospaced.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 monospaced.bolditalic.hebrew=Courier New Bold
 monospaced.bolditalic.japanese=MS Gothic
-monospaced.bolditalic.korean=Malgun Gothic
+monospaced.bolditalic.korean=GulimChe

 dialog.plain.alphabetic=Arial
 dialog.plain.chinese-ms950=MingLiU
 dialog.plain.chinese-ms950-extb=MingLiU-ExtB
 dialog.plain.hebrew=David
 dialog.plain.japanese=MS Gothic
-dialog.plain.korean=Malgun Gothic
+dialog.plain.korean=Gulim

 dialog.bold.alphabetic=Arial Bold
 dialog.bold.chinese-ms950=PMingLiU
 dialog.bold.chinese-ms950-extb=PMingLiU-ExtB
 dialog.bold.hebrew=David Bold
 dialog.bold.japanese=MS Gothic
-dialog.bold.korean=Malgun Gothic
+dialog.bold.korean=Gulim

 dialog.italic.alphabetic=Arial Italic
 dialog.italic.chinese-ms950=PMingLiU
 dialog.italic.chinese-ms950-extb=PMingLiU-ExtB
 dialog.italic.hebrew=David
 dialog.italic.japanese=MS Gothic
-dialog.italic.korean=Malgun Gothic
+dialog.italic.korean=Gulim

 dialog.bolditalic.alphabetic=Arial Bold Italic
 dialog.bolditalic.chinese-ms950=PMingLiU
 dialog.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 dialog.bolditalic.hebrew=David Bold
 dialog.bolditalic.japanese=MS Gothic
-dialog.bolditalic.korean=Malgun Gothic
+dialog.bolditalic.korean=Gulim

 dialoginput.plain.alphabetic=Courier New
 dialoginput.plain.chinese-ms950=MingLiU
 dialoginput.plain.chinese-ms950-extb=MingLiU-ExtB
 dialoginput.plain.hebrew=David
 dialoginput.plain.japanese=MS Gothic
-dialoginput.plain.korean=Malgun Gothic
+dialoginput.plain.korean=Gulim

 dialoginput.bold.alphabetic=Courier New Bold
 dialoginput.bold.chinese-ms950=PMingLiU
 dialoginput.bold.chinese-ms950-extb=PMingLiU-ExtB
 dialoginput.bold.hebrew=David Bold
 dialoginput.bold.japanese=MS Gothic
-dialoginput.bold.korean=Malgun Gothic
+dialoginput.bold.korean=Gulim

 dialoginput.italic.alphabetic=Courier New Italic
 dialoginput.italic.chinese-ms950=PMingLiU
 dialoginput.italic.chinese-ms950-extb=PMingLiU-ExtB
 dialoginput.italic.hebrew=David
 dialoginput.italic.japanese=MS Gothic
-dialoginput.italic.korean=Malgun Gothic
+dialoginput.italic.korean=Gulim

 dialoginput.bolditalic.alphabetic=Courier New Bold Italic
 dialoginput.bolditalic.chinese-ms950=PMingLiU
 dialoginput.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 dialoginput.bolditalic.hebrew=David Bold
 dialoginput.bolditalic.japanese=MS Gothic
-dialoginput.bolditalic.korean=Malgun Gothic
+dialoginput.bolditalic.korean=Gulim

 # Search Sequences

@@ -241,7 +241,7 @@ sequence.allfonts.x-windows-874=alphabetic,thai,dingbats,symbol
 sequence.fallback=symbols,\
                  chinese-ms950,chinese-hkscs,chinese-ms936,chinese-gb18030,\
                  japanese,korean,chinese-ms950-extb,chinese-ms936-extb,\
-                  georgian,kannada,thai,myanmar
+                  georgian,kannada,myanmar

 # Exclusion Ranges

@@ -291,8 +291,11 @@ filename.MS_PMincho=MSMINCHO.TTC
 filename.MS_Gothic=MSGOTHIC.TTC
 filename.MS_PGothic=MSGOTHIC.TTC

-filename.Malgun_Gothic=malgun.ttf
-filename.Tahoma=tahoma.ttf
+filename.Gulim=gulim.TTC
+filename.Batang=batang.TTC
+filename.GulimChe=gulim.TTC
+
+filename.DokChampa=dokchamp.ttf
 filename.Mangal=MANGAL.TTF
 filename.Tunga=TUNGA.TTF
 filename.Myanmar_Text=mmrtext.ttf
--- a/make/data/x11wrappergen/sizes-64.txt
+++ b/make/data/x11wrappergen/sizes-64.txt
@@ -272,14 +272,12 @@ XEvent.xclient	0
 XEvent.xcolormap	0
 XEvent.xconfigure	0
 XEvent.xconfigurerequest	0
-XEvent.xcookie	0
 XEvent.xcreatewindow	0
 XEvent.xcrossing	0
 XEvent.xdestroywindow	0
 XEvent.xerror	0
 XEvent.xexpose	0
 XEvent.xfocus	0
-XEvent.xgeneric	0
 XEvent.xgraphicsexpose	0
 XEvent.xgravity	0
 XEvent.xkey	0
@@ -372,22 +370,6 @@ XGCValues.subwindow_mode	96
 XGCValues.tile	64
 XGCValues.ts_x_origin	80
 XGCValues.ts_y_origin	84
-XGenericEvent	40
-XGenericEventCookie	56
-XGenericEventCookie.cookie	40
-XGenericEventCookie.data	48
-XGenericEventCookie.display	24
-XGenericEventCookie.evtype	36
-XGenericEventCookie.extension	32
-XGenericEventCookie.send_event	16
-XGenericEventCookie.serial	8
-XGenericEventCookie.type	0
-XGenericEvent.display	24
-XGenericEvent.evtype	36
-XGenericEvent.extension	32
-XGenericEvent.send_event	16
-XGenericEvent.serial	8
-XGenericEvent.type	0
 XGraphicsExposeEvent	72
 XGraphicsExposeEvent.count	56
 XGraphicsExposeEvent.display	24
@@ -414,9 +396,6 @@ XHostAddress	16
 XHostAddress.address	8
 XHostAddress.family	0
 XHostAddress.length	4
-XIButtonState	16
-XIButtonState.mask	8
-XIButtonState.mask_len	0
 XIconSize	24
 XIconSize.height_inc	20
 XIconSize.max_height	12
@@ -424,29 +403,6 @@ XIconSize.max_width	8
 XIconSize.min_height	4
 XIconSize.min_width	0
 XIconSize.width_inc	16
-XIDeviceEvent	200
-XIDeviceEvent.buttons	128
-XIDeviceEvent.child	80
-XIDeviceEvent.detail	56
-XIDeviceEvent.deviceid	48
-XIDeviceEvent.display	24
-XIDeviceEvent.event	72
-XIDeviceEvent.event_x	104
-XIDeviceEvent.event_y	112
-XIDeviceEvent.evtype	36
-XIDeviceEvent.extension	32
-XIDeviceEvent.flags	120
-XIDeviceEvent.group	184
-XIDeviceEvent.mods	168
-XIDeviceEvent.root	64
-XIDeviceEvent.root_x	88
-XIDeviceEvent.root_y	96
-XIDeviceEvent.send_event	16
-XIDeviceEvent.serial	8
-XIDeviceEvent.sourceid	52
-XIDeviceEvent.time	40
-XIDeviceEvent.type	0
-XIDeviceEvent.valuators	144
 XImage	136
 XImage.bitmap_bit_order	32
 XImage.bitmap_pad	36
@@ -480,11 +436,6 @@ XIMHotKeyTrigger.modifier_mask	12
 XIMHotKeyTriggers	16
 XIMHotKeyTriggers.key	8
 XIMHotKeyTriggers.num_hot_key	0
-XIModifierState	16
-XIModifierState.base	0
-XIModifierState.effective	12
-XIModifierState.latched	4
-XIModifierState.locked	8
 XIMPreeditCaretCallbackStruct	12
 XIMPreeditCaretCallbackStruct.direction	4
 XIMPreeditCaretCallbackStruct.position	0
@@ -521,10 +472,6 @@ XIMText.string	24
 XIMValuesList	16
 XIMValuesList.count_values	0
 XIMValuesList.supported_values	8
-XIValuatorState	24
-XIValuatorState.mask	8
-XIValuatorState.mask_len	0
-XIValuatorState.values	16
 XkbAccessXNotifyEvent	64
 XkbAccessXNotifyEvent.debounce_delay	60
 XkbAccessXNotifyEvent.detail	48
--- a/make/data/x11wrappergen/xlibtypes.txt
+++ b/make/data/x11wrappergen/xlibtypes.txt
@@ -127,22 +127,6 @@ XKeymapEvent
    display     long
    window	long
    key_vector	array byte 32
-XGenericEvent
-    type	int
-    serial	long
-    send_event  Bool
-    display     long
-    extension int
-    evtype int
-XGenericEventCookie
-    type	int
-    serial	long
-    send_event  Bool
-    display     long
-    extension int
-    evtype int
-    cookie int
-    data pointer
 XDestroyWindowEvent
    type	int
    serial	long
@@ -830,8 +814,6 @@ XEvent
   xmapping struct XMappingEvent
   xerror struct XErrorEvent
   xkeymap struct XKeymapEvent
-   xgeneric struct XGenericEvent
-   xcookie struct XGenericEventCookie
   pad array long 24

 XkbAnyEvent
@@ -1057,42 +1039,3 @@ XkbEvent
    accessx  struct XkbAccessXNotifyEvent
    device  struct XkbExtensionDeviceNotifyEvent
    core  struct XEvent
-
-XIButtonState
-    mask_len int
-    mask pointer byte
-
-XIValuatorState
-    mask_len int
-    mask pointer byte
-    values pointer double
-
-XIModifierState
-    base int
-    latched int
-    locked int
-    effective int
-
-XIDeviceEvent
-    type int   
-    serial long
-    send_event Bool
-    display long
-    extension int
-    evtype int
-    time ulong
-    deviceid int
-    sourceid int
-    detail int
-    root long
-    event long
-    child long
-    root_x double
-    root_y double
-    event_x double
-    event_y double
-    flags int
-    buttons struct XIButtonState
-    valuators struct XIValuatorState
-    mods struct XIModifierState
-    group struct XIModifierState
--- a/make/jdk/src/classes/build/tools/x11wrappergen/WrapperGenerator.java
+++ b/make/jdk/src/classes/build/tools/x11wrappergen/WrapperGenerator.java
@@ -1142,8 +1142,6 @@ public class WrapperGenerator {
            pw.println("/* This file is an automatically generated file, please do not edit this file, modify the XlibParser.java file instead !*/\n" );
            pw.println("#include <X11/Xlib.h>\n#include <X11/Xutil.h>\n#include <X11/Xos.h>\n#include <X11/Xatom.h>\n#include <stdio.h>\n");
            pw.println("#include <X11/extensions/Xdbe.h>");
-            pw.println("#include <X11/extensions/XI2.h>");
-            pw.println("#include <X11/extensions/XInput2.h>");
            pw.println("#include <X11/XKBlib.h>");
            pw.println("#include \"awt_p.h\"");
            pw.println("#include \"color.h\"");
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
@@ -233,6 +233,7 @@ public class LWWindowPeer

        setOpaque(getTarget().isOpaque());

+        updateInsets(platformWindow.getInsets());
        if (getSurfaceData() == null) {
            replaceSurfaceData(false);
        }
@@ -309,7 +310,6 @@ public class LWWindowPeer
                }
            }
        }
-        updateInsets(platformWindow.getInsets());
    }

    @Override
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h
@@ -37,6 +37,9 @@

    // TODO: NSMenu *contextualMenu;

+    // Keyboard layout
+    NSTextInputSourceIdentifier kbdLayout;
+
    // dnd support (see AppKit/NSDragging.h, NSDraggingSource/Destination):
    CDragSource *_dragSource;
    CDropTarget *_dropTarget;
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
@@ -1118,8 +1118,16 @@ JNF_CLASS_CACHE(jc_CInputMethod, "sun/lwawt/macosx/CInputMethod");
    NSUInteger utf16Length = [useString lengthOfBytesUsingEncoding:NSUTF16StringEncoding];
    NSUInteger utf8Length = [useString lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
    BOOL aStringIsComplex = NO;
+
+    unichar codePoint = [useString characterAtIndex:0];
+
+#ifdef IM_DEBUG
+    NSLog(@"insertText kbdlayout %@ ",(NSString *)kbdLayout);
+#endif // IM_DEBUG
+
    if ((utf16Length > 2) ||
-        ((utf8Length > 1) && [self isCodePointInUnicodeBlockNeedingIMEvent:[useString characterAtIndex:0]])) {
+        ((utf8Length > 1) && [self isCodePointInUnicodeBlockNeedingIMEvent:codePoint]) ||
+        ((codePoint == 0x5c) && ([(NSString *)kbdLayout containsString:@"Kotoeri"]))) {
        aStringIsComplex = YES;
    }

@@ -1159,6 +1167,15 @@ JNF_CLASS_CACHE(jc_CInputMethod, "sun/lwawt/macosx/CInputMethod");
    }
 }

+- (void)keyboardInputSourceChanged:(NSNotification *)notification
+{
+#ifdef IM_DEBUG
+    NSLog(@"keyboardInputSourceChangeNotification received");
+#endif
+    NSTextInputContext *curContxt = [NSTextInputContext currentInputContext];
+    kbdLayout = curContxt.selectedKeyboardInputSource;
+}
+
 - (void) doCommandBySelector:(SEL)aSelector
 {
 #ifdef IM_DEBUG
@@ -1484,6 +1501,13 @@ JNF_CLASS_CACHE(jc_CInputMethod, "sun/lwawt/macosx/CInputMethod");
        fInputMethodLOCKABLE = JNFNewGlobalRef(env, inputMethod);
    else
        fInputMethodLOCKABLE = NULL;
+
+    NSTextInputContext *curContxt = [NSTextInputContext currentInputContext];
+    kbdLayout = curContxt.selectedKeyboardInputSource;
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(keyboardInputSourceChanged:)
+                                               name:NSTextInputContextKeyboardSelectionDidChangeNotification
+                                             object:nil];
 }

 - (void)abandonInput
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h
@@ -40,8 +40,6 @@ extern int gNumberOfButtons;
 // InputEvent mask array
 extern jint* gButtonDownMasks;

-extern int lcdSubPixelPosSupported;
-
@interface AWTToolkit : NSObject { }
 + (long) getEventCount;
 + (void) eventCountPlusPlus;
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m
@@ -52,7 +52,6 @@

 int gNumberOfButtons;
 jint* gButtonDownMasks;
-int lcdSubPixelPosSupported;

 // Indicates that the app has been started with -XstartOnFirstThread
 // (directly or via WebStart settings), and AWT should not run its
--- a/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m
@@ -163,7 +163,7 @@ JNF_COCOA_ENTER(env);
    const CTFontRef fallback = CTS_CopyCTFallbackFontAndGlyphForJavaGlyphCode(awtFont, glyphCode, &glyph);
    const CGFontRef cgFallback = CTFontCopyGraphicsFont(fallback, NULL);
    if (IS_OSX_GT10_14 || CGGI_IsColorFont(cgFallback)) {
-        CGAffineTransform matrix = awtStrike->fAltTx;
+        CGAffineTransform matrix = CGAffineTransformConcat(awtStrike->fAltTx, awtStrike->fFontTx);
        CGFloat fontSize = sqrt(fabs(matrix.a * matrix.d - matrix.b * matrix.c));
        CTFontRef font = CTFontCreateWithGraphicsFont(cgFallback, fontSize, NULL, NULL);
        CTFontGetAdvancesForGlyphs(font, kCTFontDefaultOrientation, &glyph, &advance, 1);
--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.m
@@ -337,7 +337,7 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
            CFPreferencesGetAppBooleanValue(
            CFSTR("CGFontRenderingFontSmoothingDisabled"),
            kCFPreferencesCurrentApplication, &status);
-    lcdSubPixelPosSupported = YES;
+
    if (status) {
        if (fontSmoothingDisabled) {
            J2dRlsTraceLn(J2D_TRACE_INFO,
@@ -355,7 +355,7 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
        if (!status) {
            smoothFonts = YES;
        }
-        lcdSubPixelPosSupported = !smoothFonts;
+
        if (!smoothFonts) {
            J2dRlsTraceLn(J2D_TRACE_INFO,
                    "LCD_SHADER: disabled on macOS 10.14+ by default");
--- a/src/java.desktop/share/classes/java/awt/Component.java
+++ b/src/java.desktop/share/classes/java/awt/Component.java
@@ -7214,13 +7214,6 @@ public abstract class Component implements ImageObserver, MenuContainer,
                                        : 0));
                dispatchEvent(e);
            }
-
-            Window window = getContainingWindow();
-            // window is supposed to be not a null value (addNotify)
-            Component mostRecentFocusOwner = KeyboardFocusManager.getMostRecentFocusOwner(window);
-            if (mostRecentFocusOwner != this) {
-                requestFocusInWindow();
-            }
        }
    }

--- a/src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java
+++ b/src/java.desktop/share/classes/sun/font/FreetypeFontScaler.java
@@ -51,25 +51,17 @@ class FreetypeFontScaler extends FontScaler {
           and therefore no need to load it explicitly here */
        FontManagerNativeLibrary.load();

-        String fontConfName = java.security.AccessController.doPrivileged(
-                (PrivilegedAction<String>) () -> {
-                    if ("true".equals(System.getProperty(
-                            "java2d.font.loadFontConf", ""))) {
-                        File f = new File(System.getProperty("user.home", "") +
-                                          File.separator + ".fonts.conf");
-
-                        if (!f.exists()) {
-                            f = new File(System.getProperty("java.home", "") +
-                                         File.separator + "lib" + File.separator +
-                                         "fonts" + File.separator + "font.conf");
-                        }
-                        return f.getAbsolutePath();
-                    }
-                    return null;
-                });
+        String jreFontConfName = java.security.AccessController.doPrivileged(
+                (PrivilegedAction<String>) () ->
+                        "true".equals(System.getProperty(
+                                "java2d.font.loadFontConf", "")) ?
+                                System.getProperty("java.home", "") +
+                                File.separator + "lib" + File.separator +
+                                "fonts" + File.separator + "font.conf" :
+                                null);

        initIDs(FreetypeFontScaler.class, Toolkit.class, PhysicalFont.class,
-                fontConfName);
+                jreFontConfName);
    }

    private static native void initIDs(Class<?> FFS, Class<?> toolkitClass, Class<?> pfClass,
--- a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
+++ b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
@@ -1252,7 +1252,8 @@ public class SwingUtilities2 {

            GraphicsConfiguration gc = c.getGraphicsConfiguration();
            AffineTransform tx = (gc == null) ? null : gc.getDefaultTransform();
-            if (tx == null && !GraphicsEnvironment.isHeadless()) {
+            // [tav] workaround deadlock on MacOSX until fixed, JRE-226
+            if (!FontUtilities.isMacOSX && tx == null && !GraphicsEnvironment.isHeadless()) {
                tx =  GraphicsEnvironment
                        .getLocalGraphicsEnvironment()
                        .getDefaultScreenDevice()
--- a/src/java.desktop/share/fonts/JetBrainsMono-Bold-Italic.ttf
+++ b/src/java.desktop/share/fonts/JetBrainsMono-Bold-Italic.ttf
--- a/src/java.desktop/share/fonts/JetBrainsMono-Bold.ttf
+++ b/src/java.desktop/share/fonts/JetBrainsMono-Bold.ttf
--- a/src/java.desktop/share/fonts/JetBrainsMono-Italic.ttf
+++ b/src/java.desktop/share/fonts/JetBrainsMono-Italic.ttf
--- a/src/java.desktop/share/fonts/JetBrainsMono-Regular.ttf
+++ b/src/java.desktop/share/fonts/JetBrainsMono-Regular.ttf
--- a/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c
+++ b/src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c
@@ -1027,10 +1027,6 @@ OGLTR_DrawColorGlyphNoCache(OGLContext *oglc, GlyphInfo *ginfo, jint x, jint y)
    return JNI_TRUE;
 }

-// Control subpixel positioning for macOS 13+ grayscale glyphs
-#ifdef MACOSX
-extern int lcdSubPixelPosSupported;
-#endif

 // see DrawGlyphList.c for more on this macro...
 #define FLOOR_ASSIGN(l, r) \
@@ -1083,8 +1079,6 @@ OGLTR_DrawGlyphList(JNIEnv *env, OGLContext *oglc, OGLSDOps *dstOps,
    {
        dstTextureID = dstOps->textureID;
    }
-
-    subPixPos = lcdSubPixelPosSupported ? subPixPos : 0;
 #endif

    for (glyphCounter = 0; glyphCounter < totalGlyphs; glyphCounter++) {
--- a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
+++ b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
@@ -260,7 +260,7 @@ Java_sun_font_FreetypeFontScaler_initIDs(
        fcConfig = (*FcInitLoadConfigAndFontsPtr)();
        if (fcConfig != NULL && fontConf != NULL) {
            result = (*FcConfigParseAndLoadPtr)(fcConfig, (const FcChar8 *) fontConf, FcFalse);
-            if (logFC) fprintf(stderr, "FC_LOG: FcConfigParseAndLoad(\"%s\") %d \n", fontConf,  result);
+            if (logFC) fprintf(stderr, "FC_LOG: FcConfigParseAndLoad %d \n", result);
            result = (*FcConfigSetCurrentPtr)(fcConfig);
            if (logFC) fprintf(stderr, "FC_LOG: FcConfigSetCurrent %d \n", result);
        }
--- a/src/java.desktop/unix/classes/sun/awt/X11/Native.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/Native.java
@@ -374,20 +374,6 @@ class Native {
        return res;
    }

-    /**
-     * Access to C double data(eight bytes)
-     */
-    static final int DOUBLE_SIZE = 8;
-    static double getDouble(long ptr) { return unsafe.getDouble(ptr); }
-    static double getDouble(long ptr, int index) { return getDouble(ptr + DOUBLE_SIZE * index); }
-    /**
-     * Stores to C double data(eight bytes)
-     */
-    static void putDouble(long ptr, double data) { unsafe.putDouble(ptr, data); }
-    static void putDouble(long ptr, int index, double data) {
-        putDouble(ptr + index * DOUBLE_SIZE, data);
-    }
-

    /**
     * Access to C "unsigned long" date type, which is XID in X
--- a/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
@@ -55,9 +55,7 @@ public class XBaseWindow {
        VISIBLE = "visible", // whether it is visible by default
        SAVE_UNDER = "save under", // save content under this window
        BACKING_STORE = "backing store", // enables double buffering
-        BIT_GRAVITY = "bit gravity", // copy old content on geometry change
-        XI_EVENT_MASK = "xi event mask", // xi event mask, Long
-        XI_DEVICE_ID = "xi device id"; // xi device id, Integer
+        BIT_GRAVITY = "bit gravity"; // copy old content on geometry change
    private XCreateWindowParams delayedParams;

    Set<Long> children = new HashSet<Long>();
@@ -396,19 +394,6 @@ public class XBaseWindow {
                    throw new IllegalStateException("Couldn't create window because of wrong parameters. Run with NOISY_AWT to see details");
                }
                XToolkit.addToWinMap(window, this);
-
-                Long xiEventMask = (Long) params.get(XI_EVENT_MASK);
-                if (xiEventMask != null && XToolkit.isXInputEnabled()) {
-                    Integer xiDeviceId = (Integer) params.get(XI_DEVICE_ID);
-                    if (xiDeviceId == null) {
-                        xiDeviceId = XConstants.XIAllDevices;
-                    }
-
-                    int status = XToolkit.XISelectEvents(XToolkit.getDisplay(), window, xiEventMask, xiDeviceId);
-                    if (status != XConstants.Success) {
-                        throw new IllegalStateException("Couldn't select XI events. Status: " + status);
-                    }
-                }
            } finally {
                xattr.dispose();
            }
@@ -1080,10 +1065,6 @@ public class XBaseWindow {
        width = scaleDown(xe.get_width());
        height = scaleDown(xe.get_height());
    }
-
-    public void handleTouchEvent(XEvent xev) {
-    }
-
    /**
     * Checks ButtonRelease released all Mouse buttons
     */
@@ -1123,12 +1104,6 @@ public class XBaseWindow {
        if (target == null || !isGrabbedEvent(ev, target)) {
            target = XToolkit.windowToXWindow(ev.get_xany().get_window());
        }
-
-        if (target == null && ev.get_type() == XConstants.GenericEvent &&
-                XlibWrapper.XGetEventData(ev.get_xgeneric().get_display(), ev.pData)) {
-            target = XToolkit.windowToXWindow(XToolkit.GetXIDeviceEvent(ev.get_xcookie()).get_event());
-        }
-
        if (target != null && target.checkInitialised()) {
            target.dispatchEvent(ev);
        }
@@ -1195,17 +1170,6 @@ public class XBaseWindow {
          case XConstants.CreateNotify:
              handleCreateNotify(xev);
              break;
-          case XConstants.GenericEvent:
-              switch (xev.get_xgeneric().get_evtype()) {
-                  case XConstants.XI_TouchBegin:
-                  case XConstants.XI_TouchUpdate:
-                  case XConstants.XI_TouchEnd:
-                      handleTouchEvent(xev);
-                      break;
-                  default:
-                      break;
-              }
-              break;
        }
    }
    protected boolean isEventDisabled(XEvent e) {
--- a/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java
@@ -170,8 +170,7 @@ public final class XConstants {
    public static final int ColormapNotify = 32 ;
    public static final int ClientMessage = 33 ;
    public static final int MappingNotify = 34 ;
-    public static final int GenericEvent = 35 ;
-    public static final int LASTEvent = 36 ; /* must be bigger than any event # */
+    public static final int LASTEvent = 35 ; /* must be bigger than any event # */


    /* Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer,
@@ -675,70 +674,4 @@ public final class XConstants {
    public static final long XkbModifierMapMask = (1L<<2);
    public static final long XkbVirtualModsMask = (1L<<6); //server map

-    /* Fake device ID's for event selection */
-    public static final int XIAllDevices = 0;
-    public static final int XIAllMasterDevices = 1;
-
-    /* XI Event types */
-    public static final int XI_DeviceChanged = 1;
-    public static final int XI_KeyPress = 2;
-    public static final int XI_KeyRelease = 3;
-    public static final int XI_ButtonPress = 4;
-    public static final int XI_ButtonRelease = 5;
-    public static final int XI_Motion = 6;
-    public static final int XI_Enter = 7;
-    public static final int XI_Leave = 8;
-    public static final int XI_FocusIn = 9;
-    public static final int XI_FocusOut = 10;
-    public static final int XI_HierarchyChanged = 11;
-    public static final int XI_PropertyEvent = 12;
-    public static final int XI_RawKeyPress = 13;
-    public static final int XI_RawKeyRelease = 14;
-    public static final int XI_RawButtonPress = 15;
-    public static final int XI_RawButtonRelease = 16;
-    public static final int XI_RawMotion = 17;
-    public static final int XI_TouchBegin = 18;/* XI 2.2 */
-    public static final int XI_TouchUpdate = 19;
-    public static final int XI_TouchEnd = 20;
-    public static final int XI_TouchOwnership = 21;
-    public static final int XI_RawTouchBegin = 22;
-    public static final int XI_RawTouchUpdate = 23;
-    public static final int XI_RawTouchEnd = 24;
-    public static final int XI_BarrierHit = 25;/* XI 2.3 */
-    public static final int XI_BarrierLeave = 26;
-    public static final int XI_LASTEVENT = XI_BarrierLeave;
-    /* NOTE: XI2LASTEVENT in xserver/include/inputstr.h must be the same value
-     * as XI_LASTEVENT if the server is supposed to handle masks etc. for this
-     * type of event. */
-
-    /* Event masks.
-     * Note: the protocol spec defines a mask to be of (1 << type). Clients are
-     * free to create masks by bitshifting instead of using these defines.
-     */
-    public static final long XI_DeviceChangedMask = 1L << XI_DeviceChanged;
-    public static final long XI_KeyPressMask = 1L << XI_KeyPress;
-    public static final long XI_KeyReleaseMask = 1L << XI_KeyRelease;
-    public static final long XI_ButtonPressMask = 1L << XI_ButtonPress;
-    public static final long XI_ButtonReleaseMask = 1L << XI_ButtonRelease;
-    public static final long XI_MotionMask = 1L << XI_Motion;
-    public static final long XI_EnterMask = 1L << XI_Enter;
-    public static final long XI_LeaveMask = 1L << XI_Leave;
-    public static final long XI_FocusInMask = 1L << XI_FocusIn;
-    public static final long XI_FocusOutMask = 1L << XI_FocusOut;
-    public static final long XI_HierarchyChangedMask = 1L << XI_HierarchyChanged;
-    public static final long XI_PropertyEventMask = 1L << XI_PropertyEvent;
-    public static final long XI_RawKeyPressMask = 1L << XI_RawKeyPress;
-    public static final long XI_RawKeyReleaseMask = 1L << XI_RawKeyRelease;
-    public static final long XI_RawButtonPressMask = 1L << XI_RawButtonPress;
-    public static final long XI_RawButtonReleaseMask = 1L << XI_RawButtonRelease;
-    public static final long XI_RawMotionMask = 1L << XI_RawMotion;
-    public static final long XI_TouchBeginMask = 1L << XI_TouchBegin;
-    public static final long XI_TouchEndMask = 1L << XI_TouchEnd;
-    public static final long XI_TouchOwnershipChangedMask = 1L << XI_TouchOwnership;
-    public static final long XI_TouchUpdateMask = 1L << XI_TouchUpdate;
-    public static final long XI_RawTouchBeginMask = 1L << XI_RawTouchBegin;
-    public static final long XI_RawTouchEndMask = 1L << XI_RawTouchEnd;
-    public static final long XI_RawTouchUpdateMask = 1L << XI_RawTouchUpdate;
-    public static final long XI_BarrierHitMask = 1L << XI_BarrierHit;
-    public static final long XI_BarrierLeaveMask = 1L << XI_BarrierLeave;
 }
--- a/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
@@ -340,7 +340,6 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
                log.finer("X locale modifiers are not supported, using default");
            }
            tryXKB();
-            checkXInput();

            AwtScreenData defaultScreen = new AwtScreenData(XToolkit.getDefaultScreenData());
            awt_defaultFg = defaultScreen.get_blackpixel();
@@ -742,8 +741,6 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
                XBaseWindow.ungrabInput();
                processException(thr);
            } finally {
-                // free event data if XGetEventData was called
-                XlibWrapper.XFreeEventData(getDisplay(), ev.pData);
                awtUnlock();
            }
        }
@@ -2576,58 +2573,6 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
        }
    }

-    private static volatile boolean hasXInputExtension = false;
-
-    public static boolean isXInputEnabled() {
-        return hasXInputExtension;
-    }
-
-    public static void checkXInput() {
-        awtLock();
-        try {
-            String extensionName = "XInputExtension";
-            boolean hasExtension = XlibWrapper.XQueryExtension(XToolkit.getDisplay(), extensionName,
-                    XlibWrapper.iarg1, XlibWrapper.iarg2, XlibWrapper.iarg3);
-            if (!hasExtension) {
-                log.warning("X Input extension isn't available, error: {0}", Native.getInt(XlibWrapper.iarg1));
-                return;
-            }
-
-            final int requiredMajor = 2;
-            final int requiredMinor = 2;
-            Native.putInt(XlibWrapper.iarg1, requiredMajor);
-            Native.putInt(XlibWrapper.iarg2, requiredMinor);
-            int status = XlibWrapper.XIQueryVersion(XToolkit.getDisplay(), XlibWrapper.iarg1, XlibWrapper.iarg2);
-            if (status == XConstants.BadRequest) {
-                log.warning("X Input2 not supported in the server");
-                return;
-            }
-
-            int major = Native.getInt(XlibWrapper.iarg1);
-            int minor = Native.getInt(XlibWrapper.iarg2);
-            if (major >= requiredMajor && minor >= requiredMinor) {
-                hasXInputExtension = true;
-            } else {
-                log.warning("Desired version is 2.2, server version is {0}.{1}", major, minor);
-            }
-        } finally {
-            awtUnlock();
-        }
-    }
-
-    public static XIDeviceEvent GetXIDeviceEvent(XGenericEventCookie cookie) {
-        return new XIDeviceEvent(cookie.get_data());
-    }
-
-    public static int XISelectEvents(long display, long window, long mask, int deviceid) {
-        if (isXInputEnabled()) {
-            return XlibWrapper.XISelectEvents(display, window, mask, deviceid);
-        } else {
-            log.warning("Attempting to select xi events while xinput isn't available");
-            return XConstants.BadRequest;
-        }
-    }
-
    private static long eventNumber;
    public static long getEventNumber() {
        awtLock();
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
@@ -37,6 +37,8 @@ import sun.util.logging.PlatformLogger;

 import sun.awt.*;

+import sun.awt.image.PixelConverter;
+
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;

@@ -57,14 +59,6 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
    static long lastButton = 0;
    static WeakReference<XWindow> lastWindowRef = null;
    static int clickCount = 0;
-    private static int touchBeginX = 0, touchBeginY = 0;
-    private static int trackingId = 0;
-    private static boolean isTouchScroll = false;
-    private static final int TOUCH_CLICK_RADIUS = 3;
-    // all touch scrolls are measured in pixels
-    private static final int TOUCH_BEGIN = 2;
-    private static final int TOUCH_UPDATE = 3;
-    private static final int TOUCH_END = 4;

    // used to check if we need to re-create surfaceData.
    int oldWidth = -1;
@@ -229,11 +223,6 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {

        params.putIfNull(BACKING_STORE, XToolkit.getBackingStoreType());

-        params.putIfNull(XI_EVENT_MASK, XConstants.XI_TouchBeginMask |
-                        XConstants.XI_TouchUpdateMask |
-                        XConstants.XI_TouchEndMask);
-        params.putIfNull(XI_DEVICE_ID, XConstants.XIAllMasterDevices);
-
        XToolkit.awtLock();
        try {
            if (wm_protocols == null) {
@@ -780,112 +769,6 @@ class XWindow extends XBaseWindow implements X11ComponentPeer {
        }
    }

-    public void handleTouchEvent(XEvent xev) {
-        super.handleTouchEvent(xev);
-
-        XIDeviceEvent dev = XToolkit.GetXIDeviceEvent(xev.get_xcookie());
-        // TODO remove this after TouchEvents support
-        // own touch processing by tracking id
-        if (isTouchReleased()) {
-            trackingId = dev.get_detail();
-        } else if (!isOwningTouch(dev.get_detail())) {
-            return;
-        }
-
-        int x = scaleDown((int) dev.get_event_x());
-        int y = scaleDown((int) dev.get_event_y());
-
-        if (dev.get_event() != window) {
-            Point localXY = toLocal(x, y);
-            x = localXY.x;
-            y = localXY.y;
-        }
-
-        int button = XConstants.buttons[0];
-        int modifiers = getModifiers(dev.get_mods().get_effective(), button, 0);
-        // turning off shift modifier
-        modifiers &= ~InputEvent.SHIFT_DOWN_MASK;
-
-        long jWhen = XToolkit.nowMillisUTC_offset(dev.get_time());
-
-        switch (dev.get_evtype()) {
-            case XConstants.XI_TouchBegin:
-                isTouchScroll = false;
-                touchBeginX = x;
-                touchBeginY = y;
-                break;
-            case XConstants.XI_TouchUpdate:
-                if (isInsideTouchClickBoundaries(x, y)) {
-                    return;
-                }
-
-                if (!isTouchScroll) {
-                    sendWheelEventFromTouch(dev, jWhen, modifiers, touchBeginX, touchBeginY, TOUCH_BEGIN, 1);
-                    isTouchScroll = true;
-                }
-
-                if (lastY - y != 0) {
-                    sendWheelEventFromTouch(dev, jWhen, modifiers, x, y, TOUCH_UPDATE, lastY - y);
-                }
-                // horizontal scroll
-                if (lastX - x != 0) {
-                    modifiers |= InputEvent.SHIFT_DOWN_MASK;
-                    sendWheelEventFromTouch(dev, jWhen, modifiers, x, y, TOUCH_UPDATE, lastX - x);
-                }
-                break;
-            case XConstants.XI_TouchEnd:
-                if (isTouchScroll) {
-                    sendWheelEventFromTouch(dev, jWhen, modifiers, x, y, TOUCH_END, 1);
-                } else {
-                    sendMouseEventFromTouch(dev, MouseEvent.MOUSE_PRESSED, jWhen, modifiers, touchBeginX, touchBeginY, button);
-                    sendMouseEventFromTouch(dev, MouseEvent.MOUSE_RELEASED, jWhen, modifiers, touchBeginX, touchBeginY, button);
-                    sendMouseEventFromTouch(dev, MouseEvent.MOUSE_CLICKED, jWhen, modifiers, touchBeginX, touchBeginY, button);
-                }
-
-                // release touch processing
-                trackingId = 0;
-                break;
-        }
-
-        lastX = x;
-        lastY = y;
-    }
-
-    private boolean isInsideTouchClickBoundaries(int x, int y) {
-        return Math.abs(touchBeginX - x) <= TOUCH_CLICK_RADIUS &&
-                Math.abs(touchBeginY - y) <= TOUCH_CLICK_RADIUS;
-    }
-
-    private static boolean isOwningTouch(int fingerId) {
-        return trackingId == fingerId;
-    }
-
-    private static boolean isTouchReleased() {
-        return trackingId == 0;
-    }
-
-    private void sendWheelEventFromTouch(XIDeviceEvent dev, long jWhen, int modifiers, int x, int y, int type, int delta) {
-        postEventToEventQueue(
-                new MouseWheelEvent(getEventSource(), MouseEvent.MOUSE_WHEEL, jWhen,
-                        modifiers,
-                        x, y,
-                        scaleDown((int) dev.get_root_x()),
-                        scaleDown((int) dev.get_root_y()),
-                        0, false, type,
-                        1, delta));
-    }
-
-    private void sendMouseEventFromTouch(XIDeviceEvent dev, int type, long jWhen, int modifiers, int x, int y, int button) {
-        postEventToEventQueue(
-                new MouseEvent(getEventSource(), type, jWhen,
-                        modifiers,
-                        x, y,
-                        scaleDown((int) dev.get_root_x()),
-                        scaleDown((int) dev.get_root_y()),
-                        1,
-                        false, button));
-    }
-
    public void handleMotionNotify(XEvent xev) {
        super.handleMotionNotify(xev);
        XMotionEvent xme = xev.get_xmotion();
--- a/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
@@ -564,12 +564,6 @@ static native String XSetLocaleModifiers(String modifier_list);

    static native void SetZOrder(long display, long window, long above);

-    static native int XIQueryVersion(long display, long major_version_iptr, long minor_version_iptr);
-    static native int XISelectEvents(long display, long window, long mask, int deviceid);
-
-    static native boolean XGetEventData(long display, long ptr);
-    static native void XFreeEventData(long display, long ptr);
-
 /* Global memory area used for X lib parameter passing */

    static final long lbuffer = unsafe.allocateMemory(64);  // array to hold 8 longs
--- a/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
+++ b/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
@@ -37,8 +37,6 @@
 #include <string.h>
 #include <X11/extensions/Xdbe.h>
 #include <X11/extensions/shape.h>
-#include <X11/extensions/XI2.h>
-#include <X11/extensions/XInput2.h>
 #include <X11/keysym.h>
 #include <X11/Sunkeysym.h>
 #include <X11/Xlib.h>
@@ -2319,63 +2317,6 @@ Java_sun_awt_X11_XlibWrapper_SetZOrder
                     value_mask, &wc );
 }

-/*
- * Class:     XlibWrapper
- * Method:    XIQueryVersion
- */
-JNIEXPORT jint JNICALL
-Java_sun_awt_X11_XlibWrapper_XIQueryVersion
-(JNIEnv *env, jclass clazz, jlong display, jlong major_version_iptr, jlong minor_version_iptr)
-{
-    return XIQueryVersion((Display *)jlong_to_ptr(display),
-        jlong_to_ptr(major_version_iptr), jlong_to_ptr(minor_version_iptr));
-}
-
-/*
- * Class:     XlibWrapper
- * Method:    XISelectEvents
- */
-JNIEXPORT jint JNICALL
-Java_sun_awt_X11_XlibWrapper_XISelectEvents
-(JNIEnv *env, jclass clazz, jlong display, jlong window, jlong mask, jint deviceid)
-{
-    XIEventMask evmask;
-    evmask.deviceid = (int)deviceid;
-    evmask.mask_len = XIMaskLen(XI_LASTEVENT);
-    union jlong_to_char_ptr
-    {
-        jlong value;
-        unsigned char mask[8];
-    } converter;
-    converter.value = mask;
-    evmask.mask = &converter.mask;
-    return XISelectEvents((Display *)jlong_to_ptr(display), (Window)jlong_to_ptr(window),
-                          &evmask, /*num masks*/ 1);
-}
-
-/*
- * Class:     XlibWrapper
- * Method:    XGetEventData
- */
-JNIEXPORT jboolean JNICALL
-Java_sun_awt_X11_XlibWrapper_XGetEventData
-(JNIEnv *env, jclass clazz, jlong display, jlong ptr)
-{
-    return XGetEventData((Display *)jlong_to_ptr(display),
-                         (XGenericEventCookie *)ptr_to_jlong(ptr)) ? JNI_TRUE : JNI_FALSE;
-}
-
-/*
- * Class:     XlibWrapper
- * Method:    XFreeEventData
- */
-JNIEXPORT void JNICALL
-Java_sun_awt_X11_XlibWrapper_XFreeEventData
-(JNIEnv *env, jclass clazz, jlong display, jlong ptr)
-{
-    return XFreeEventData((Display *)jlong_to_ptr(display), (XGenericEventCookie *)ptr_to_jlong(ptr));
-}
-
 /*
 * Class:     XlibWrapper
 * Method:    SetBitmapShape
--- a/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
@@ -224,11 +224,10 @@ BOOL windowMoveLockHeld = FALSE;
 AwtComponent::AwtComponent()
 {
    m_mouseButtonClickAllowed = 0;
-
-    m_isTouchScroll = FALSE;
-    m_touchDownPoint = {0, 0};
-    m_lastTouchPoint = {0, 0};
-
+    m_touchDownOccurred = FALSE;
+    m_touchUpOccurred = FALSE;
+    m_touchDownPoint.x = m_touchDownPoint.y = 0;
+    m_touchUpPoint.x = m_touchUpPoint.y = 0;
    m_callbacksEnabled = FALSE;
    m_hwnd = NULL;

@@ -1395,10 +1394,6 @@ void SpyWinMessage(HWND hwnd, UINT message, LPCTSTR szComment) {

 #endif /* SPY_MESSAGES */

-static BOOL IsMouseEventFromTouch()
-{
-    return (::GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) == MOUSEEVENTF_FROMTOUCH;
-}
 /*
 * Dispatch messages for this window class--general component
 */
@@ -1715,9 +1710,6 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
      case WM_MOUSEHWHEEL:
      case WM_AWT_MOUSEENTER:
      case WM_AWT_MOUSEEXIT:
-          if (IsMouseEventFromTouch()) {
-              break;
-          }
          curPos = ::GetMessagePos();
          POINT myPos;
          myPos.x = GET_X_LPARAM(curPos);
@@ -2393,90 +2385,27 @@ void AwtComponent::WmTouch(WPARAM wParam, LPARAM lParam) {

    UINT inputsCount = LOWORD(wParam);
    TOUCHINPUT* pInputs = new TOUCHINPUT[inputsCount];
-    if (tk.TIGetTouchInputInfo((HTOUCHINPUT)lParam, inputsCount, pInputs,
-                               sizeof(TOUCHINPUT)) != 0) {
-        for (UINT i = 0; i < inputsCount; i++) {
-            WmTouchHandler(pInputs[i]);
-        }
-    }
-    delete[] pInputs;
-}
-
-BOOL AwtComponent::IsInsideTouchClickBoundaries(POINT p)
-{
-    return abs(p.x - m_touchDownPoint.x) <= TOUCH_MOUSE_COORDS_DELTA &&
-           abs(p.y - m_touchDownPoint.y) <= TOUCH_MOUSE_COORDS_DELTA;
-}
-
-POINT AwtComponent::TouchCoordsToLocal(LONG x, LONG y)
-{
-    POINT p{TOUCH_COORD_TO_PIXEL(x), TOUCH_COORD_TO_PIXEL(y)};
-    ::ScreenToClient(GetHWnd(), &p);
-    return p;
-}
-
-void AwtComponent::SendMouseWheelEventFromTouch(POINT p, jint modifiers, jint scrollType, jint pixels)
-{
-    SendMouseWheelEvent(java_awt_event_MouseEvent_MOUSE_WHEEL, ::JVM_CurrentTimeMillis(NULL, 0),
-                        p.x, p.y, modifiers, 0, 0, scrollType,
-                        /*scrollAmount*/ 1, pixels,
-                        static_cast<double>(pixels), /*msg*/ nullptr);
-}
-
-void AwtComponent::SendMouseEventFromTouch(jint id, POINT p, jint modifiers)
-{
-    SendMouseEvent(id, ::JVM_CurrentTimeMillis(NULL, 0), p.x, p.y,
-                   modifiers, /*clickCount*/ 1, JNI_FALSE,
-                   java_awt_event_MouseEvent_BUTTON1,
-                   /*msg*/ nullptr, /*causedByTouchEvent*/ TRUE);
-}
-
-void AwtComponent::WmTouchHandler(const TOUCHINPUT& touchInput)
-{
-    // skip multitouch, remove after gesture support
-    if (!(touchInput.dwFlags & TOUCHEVENTF_PRIMARY)) {
-        return;
-    }
-
-    jint modifiers = GetJavaModifiers();
-    // turn off horizontal
-    modifiers &= ~java_awt_event_InputEvent_SHIFT_DOWN_MASK;
-    const POINT p = TouchCoordsToLocal(touchInput.x, touchInput.y);
-
-    if (touchInput.dwFlags & TOUCHEVENTF_DOWN) {
-        m_touchDownPoint = p;
-        m_lastTouchPoint = p;
-        m_isTouchScroll = FALSE;
-    } else if (touchInput.dwFlags & TOUCHEVENTF_MOVE) {
-        if (IsInsideTouchClickBoundaries(p)) {
-            return;
-        }
-
-        if (!m_isTouchScroll) {
-            SendMouseWheelEventFromTouch(p, modifiers, TOUCH_BEGIN, 1);
-            m_isTouchScroll = TRUE;
-        }
-
-        const int deltaY = ScaleDownY(static_cast<int>(m_lastTouchPoint.y - p.y));
-        if (abs(deltaY) != 0) {
-            SendMouseWheelEventFromTouch(p, modifiers, TOUCH_UPDATE, deltaY);
-        }
-        
-        const int deltaX = ScaleDownX(static_cast<int>(m_lastTouchPoint.x - p.x));
-        if (abs(deltaX) != 0) {
-            modifiers |= java_awt_event_InputEvent_SHIFT_DOWN_MASK;
-            SendMouseWheelEventFromTouch(p, modifiers, TOUCH_UPDATE, deltaX);
-        }
-
-        m_lastTouchPoint = p;
-    } else if (touchInput.dwFlags & TOUCHEVENTF_UP) {
-        if (m_isTouchScroll) {
-            SendMouseWheelEventFromTouch(p, modifiers, TOUCH_END, 1);
-        } else {
-            SendMouseEventFromTouch(java_awt_event_MouseEvent_MOUSE_PRESSED, p, modifiers);
-            SendMouseEventFromTouch(java_awt_event_MouseEvent_MOUSE_RELEASED, p, modifiers);
-            SendMouseEventFromTouch(java_awt_event_MouseEvent_MOUSE_CLICKED, p, modifiers);
+    if (pInputs != NULL) {
+        if (tk.TIGetTouchInputInfo((HTOUCHINPUT)lParam, inputsCount, pInputs,
+                sizeof(TOUCHINPUT)) != 0) {
+            for (UINT i = 0; i < inputsCount; i++) {
+                TOUCHINPUT ti = pInputs[i];
+                if (ti.dwFlags & TOUCHEVENTF_PRIMARY) {
+                    if (ti.dwFlags & TOUCHEVENTF_DOWN) {
+                        m_touchDownPoint.x = ti.x / 100;
+                        m_touchDownPoint.y = ti.y / 100;
+                        ::ScreenToClient(GetHWnd(), &m_touchDownPoint);
+                        m_touchDownOccurred = TRUE;
+                    } else if (ti.dwFlags & TOUCHEVENTF_UP) {
+                        m_touchUpPoint.x = ti.x / 100;
+                        m_touchUpPoint.y = ti.y / 100;
+                        ::ScreenToClient(GetHWnd(), &m_touchUpPoint);
+                        m_touchUpOccurred = TRUE;
+                    }
+                }
+            }
        }
+        delete[] pInputs;
    }
 }

@@ -2522,6 +2451,14 @@ MsgRouting AwtComponent::WmMouseDown(UINT flags, int x, int y, int button)
    m_mouseButtonClickAllowed |= GetButtonMK(button);
    lastTime = now;

+    BOOL causedByTouchEvent = FALSE;
+    if (m_touchDownOccurred &&
+        (abs(m_touchDownPoint.x - x) <= TOUCH_MOUSE_COORDS_DELTA) &&
+        (abs(m_touchDownPoint.y - y) <= TOUCH_MOUSE_COORDS_DELTA)) {
+        causedByTouchEvent = TRUE;
+        m_touchDownOccurred = FALSE;
+    }
+
    MSG msg;
    InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);

@@ -2540,7 +2477,7 @@ MsgRouting AwtComponent::WmMouseDown(UINT flags, int x, int y, int button)

    SendMouseEvent(java_awt_event_MouseEvent_MOUSE_PRESSED, now, x, y,
                   GetJavaModifiers(), clickCount, JNI_FALSE,
-                   GetButton(button), &msg, /*causedByTouchEvent*/ FALSE);
+                   GetButton(button), &msg, causedByTouchEvent);
    /*
     * NOTE: this call is intentionally placed after all other code,
     * since AwtComponent::WmMouseDown() assumes that the cached id of the
@@ -2562,13 +2499,21 @@ MsgRouting AwtComponent::WmMouseDown(UINT flags, int x, int y, int button)

 MsgRouting AwtComponent::WmMouseUp(UINT flags, int x, int y, int button)
 {
+    BOOL causedByTouchEvent = FALSE;
+    if (m_touchUpOccurred &&
+        (abs(m_touchUpPoint.x - x) <= TOUCH_MOUSE_COORDS_DELTA) &&
+        (abs(m_touchUpPoint.y - y) <= TOUCH_MOUSE_COORDS_DELTA)) {
+        causedByTouchEvent = TRUE;
+        m_touchUpOccurred = FALSE;
+    }
+
    MSG msg;
    InitMessage(&msg, lastMessage, flags, MAKELPARAM(x, y), x, y);

    SendMouseEvent(java_awt_event_MouseEvent_MOUSE_RELEASED, ::JVM_CurrentTimeMillis(NULL, 0),
                   x, y, GetJavaModifiers(), clickCount,
                   (GetButton(button) == java_awt_event_MouseEvent_BUTTON3 ?
-                    TRUE : FALSE), GetButton(button), &msg, /*causedByTouchEvent*/ FALSE);
+                    TRUE : FALSE), GetButton(button), &msg, causedByTouchEvent);
    /*
     * If no movement, then report a click following the button release.
     * When WM_MOUSEUP comes to a window without previous WM_MOUSEDOWN,
--- a/src/java.desktop/windows/native/libawt/windows/awt_Component.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Component.h
@@ -71,9 +71,6 @@ const int X_BUTTONS = MK_XBUTTON1|MK_XBUTTON2;
 // corresponding WM_LBUTTONDOWN/WM_LBUTTONUP event letting to associate these
 // events, when their coordinates are slightly different.
 const int TOUCH_MOUSE_COORDS_DELTA = 10;
-const int TOUCH_BEGIN = 2;
-const int TOUCH_UPDATE = 3;
-const int TOUCH_END = 4;

 // Whether to check for embedded frame and adjust location
 #define CHECK_EMBEDDED 0
@@ -535,11 +532,6 @@ public:
    virtual MsgRouting WmWindowPosChanging(LPARAM windowPos);
    virtual MsgRouting WmWindowPosChanged(LPARAM windowPos);
    virtual void WmTouch(WPARAM wParam, LPARAM lParam);
-    void WmTouchHandler(const TOUCHINPUT& touchInput);
-    BOOL IsInsideTouchClickBoundaries(POINT p);
-    POINT TouchCoordsToLocal(LONG x, LONG y);
-    void SendMouseWheelEventFromTouch(POINT p, jint modifiers, jint scrollType, jint pixels);
-    void SendMouseEventFromTouch(jint id, POINT p, jint modifiers);

    // NB: 64-bit: vkey is wParam of the message, but other API's take
    // vkey parameters of type UINT, so we do the cast before dispatching.
@@ -789,9 +781,10 @@ private:
    */
    UINT m_mouseButtonClickAllowed;

-    BOOL m_isTouchScroll;
+    BOOL m_touchDownOccurred;
+    BOOL m_touchUpOccurred;
    POINT m_touchDownPoint;
-    POINT m_lastTouchPoint;
+    POINT m_touchUpPoint;

    BOOL m_bSubclassed;
    BOOL m_bPauseDestroy;
--- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h
@@ -198,13 +198,6 @@ class CriticalSection {
    #define TOUCHEVENTF_NOCOALESCE      0x0020
    #define TOUCHEVENTF_PEN             0x0040
    #define TOUCHEVENTF_PALM            0x0080
-
-    #define MOUSEEVENTF_FROMTOUCH       0xFF515700
-    
-    /*
-    * Conversion of touch input coordinates to pixels
-    */
-    #define TOUCH_COORD_TO_PIXEL(l)         ((l) / 100)
 #endif

 /************************************************************************
--- a/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp
@@ -1179,9 +1179,6 @@ AwtWindow* AwtWindow::Create(jobject self, jobject parent)
            if (env->ExceptionCheck()) goto done;
            DWORD style = WS_CLIPCHILDREN | WS_POPUP;
            DWORD exStyle = WS_EX_NOACTIVATE;
-            if (JNU_CallMethodByName(env, NULL, target, "isIgnoreMouseEvents", "()Z").z) {
-                exStyle |= WS_EX_LAYERED | WS_EX_TRANSPARENT;
-            }
            if (GetRTL()) {
                exStyle |= WS_EX_RIGHT | WS_EX_LEFTSCROLLBAR;
                if (GetRTLReadingOrder())
--- a/test/hotspot/jtreg/jbProblemList.txt
+++ b/test/hotspot/jtreg/jbProblemList.txt
@@ -38,7 +38,7 @@
 #
 #############################################################################

-applications/jcstress/acqrel/Test.java - generic-all
+applications/jcstress/acqrel/Test.java generic-all

 # :hotspot_compiler

@@ -47,7 +47,6 @@ compiler/codecache/stress/OverloadCompileQueueTest.java
 compiler/codegen/Test6896617.java                                                   8193479 generic-all
 compiler/codegen/aes/TestCipherBlockChainingEncrypt.java                            8219513 generic-all
 compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java                     8140405 generic-all
-compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java                  8209459 linux-aarch64
 compiler/jsr292/ContinuousCallSiteTargetChange.java                                 8222030 generic-all
 compiler/jvmci/compilerToVM/GetFlagValueTest.java                                   8204459 generic-all
 compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java                            8158860 generic-all
@@ -57,7 +56,6 @@ compiler/types/correctness/CorrectnessTest.java
 compiler/types/correctness/OffTest.java                                             8066173 generic-all

 compiler/c2/Test6852078.java                                                        8194310 generic-all
-compiler/c2/Test6857159.java                                                        8234290 generic-all

 applications/ctw/modules/java_desktop.java 8189604 windows-all
 applications/ctw/modules/java_desktop_2.java 8189604,8204842 generic-all
@@ -91,8 +89,6 @@ runtime/SelectionResolution/InvokeVirtualSuccessTest.java
 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
-runtime/modules/ModuleStress/ExportModuleStressTest.java                            8230055 windows-all
-runtime/modules/ModuleStress/ModuleStressGC.java                                    8230055 windows-all

 #############################################################################

@@ -209,33 +205,29 @@ vmTestbase/nsk/jvmti/IterateThroughHeap/filter-untagged/TestDescription.java

 vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java                       JRE-1282 macosx-10.13

-vmTestbase/gc/lock/jni/jnilock002/TestDescription.java                              8208243,8192647 generic-all
+vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8208243,8192647 generic-all

-vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java         8148743 generic-all
-vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java         8208259 generic-all
+vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java 8148743 generic-all
+vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java 8208259 generic-all

-vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java    8013267 generic-all
-vmTestbase/vm/mlvm/indy/stress/java/relinkMutableCallSite/Test.java                 8079664 generic-all
-vmTestbase/vm/mlvm/indy/stress/java/relinkVolatileCallSite/Test.java                8079664 generic-all
-vmTestbase/vm/mlvm/cp/stress/classfmt/correctBootstrap/TestDescription.java         8231169 linux-aarch64
-vmTestbase/vm/mlvm/cp/stress/classfmt/mh/TestDescription.java                       8231169 linux-aarch64
-vmTestbase/vm/mlvm/meth/stress/gc/createLotsOfMHConsts/Test.java                    8231169 linux-aarch64
-vmTestbase/vm/mlvm/meth/func/java/throwException/Test.java                          8208255 generic-all
-vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java                   8208257,8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java                        8079642,8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java                           8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java                         8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/gc/callSequencesDuringGC/Test.java                   8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/java/sequences/Test.java                             8208255 generic-all
-vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java               8208255 generic-all
-vmTestbase/vm/mlvm/mixed/stress/java/findDeadlock/TestDescription.java              8208278 generic-all
-vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java                8079650 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_a/TestDescription.java         8013267 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java     8013267 generic-all
-vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java     8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java 8013267 generic-all
+vmTestbase/vm/mlvm/indy/stress/java/relinkMutableCallSite/Test.java 8079664 generic-all
+vmTestbase/vm/mlvm/indy/stress/java/relinkVolatileCallSite/Test.java 8079664 generic-all
+vmTestbase/vm/mlvm/meth/func/java/throwException/Test.java 8208255 generic-all
+vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java 8208257,8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java 8079642,8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java 8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java 8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/gc/callSequencesDuringGC/Test.java 8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/java/sequences/Test.java 8208255 generic-all
+vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java 8208255 generic-all
+vmTestbase/vm/mlvm/mixed/stress/java/findDeadlock/TestDescription.java 8208278 generic-all
+vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java 8079650 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_a/TestDescription.java 8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java 8013267 generic-all
+vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java 8013267 generic-all

-vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java                               8197938 windows-all
-vmTestbase/nsk/jdb/unwatch/unwatch002/unwatch002.java.unwatch002                    8208471 windows-all
+vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java 8197938 windows-all

 vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java 7199837 generic-all

--- a/test/jdk/jb/sun/awt/macos/KeyboardLayoutSwitchTest/KeyboardLayoutSwitchTest.java
+++ b/test/jdk/jb/sun/awt/macos/KeyboardLayoutSwitchTest/KeyboardLayoutSwitchTest.java
@@ -1,62 +0,0 @@
-/*
- * 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.*;
-import java.awt.event.KeyEvent;
-
-public class KeyboardLayoutSwitchTest implements Runnable {
-
-    private static Robot robot;
-    private JFrame frame;
-
-    public static void main(String[] args) throws Exception {
-
-        System.out.println("VK_TAB = " + KeyEvent.VK_TAB);
-        robot = new Robot();
-        robot.setAutoDelay(50);
-
-        KeyboardLayoutSwitchTest test = new KeyboardLayoutSwitchTest();
-        SwingUtilities.invokeAndWait(test);
-        robot.delay(3000);
-
-        try {
-            SwingUtilities.invokeAndWait(() ->
-                    pressCtrlKey(KeyEvent.VK_TAB));
-        } 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() {
-        frame = new JFrame(getClass().getSimpleName());
-        frame.pack();
-        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        frame.setLocationRelativeTo(null);
-        frame.setVisible(true);
-        frame.toFront();
-    }
-}
--- a/test/jdk/jb/sun/awt/macos/KeyboardLayoutSwitchTest/KeyboardLayoutSwitchTest.sh
+++ b/test/jdk/jb/sun/awt/macos/KeyboardLayoutSwitchTest/KeyboardLayoutSwitchTest.sh
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-#
-# 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.
-#
-
-# @test
-# @summary KeyboardLayoutSwitchTest.sh checks memory leaks
-# @run shell KeyboardLayoutSwitchTest.sh
-
-OS=`uname -s`
-case "$OS" in
-  Darwin)
-    echo "Detected OS $OS"
-    ;;
-  * )
-    echo "PASSED: The test is valid for MacOSX"
-    exit 0;
-    ;;
-esac
-
-if [ -z "${TESTSRC}" ]; then
-  echo "TESTSRC undefined: set to ."
-  TESTSRC=.
-fi
-
-if [ -z "${TESTCLASSES}" ]; then
-  echo "TESTCLASSES undefined: set to ."
-  TESTCLASSES=.
-fi
-
-if [ -z "${TESTJAVA}" ]; then
-  echo "TESTJAVA undefined: testing cancelled"
-  exit 1
-fi
-
-cd ${TESTSRC}
-//${TESTJAVA}/bin/javac -d ${TESTCLASSES} AppleSymbolicHotKeysReader.java
-${TESTJAVA}/bin/javac -d ${TESTCLASSES} KeyboardLayoutSwitchTest.java
-
-echo "reading current hot keys"
-oldKeyValue=$(defaults read "com.apple.symbolichotkeys" | grep -A10  " 60 =" | sed '$d' | sed '1d' | tr -d '\r\n' | tr -s ' ' | sed s/standard/\'standard\'/)
-
-defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 60 "{ enabled = 1; value = { parameters = ( 65535, 48, 262144 ); type = 'standard'; };}"
-${TESTJAVA}/bin/java -cp ${TESTCLASSES} KeyboardLayoutSwitchTest
-exit_code=$?
-defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 60 "$oldKeyValue"
-
-case $exit_code in
-0) echo "PASSED"
-   ;;
-*) echo "FAILED"
-   exit 1
-   ;;
-esac
-exit 0
-
-
-
--- a/test/jdk/jbProblemList.txt
+++ b/test/jdk/jbProblemList.txt
@@ -760,7 +760,6 @@ javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java

 # jdk_net

-java/net/CookieHandler/B6791927.java                                                8234007 generic-all
 java/net/MulticastSocket/NoLoopbackPackets.java                                     7122846 macosx-all
 java/net/MulticastSocket/SetLoopbackMode.java                                       7122846 macosx-all
 java/net/MulticastSocket/Test.java                                                  7145658,8207404 macosx-all,aix-all
@@ -947,7 +946,7 @@ javax/swing/JSplitPane/4201995/bug4201995.java
 javax/swing/JSplitPane/4885629/bug4885629.java                                      8019935,8194941 macosx-all,linux-all,windows-all (windows: commit testing)
 javax/swing/JTabbedPane/4361477/bug4361477.java                                     8170260 macosx-all,windows-all
 javax/swing/JTabbedPane/4624207/bug4624207.java                                     8197552,8064922 macosx-all,windows-all,linux-all
-javax/swing/JTabbedPane/7024235/Test7024235.java                                    8028281,JBR-1977 macosx-all,linux-aarch64
+javax/swing/JTabbedPane/7024235/Test7024235.java                                    8028281 macosx-all
 javax/swing/JTabbedPane/8007563/Test8007563.java                                    8051591 generic-all
 javax/swing/JTable/4235420/bug4235420.java                                          8079127 generic-all
 javax/swing/JTable/6263446/bug6263446.java                                          8169959 macosx-all,windows-all
@@ -1169,26 +1168,3 @@ tools/jlink/plugins/IncludeLocalesPluginTest.java
 tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java                nobug windows-6.1 fails on Windows 7 only
 tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java                     nobug windows-6.1 fails on Windows 7 only
 tools/launcher/modules/patch/systemmodules/PatchSystemModules.java                  nobug windows-6.1 fails on Windows 7 only
-
-# aarch64: GTK look and feel - not supported
-java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java               JBR-1977 linux-aarch64
-java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java                     JBR-1977 linux-aarch64
-javax/swing/JColorChooser/Test6707406.java                                          JBR-1977 linux-aarch64
-javax/swing/JFileChooser/8013442/Test8013442.java                                   JBR-1977 linux-aarch64
-javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java                   JBR-1977 linux-aarch64
-javax/swing/JInternalFrame/8075314/bug8075314.java                                  JBR-1977 linux-aarch64
-javax/swing/JInternalFrame/NormalBoundsTest.java                                    JBR-1977 linux-aarch64
-javax/swing/JList/BasicListTest.java                                                JBR-1977 linux-aarch64
-javax/swing/JList/ListSelectionModelTest.java                                       JBR-1977 linux-aarch64
-javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java                           JBR-1977 linux-aarch64
-javax/swing/JMenuItem/8158566/CloseOnMouseClickPropertyTest.java                    JBR-1977 linux-aarch64
-javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java    JBR-1977 linux-aarch64
-javax/swing/JScrollBar/7163696/Test7163696.java                                     JBR-1977 linux-aarch64
-javax/swing/JSlider/6794831/bug6794831.java                                         JBR-1977 linux-aarch64
-javax/swing/JSpinner/WrongEditorTextFieldFont/FontByDefault.java                    JBR-1977 linux-aarch64
-javax/swing/JSpinner/WrongEditorTextFieldFont/FontSetByUser.java                    JBR-1977 linux-aarch64
-javax/swing/JSpinner/WrongEditorTextFieldFont/FontSetToNull.java                    JBR-1977 linux-aarch64
-javax/swing/JTextArea/4697612/bug4697612.java                                       JBR-1977 linux-aarch64
-javax/swing/LookAndFeel/8145547/DemandGTK.java                                      JBR-1977 linux-aarch64
-javax/swing/LookAndFeel/8146276/NimbusGlueTest.java                                 JBR-1977 linux-aarch64
-sanity/client/SwingSet/src/GridBagLayoutDemoTest.java                               JBR-1977 linux-aarch64
--- a/test/jdk/jbcommitProblemList.txt
+++ b/test/jdk/jbcommitProblemList.txt
@@ -52,7 +52,7 @@ java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogT
 java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html    nobug windows-all reproduced with Adopt
 java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java                              nobug windows-all
 java/awt/List/ActionAfterRemove/ActionAfterRemove.java                                      nobug windows-all
-java/awt/List/ActionEventTest/ActionEventTest.java                                          nobug generic-all timeout
+java/awt/List/ActionEventTest/ActionEventTest.java                                          nobug linux-all
 java/awt/List/EmptyListEventTest/EmptyListEventTest.java                                    nobug windows-all
 java/awt/List/ItemEventTest/ItemEventTest.java                                              nobug macosx-all,windows-all
 java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java                          nobug macosx-all,windows-all
@@ -104,7 +104,6 @@ java/awt/Window/SetWindowLocationByPlatformTest/SetWindowLocationByPlatformTest.
 java/awt/Window/ShapedAndTranslucentWindows/Translucent.java                                nobug windows-all,macosx-all
 java/awt/Window/ShapedAndTranslucentWindows/WindowOpacity.java                              nobug windows-all
 java/awt/Window/TopLevelLocation/TopLevelLocation.java                                      nobug linux-all,macosx-all
-java/awt/Window/WindowDeadlockTest/WindowDeadlockTest.java                                  nobug macosx-all timeout
 java/awt/Window/WindowOwnedByEmbeddedFrameTest/WindowOwnedByEmbeddedFrameTest.java          nobug macosx-all
 java/awt/Window/WindowResizing/DoubleClickTitleBarTest.java                                 nobug macosx-all
 java/awt/datatransfer/Independence/IndependenceAWTTest.java                                 nobug linux-all
@@ -185,7 +184,7 @@ javax/swing/JPopupMenu/6827786/bug6827786.java
 javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java                      nobug macosx-all,windows-all
 javax/swing/JRadioButton/8041561/bug8041561.java                                            nobug windows-all
 javax/swing/JScrollBar/7163696/Test7163696.java                                             nobug windows-all
-javax/swing/JScrollBar/bug4202954/bug4202954.java                                           nobug generic-all timeout
+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,linux-all
 javax/swing/JTabbedPane/7170310/bug7170310.java                                             nobug macosx-all,linux-all