JBR-9902 Wayland: support modal dialogs without native modality aid

Author: mkartashev

src/java.desktop/unix/classes/sun/awt/wl/WLComponentPeer.java

@@ -1192,6 +1192,14 @@ final void activate() {
         }
     }
 
+    final void reactivate(long serial, long surface) {
+        performLocked(() -> {
+            if (serial != 0 &&wlSurface != null && surface != 0) {
+                wlSurface.activateByAnotherSurface(serial, surface);
+            }
+        });
+    }
+
     private static long getSerialForActivation() {
         long serial;
         if (WLToolkit.isKDE()) {

src/java.desktop/unix/classes/sun/awt/wl/WLDialogPeer.java

@@ -24,8 +24,13 @@
  */
 package sun.awt.wl;
 
-import java.awt.*;
+import sun.awt.AWTAccessor;
+
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.Window;
 import java.awt.peer.DialogPeer;
+import java.awt.peer.WindowPeer;
 import java.util.List;
 
 public class WLDialogPeer extends WLDecoratedPeer implements DialogPeer {
@@ -41,7 +46,12 @@ public void setVisible(boolean vis) {
 
     @Override
     public void blockWindows(List<Window> windows) {
-
+        for (Window w : windows) {
+            WindowPeer wp = AWTAccessor.getComponentAccessor().getPeer(w);
+            if (wp != null) {
+                wp.setModalBlocked((Dialog)getTarget(), true);
+            }
+        }
     }
 
     @Override

src/java.desktop/unix/classes/sun/awt/wl/WLToolkit.java

@@ -439,22 +439,32 @@ private static void dispatchKeyboardEnterEvent(long serial, long surfacePtr) {
                     + Long.toHexString(surfacePtr));
         }
 
-        final WLInputState newInputState = inputState.updatedFromKeyboardEnterEvent(serial, surfacePtr);
         final WLWindowPeer peer = peerFromSurface(surfacePtr);
+        final WLInputState newInputState = inputState.updatedFromKeyboardEnterEvent(serial, surfacePtr);
         if (peer != null) {
-            Window window = (Window) peer.getTarget();
-            Window winToFocus = window;
-
-            Component s = peer.getSyntheticFocusOwner();
-            if (s instanceof Window synthWindow) {
-                if (synthWindow.isVisible() && synthWindow.isFocusableWindow()) {
-                    winToFocus = synthWindow;
+            Dialog blocker = peer.getBlocker();
+            if (blocker != null) { // Modality support
+                long activationSerial = serial;
+                if (WLToolkit.isKDE()) {
+                    activationSerial = inputState.latestInputSerial();
+                }
+                WLWindowPeer blockerPeer = AWTAccessor.getComponentAccessor().getPeer(blocker);
+                blockerPeer.reactivate(activationSerial, surfacePtr);
+            } else {
+                Window window = (Window) peer.getTarget();
+                Window winToFocus = window;
+
+                Component s = peer.getSyntheticFocusOwner();
+                if (s instanceof Window synthWindow) {
+                    if (synthWindow.isVisible() && synthWindow.isFocusableWindow()) {
+                        winToFocus = synthWindow;
+                    }
                 }
-            }
 
-            WLKeyboardFocusManagerPeer.getInstance().setCurrentFocusedWindow(window);
-            WindowEvent windowEnterEvent = new WindowEvent(winToFocus, WindowEvent.WINDOW_GAINED_FOCUS);
-            postPriorityEvent(windowEnterEvent);
+                WLKeyboardFocusManagerPeer.getInstance().setCurrentFocusedWindow(window);
+                WindowEvent windowEnterEvent = new WindowEvent(winToFocus, WindowEvent.WINDOW_GAINED_FOCUS);
+                postPriorityEvent(windowEnterEvent);
+            }
         }
         inputState = newInputState;
     }

src/java.desktop/unix/classes/sun/awt/wl/WLWindowPeer.java

@@ -58,7 +58,7 @@
 
 public class WLWindowPeer extends WLComponentPeer implements WindowPeer, SurfacePixelGrabber {
     private static Font defaultFont;
-    private Dialog blocker;
+    private Dialog blocker; // guarded by getStateLock()
     private static WLWindowPeer grabbingWindow; // fake, kept for UngrabEvent only
 
     // If this window gets focus from Wayland, we need to transfer focus synthFocusOwner, if any
@@ -180,7 +180,15 @@ public void updateFocusableWindowState() {
 
     @Override
     public void setModalBlocked(Dialog blocker, boolean blocked) {
-        this.blocker = blocked ? blocker : null;
+        synchronized (getStateLock()) {
+            this.blocker = blocked ? blocker : null;
+        }
+    }
+
+    public Dialog getBlocker() {
+        synchronized (getStateLock()) {
+            return blocker;
+        }
     }
 
     @Override