JBR-6145 Wayland: refactor surface-to-peer mapping

Author: mkartashev

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

@@ -344,6 +344,7 @@ Point nativeLocationForPopup(Window popup, Component popupParent, Window topleve
     }
 
     protected void wlSetVisible(boolean v) {
+        // TODO: this whole method should be moved to WLWindowPeer
         synchronized (getStateLock()) {
             if (this.visible == v) return;
 
@@ -364,7 +365,7 @@ protected void wlSetVisible(boolean v) {
 
             performLocked(() -> {
                 assert wlSurface == null;
-                wlSurface = new WLMainSurface(this);
+                wlSurface = new WLMainSurface((WLWindowPeer) this);
                 long wlSurfacePtr = wlSurface.getWlSurfacePtr();
                 if (isWlPopup) {
                     Window popup = (Window) target;
@@ -1074,7 +1075,7 @@ final void activate() {
                 long surface = WLToolkit.getInputState().surfaceForKeyboardInput();
                 // The surface pointer may be out of date, which will cause a protocol error.
                 // So make sure it is valid and do that under AWT lock.
-                if (wlSurface != null && surface != 0 && WLToolkit.componentPeerFromSurface(surface) != null) {
+                if (wlSurface != null && surface != 0 && WLToolkit.peerFromSurface(surface) != null) {
                     wlSurface.activateByAnotherSurface(serial, surface);
                 }
             });

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

@@ -154,7 +154,7 @@ public synchronized void rejectDrag() {
     }
 
     public synchronized void handleEnter(WLDataOffer offer, long serial, long surfacePtr, double x, double y) {
-        var peer = WLToolkit.componentPeerFromSurface(surfacePtr);
+        var peer = WLToolkit.peerFromSurface(surfacePtr);
         if (peer == null) {
             return;
         }

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

@@ -316,7 +316,7 @@ public int getPointerY() {
      */
     public WLComponentPeer peerForPointerEvents() {
         return eventWithSurface != null
-                ? WLToolkit.componentPeerFromSurface(eventWithSurface.getSurface())
+                ? WLToolkit.peerFromSurface(eventWithSurface.getSurface())
                 : null;
     }
 

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

@@ -33,12 +33,12 @@
 import java.util.List;
 
 public class WLMainSurface extends WLSurface {
-    private final WLComponentPeer peer;
+    private final WLWindowPeer peer;
 
     // Graphics devices this top-level component is visible on
     private final List<WLGraphicsDevice> devices = new ArrayList<>();
 
-    public WLMainSurface(WLComponentPeer peer) {
+    public WLMainSurface(WLWindowPeer peer) {
         this.peer = peer;
     }
 

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

@@ -334,7 +334,7 @@ private static void dispatchKeyboardKeyEvent(long serial,
         }
 
         final long surfacePtr = inputState.surfaceForKeyboardInput();
-        final WLComponentPeer peer = componentPeerFromSurface(surfacePtr);
+        final WLComponentPeer peer = peerFromSurface(surfacePtr);
         if (peer != null) {
             if (extendedKeyCode >= 0x1000000) {
                 int ch = extendedKeyCode - 0x1000000;
@@ -401,7 +401,7 @@ private static void dispatchKeyboardEnterEvent(long serial, long surfacePtr) {
         }
 
         final WLInputState newInputState = inputState.updatedFromKeyboardEnterEvent(serial, surfacePtr);
-        final WLComponentPeer peer = componentPeerFromSurface(surfacePtr);
+        final WLWindowPeer peer = peerFromSurface(surfacePtr);
         if (peer != null && peer.getTarget() instanceof Window window) {
             WLKeyboardFocusManagerPeer.getInstance().setCurrentFocusedWindow(window);
             final WindowEvent windowEnterEvent = new WindowEvent(window, WindowEvent.WINDOW_GAINED_FOCUS);
@@ -422,7 +422,7 @@ private static void dispatchKeyboardLeaveEvent(long serial, long surfacePtr) {
         keyboard.onLostFocus();
 
         final WLInputState newInputState = inputState.updatedFromKeyboardLeaveEvent(serial, surfacePtr);
-        final WLComponentPeer peer = componentPeerFromSurface(surfacePtr);
+        final WLWindowPeer peer = peerFromSurface(surfacePtr);
         if (peer != null && peer.getTarget() instanceof Window window) {
             final WindowEvent winLostFocusEvent = new WindowEvent(window, WindowEvent.WINDOW_LOST_FOCUS);
             WLKeyboardFocusManagerPeer.getInstance().setCurrentFocusedWindow(null);
@@ -435,28 +435,28 @@ private static void dispatchKeyboardLeaveEvent(long serial, long surfacePtr) {
     /**
      * Maps 'struct wl_surface*' to WLComponentPeer that owns the Wayland surface.
      */
-    private static final Map<Long, WLComponentPeer> wlSurfaceToComponentMap = new HashMap<>();
+    private static final Map<Long, WLWindowPeer> wlSurfaceToPeerMap = new HashMap<>();
 
-    static void registerWLSurface(long wlSurfacePtr, WLComponentPeer componentPeer) {
+    static void registerWLSurface(long wlSurfacePtr, WLWindowPeer peer) {
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
-            log.fine("registerWLSurface: 0x" + Long.toHexString(wlSurfacePtr) + "->" + componentPeer);
+            log.fine("registerWLSurface: 0x" + Long.toHexString(wlSurfacePtr) + "->" + peer);
         }
-        synchronized (wlSurfaceToComponentMap) {
-            wlSurfaceToComponentMap.put(wlSurfacePtr, componentPeer);
+        synchronized (wlSurfaceToPeerMap) {
+            wlSurfaceToPeerMap.put(wlSurfacePtr, peer);
         }
     }
 
     static void unregisterWLSurface(long wlSurfacePtr) {
-        synchronized (wlSurfaceToComponentMap) {
-            wlSurfaceToComponentMap.remove(wlSurfacePtr);
+        synchronized (wlSurfaceToPeerMap) {
+            wlSurfaceToPeerMap.remove(wlSurfacePtr);
         }
 
         inputState = inputState.updatedFromUnregisteredSurface(wlSurfacePtr);
     }
 
-    static WLComponentPeer componentPeerFromSurface(long wlSurfacePtr) {
-        synchronized (wlSurfaceToComponentMap) {
-            return wlSurfaceToComponentMap.get(wlSurfacePtr);
+    static WLWindowPeer peerFromSurface(long wlSurfacePtr) {
+        synchronized (wlSurfaceToPeerMap) {
+            return wlSurfaceToPeerMap.get(wlSurfacePtr);
         }
     }
 
@@ -465,15 +465,15 @@ static WLComponentPeer componentPeerFromSurface(long wlSurfacePtr) {
      * associated with that surface.
      * Otherwise, throw UOE.
      */
-    static WLComponentPeer getSingularWindowPeer() {
-        synchronized (wlSurfaceToComponentMap) {
-            if (wlSurfaceToComponentMap.size() > 1) {
+    static WLWindowPeer getSingularWindowPeer() {
+        synchronized (wlSurfaceToPeerMap) {
+            if (wlSurfaceToPeerMap.size() > 1) {
                 throw new UnsupportedOperationException("More than one native window");
-            } else if (wlSurfaceToComponentMap.isEmpty()) {
+            } else if (wlSurfaceToPeerMap.isEmpty()) {
                 throw new UnsupportedOperationException("No native windows");
             }
 
-            return wlSurfaceToComponentMap.values().iterator().next();
+            return wlSurfaceToPeerMap.values().iterator().next();
         }
     }