Compare commits

...

6 Commits

Author SHA1 Message Date
Vitaly Provodin
eb50d78993 JBR-4188 add exec permissions 2022-01-19 13:35:41 +07:00
Vitaly Provodin
06f278163f JBR-4188 fix misprint in checking if headers exist 2022-01-19 05:20:41 +07:00
Vitaly Provodin
a85ee0a793 Revert "exclude two tests carshing test runs on macosx-aarch64"
This reverts commit 72ae2bf54f.
2022-01-16 08:39:35 +07:00
Vitaly Provodin
7eaa648e23 Revert "JBR-4150 IDE regularly locks up at sun.lwawt.macosx.LWCToolkit.getScreenInsets"
This reverts commit 2aeb7aeab4.
2022-01-16 08:39:24 +07:00
Vitaly Provodin
145fa0245d Revert "JBR-4164 IDEs cannot be launched via launch configuration"
This reverts commit a8afa8da75.
2022-01-16 08:39:10 +07:00
Vitaly Provodin
72ae2bf54f exclude two tests carshing test runs on macosx-aarch64 2022-01-16 07:32:00 +07:00
4 changed files with 9 additions and 16 deletions

4
jb/project/tools/test/perfcmp.sh Normal file → Executable file
View File

@@ -49,7 +49,7 @@ echo $refFile
echo $resFile
curValues=`cat "$curFile" | cut -f 2 | tr -d '\t'`
if [ -z noHeaders ]; then
if [ -z $noHeaders ]; then
curValuesHeader=`echo "$curValues" | head -n +1`_cur
header=`cat "$refFile" | head -n +1 | awk -F'\t' -v x=$curValuesHeader '{print " "$1"\t"$2"_ref\t"x"\tratio"}'`
testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +2`
@@ -58,7 +58,7 @@ else
fi
testContent=`echo "$testContent" | awk -F'\t' '{ if ($3>$2+$2*0.1) {print "* "$1"\t"$2"\t"$3"\t"(($2==0)?"-":$3/$2)} else {print " "$1"\t"$2"\t"$3"\t"(($2==0)?"-":$3/$2)} }'`
if [ -z noHeaders ]; then
if [ -z $noHeaders ]; then
echo "$header" > $resFile
fi
echo "$testContent" >> $resFile

View File

@@ -65,7 +65,6 @@ import java.util.List;
import java.util.Map;
import sun.awt.AppContext;
import sun.awt.SunToolkit;
import sun.java2d.SunGraphicsEnvironment;
class _AppEventHandler {
private static final int NOTIFY_ABOUT = 1;
@@ -84,7 +83,6 @@ class _AppEventHandler {
private static final int NOTIFY_SCREEN_WAKE = 14;
private static final int NOTIFY_SYSTEM_SLEEP = 15;
private static final int NOTIFY_SYSTEM_WAKE = 16;
private static final int NOTIFY_SCREEN_CHANGE_PARAMETERS = 17;
private static final int REGISTER_USER_SESSION = 1;
private static final int REGISTER_SCREEN_SLEEP = 2;
@@ -266,10 +264,6 @@ class _AppEventHandler {
case NOTIFY_SYSTEM_WAKE:
instance.systemSleepDispatcher.dispatch(new _NativeEvent(Boolean.FALSE));
break;
case NOTIFY_SCREEN_CHANGE_PARAMETERS:
EventQueue.invokeLater(() -> ((SunGraphicsEnvironment)SunGraphicsEnvironment.
getLocalGraphicsEnvironment()).displayChanged());
break;
default:
System.err.println("EAWT unknown native notification: " + code);
break;

View File

@@ -56,7 +56,6 @@ public final class CGraphicsDevice extends GraphicsDevice
private volatile double yResolution;
private volatile Rectangle bounds;
private volatile int scale;
private volatile Insets screenInsets;
private GraphicsConfiguration config;
private static boolean metalPipelineEnabled = false;
@@ -184,7 +183,13 @@ public final class CGraphicsDevice extends GraphicsDevice
}
public Insets getScreenInsets() {
return screenInsets;
// the insets are queried synchronously and are not cached
// since there are no Quartz or Cocoa means to receive notifications
// on insets changes (e.g. when the Dock is resized):
// the existing CGDisplayReconfigurationCallBack is not notified
// as well as the NSApplicationDidChangeScreenParametersNotification
// is fired on the Dock location changes only
return nativeGetScreenInsets(displayID);
}
public int getScaleFactor() {
@@ -207,7 +212,6 @@ public final class CGraphicsDevice extends GraphicsDevice
xResolution = nativeGetXResolution(displayID);
yResolution = nativeGetYResolution(displayID);
bounds = nativeGetBounds(displayID).getBounds(); //does integer rounding
screenInsets = nativeGetScreenInsets(displayID);
initScaleFactor();
resizeFSWindow(getFullScreenWindow(), bounds);
//TODO configs?

View File

@@ -258,7 +258,6 @@ AWT_ASSERT_APPKIT_THREAD;
[ctr addObserver:clz selector:@selector(_appDidDeactivate) name:NSApplicationDidResignActiveNotification object:nil];
[ctr addObserver:clz selector:@selector(_appDidHide) name:NSApplicationDidHideNotification object:nil];
[ctr addObserver:clz selector:@selector(_appDidUnhide) name:NSApplicationDidUnhideNotification object:nil];
[ctr addObserver:clz selector:@selector(_didChangeScreenParameters) name:NSApplicationDidChangeScreenParametersNotification object:nil];
[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:[AWTWindow class]
selector:@selector(activeSpaceDidChange)
@@ -484,10 +483,6 @@ AWT_ASSERT_APPKIT_THREAD;
}
}
+ (void)_didChangeScreenParameters {
[ApplicationDelegate _notifyJava:com_apple_eawt__AppEventHandler_NOTIFY_SCREEN_CHANGE_PARAMETERS];
}
// Retrieves the menu to be attached to the Dock icon (AppKit callback)
- (NSMenu *)applicationDockMenu:(NSApplication *)sender {
AWT_ASSERT_APPKIT_THREAD;