mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 01:19:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-9738 Wayland: crash in nativeHideFrame()

Browse Source
This commit is contained in:
Maxim Kartashev
2025-12-05 12:41:39 +04:00
parent 8b5eb6128d
commit b27bd250ca
1 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/java.desktop/unix/classes/sun/awt/wl/WLComponentPeer.java
View File

@@ -370,71 +370,71 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
synchronized (getStateLock()) {
if (this.visible == v) return;
if (v) {
String title = getTitle();
boolean isWlPopup = targetIsWlPopup();
int thisWidth = javaUnitsToSurfaceSize(getWidth());
int thisHeight = javaUnitsToSurfaceSize(getHeight());
boolean isModal = targetIsModal();
int state = (target instanceof Frame frame)
? frame.getExtendedState()
: Frame.NORMAL;
boolean isMaximized = (state & Frame.MAXIMIZED_BOTH) == Frame.MAXIMIZED_BOTH;
boolean isMinimized = (state & Frame.ICONIFIED) == Frame.ICONIFIED;
boolean isUnconstrained = isPopupPositionUnconstrained();
performLocked(() -> {
assert wlSurface == null : "Invisible window already has a Wayland surface attached";
WLMainSurface mainSurface = new WLMainSurface((WLWindowPeer) this);
long wlSurfacePtr = mainSurface.getWlSurfacePtr();
if (isWlPopup) {
Window popup = (Window) target;
Component popupParent = AWTAccessor.getWindowAccessor().getPopupParent(popup);
Window toplevel = getToplevelFor(popupParent);
Point nativeLocation = nativeLocationForPopup(popup, popupParent, toplevel);
nativeCreatePopup(nativePtr, getNativePtrFor(toplevel), wlSurfacePtr,
thisWidth, thisHeight, nativeLocation.x, nativeLocation.y, isUnconstrained);
} else {
nativeCreateWindow(nativePtr, getParentNativePtr(target), wlSurfacePtr,
isModal, isMaximized, isMinimized, title, WLToolkit.getApplicationID());
int xNative = javaUnitsToSurfaceUnits(target.getX());
int yNative = javaUnitsToSurfaceUnits(target.getY());
WLRobotPeer.setLocationOfWLSurface(mainSurface, xNative, yNative);
}
notifyNativeWindowCreated(nativePtr);
shadow.createSurface(mainSurface);
// From xdg-shell.xml: "After creating a role-specific object and
// setting it up, the client must perform an initial commit
// without any buffer attached"
shadow.commitSurface();
mainSurface.commit();
if (!isWlPopup && target.getParent() != null) activate();
((WLToolkit) Toolkit.getDefaultToolkit()).flush();
wlSurface = mainSurface;
});
configureWLSurface();
// Now wait for the sequence of configure events and the window
// will finally appear on screen after we post a PaintEvent
// from notifyConfigured()
} else {
performLocked(() -> {
if (wlSurface != null) { // may get a "hide" request even though we were never shown
notifyNativeWindowToBeHidden(nativePtr);
nativeHideFrame(nativePtr);
shadow.hide();
wlSurface.dispose();
wlSurface = null;
}
});
}
this.visible = v;
}
if (v) {
String title = getTitle();
boolean isWlPopup = targetIsWlPopup();
int thisWidth = javaUnitsToSurfaceSize(getWidth());
int thisHeight = javaUnitsToSurfaceSize(getHeight());
boolean isModal = targetIsModal();
int state = (target instanceof Frame frame)
? frame.getExtendedState()
: Frame.NORMAL;
boolean isMaximized = (state & Frame.MAXIMIZED_BOTH) == Frame.MAXIMIZED_BOTH;
boolean isMinimized = (state & Frame.ICONIFIED) == Frame.ICONIFIED;
boolean isUnconstrained = isPopupPositionUnconstrained();
performLocked(() -> {
assert wlSurface == null : "Invisible window already has a Wayland surface attached";
wlSurface = new WLMainSurface((WLWindowPeer) this);
long wlSurfacePtr = wlSurface.getWlSurfacePtr();
if (isWlPopup) {
Window popup = (Window) target;
Component popupParent = AWTAccessor.getWindowAccessor().getPopupParent(popup);
Window toplevel = getToplevelFor(popupParent);
Point nativeLocation = nativeLocationForPopup(popup, popupParent, toplevel);
nativeCreatePopup(nativePtr, getNativePtrFor(toplevel), wlSurfacePtr,
thisWidth, thisHeight, nativeLocation.x, nativeLocation.y, isUnconstrained);
} else {
nativeCreateWindow(nativePtr, getParentNativePtr(target), wlSurfacePtr,
isModal, isMaximized, isMinimized, title, WLToolkit.getApplicationID());
int xNative = javaUnitsToSurfaceUnits(target.getX());
int yNative = javaUnitsToSurfaceUnits(target.getY());
WLRobotPeer.setLocationOfWLSurface(wlSurface, xNative, yNative);
}
notifyNativeWindowCreated(nativePtr);
shadow.createSurface();
// From xdg-shell.xml: "After creating a role-specific object and
// setting it up, the client must perform an initial commit
// without any buffer attached"
shadow.commitSurface();
wlSurface.commit();
if (!isWlPopup && target.getParent() != null) activate();
((WLToolkit) Toolkit.getDefaultToolkit()).flush();
});
configureWLSurface();
// Now wait for the sequence of configure events and the window
// will finally appear on screen after we post a PaintEvent
// from notifyConfigured()
} else {
performLocked(() -> {
if (wlSurface != null) { // may get a "hide" request even though we were never shown
notifyNativeWindowToBeHidden(nativePtr);
nativeHideFrame(nativePtr);
shadow.hide();
wlSurface.dispose();
wlSurface = null;
}
});
}
}
protected void notifyNativeWindowCreated(long nativePtr) {
@@ -1891,7 +1891,7 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
int getSize();
void updateSurfaceSize();
void resizeToParentWindow();
void createSurface();
void createSurface(WLMainSurface mainSurface);
void commitSurface();
void dispose();
void hide();
@@ -2036,12 +2036,12 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
}
}
public void createSurface() {
public void createSurface(WLMainSurface mainSurface) {
assert shadowSurface == null : "The shadow surface must not be created twice";
assert SunToolkit.isAWTLockHeldByCurrentThread() : "This method must be invoked while holding the AWT lock";
int shadowOffset = -javaUnitsToSurfaceUnits(shadowSize);
shadowSurface = new WLSubSurface(wlSurface, shadowOffset, shadowOffset);
shadowSurface = new WLSubSurface(mainSurface, shadowOffset, shadowOffset);
}
public void commitSurface() {
@@ -2132,7 +2132,7 @@ public class WLComponentPeer implements ComponentPeer, WLSurfaceSizeListener {
@Override public int getSize() { return 0; }
@Override public void updateSurfaceSize() { }
@Override public void resizeToParentWindow() { }
@Override public void createSurface() { }
@Override public void createSurface(WLMainSurface mainSurface) { }
@Override public void commitSurface() { }
@Override public void dispose() { }
@Override public void hide() { }