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

JBR-3035 The Confirm Exit pop-up window remains hidden behind a window of another application

Browse Source 
(cherry picked from commit 470c3bd1b5)
This commit is contained in:
Dmitry Batrak
2021-01-19 13:53:03 +03:00
committed by alexey.ushakov@jetbrains.com
parent eb3ad964ba
commit c2b33bdd5c
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
View File

@@ -1058,30 +1058,33 @@ abstract class XDecoratedPeer extends XWindowPeer {
super.handleClientMessage(xev);
XClientMessageEvent cl = xev.get_xclient();
if ((wm_protocols != null) && (cl.get_message_type() == wm_protocols.getAtom())) {
long timestamp = getTimeStampFromClientMessage(cl);
// we should treat WM_TAKE_FOCUS and WM_DELETE_WINDOW messages as user interaction, as they can originate
// e.g. from user clicking on window title bar and window close button correspondingly
// (there will be no ButtonPress/ButtonRelease events in those cases)
setUserTime(timestamp, true);
if (cl.get_data(0) == wm_delete_window.getAtom()) {
handleQuit();
} else if (cl.get_data(0) == wm_take_focus.getAtom()) {
handleWmTakeFocus(cl);
handleWmTakeFocus(timestamp);
}
}
}
private void handleWmTakeFocus(XClientMessageEvent cl) {
private static long getTimeStampFromClientMessage(XClientMessageEvent cl) {
long requestTimeStamp = cl.get_data(1);
// older versions of KDE window manager always send 0 ('CurrentTime') as timestamp,
// even though it seems to violate ICCCM specification
// (see https://bugs.kde.org/show_bug.cgi?id=347153 and https://bugs.kde.org/show_bug.cgi?id=421068)
return requestTimeStamp == 0 ? XToolkit.getCurrentServerTime() : requestTimeStamp;
}
private void handleWmTakeFocus(long requestTimeStamp) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("WM_TAKE_FOCUS on {0}", this);
}
long requestTimeStamp = cl.get_data(1);
if (requestTimeStamp == 0) {
// KDE window manager always sends 0 ('CurrentTime') as timestamp,
// even though it seems to violate ICCCM specification
// (https://bugs.kde.org/show_bug.cgi?id=347153)
requestTimeStamp = XToolkit.getCurrentServerTime();
}
// we should treat WM_TAKE_FOCUS message as user interaction, as it can originate e.g. from user clicking
// on window title bar (there will be no ButtonPress/ButtonRelease events in this case)
setUserTime(requestTimeStamp, true);
if (XWM.getWMID() == XWM.UNITY_COMPIZ_WM) {
// JDK-8159460
Window focusedWindow = XKeyboardFocusManagerPeer.getInstance()