stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8280994: [XWayland] Drag and Drop does not work in java -> wayland app direction

Browse Source 
Reviewed-by: prr, psadhukhan
This commit is contained in:
Alexander Zvegintsev 2023-06-05 16:34:45 +00:00
parent 5cd8af7622
commit 73352b68c4
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java.desktop/share/classes/sun/awt/SunToolkit.java
View File

@ -1883,6 +1883,11 @@ public abstract class SunToolkit extends Toolkit
return false;
}
/**
* Checks if the system is running Linux with the Wayland server.
*
* @return true if running on Wayland, false otherwise
*/
public boolean isRunningOnWayland() {
return false;
}

41
src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2023, 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
@ -27,6 +27,7 @@ package sun.awt.X11;
import java.awt.Component;
import java.awt.Cursor;
import java.awt.Toolkit;
import java.awt.Window;
import java.awt.datatransfer.DataFlavor;
@ -392,6 +393,40 @@ public final class XDragSourceContextPeer
return true;
}
/**
* Our X11 code expects the drop target window to be a top level window
* and to have the XA_WM_STATE property.
* This is not true when performing drag and drop from XWayland
* to a native Wayland application.
* In this case XWayland creates a dummy window with only one property,
* XdndAware.
*
* @param window to test
* @return true if window has XdndAware property when running under Wayland
*/
private static boolean isXWaylandDndAwareWindow(long window) {
Toolkit toolkit = Toolkit.getDefaultToolkit();
if (!(toolkit instanceof SunToolkit)
|| !((SunToolkit) toolkit).isRunningOnWayland()) {
return false;
}
WindowPropertyGetter wpg =
new WindowPropertyGetter(window, XDnDConstants.XA_XdndAware, 0, 1,
false, XConstants.AnyPropertyType);
try {
int status =
wpg.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance());
return status == XConstants.Success
&& wpg.getData() != 0
&& wpg.getActualType() == XAtom.XA_ATOM;
} finally {
wpg.dispose();
}
}
/**
* Returns the client window under the specified root subwindow.
*/
@ -400,6 +435,10 @@ public final class XDragSourceContextPeer
return window;
}
if (isXWaylandDndAwareWindow(window)) {
return window;
}
Set<Long> children = XlibUtil.getChildWindows(window);
for (Long child : children) {
long win = findClientWindow(child);