8313424: JavaFX controls in the title bar

modules/javafx.base/src/test/java/test/util/ReflectionUtils.java

@@ -38,7 +38,8 @@ private ReflectionUtils() {}
      * Returns the value of a potentially private field of the specified object.
      * The field can be declared on any of the object's inherited classes.
      */
-    public static Object getFieldValue(Object object, String fieldName) {
+    @SuppressWarnings("unchecked")
+    public static <T> T getFieldValue(Object object, String fieldName) {
         Function<Class<?>, Field> getField = cls -> {
             try {
                 var field = cls.getDeclaredField(fieldName);
@@ -54,7 +55,7 @@ public static Object getFieldValue(Object object, String fieldName) {
             Field field = getField.apply(cls);
             if (field != null) {
                 try {
-                    return field.get(object);
+                    return (T)field.get(object);
                 } catch (IllegalAccessException e) {
                     throw new AssertionError(e);
                 }

modules/javafx.graphics/src/main/java/com/sun/glass/events/MouseEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -24,8 +24,6 @@
  */
 package com.sun.glass.events;
 
-import com.sun.glass.ui.WindowControlsOverlay;
-import javafx.stage.StageStyle;
 import java.lang.annotation.Native;
 
 public class MouseEvent {
@@ -51,33 +49,4 @@ public class MouseEvent {
      * This identifier is required for internal purposes.
      */
     @Native final static public int WHEEL           = 228;
-
-    /**
-     * Non-client events are only natively produced on the Windows platform as a result of
-     * handling the {@code WM_NCHITTEST} message for an {@link StageStyle#EXTENDED} window.
-     * <p>
-     * They are never sent to applications, but are processed by {@link WindowControlsOverlay}.
-     */
-    @Native final static public int NC_DOWN         = 230;
-    @Native final static public int NC_UP           = 231;
-    @Native final static public int NC_DRAG         = 232;
-    @Native final static public int NC_MOVE         = 233;
-    @Native final static public int NC_ENTER        = 234;
-    @Native final static public int NC_EXIT         = 235;
-
-    public static boolean isNonClientEvent(int event) {
-        return event >= NC_DOWN && event <= NC_EXIT;
-    }
-
-    public static int toNonClientEvent(int event) {
-        return switch (event) {
-            case DOWN -> NC_DOWN;
-            case UP -> NC_UP;
-            case DRAG -> NC_DRAG;
-            case MOVE -> NC_MOVE;
-            case ENTER -> NC_ENTER;
-            case EXIT -> NC_EXIT;
-            default -> event;
-        };
-    }
 }

modules/javafx.graphics/src/main/java/com/sun/glass/ui/View.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, 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
@@ -26,7 +26,7 @@
 
 import com.sun.glass.events.MouseEvent;
 import com.sun.glass.events.ViewEvent;
-import javafx.scene.Node;
+import com.sun.javafx.tk.HeaderAreaType;
 import java.lang.annotation.Native;
 import java.lang.ref.WeakReference;
 import java.util.Map;
@@ -365,14 +365,14 @@ public void handleSwipeGestureEvent(View view, long time, int type,
         }
 
         /**
-         * Returns the draggable area node at the specified coordinates, or {@code null}
-         * if the specified coordinates do not intersect with a draggable area.
+         * Returns the header area type at the specified coordinates, or {@code null}
+         * if the specified coordinates do not intersect with a header area.
          *
          * @param x the X coordinate
          * @param y the Y coordinate
-         * @return the draggable area node, or {@code null}
+         * @return the header area type, or {@code null}
          */
-        public Node pickDragAreaNode(double x, double y) {
+        public HeaderAreaType pickHeaderArea(double x, double y) {
             return null;
         }
 
@@ -406,7 +406,6 @@ protected void _finishInputMethodComposition(long ptr) {
      */
     private volatile long ptr; // Native handle (NSView*, or internal structure pointer)
     private Window window; // parent window
-    private NonClientHandler nonClientHandler;
     private EventHandler eventHandler;
 
     private int width = -1;     // not set
@@ -506,12 +505,6 @@ void setWindow(Window window) {
         this.window = window;
         _setParent(this.ptr, window == null ? 0L : window.getNativeHandle());
         this.isValid = this.ptr != 0 && window != null;
-
-        if (this.isValid && window.isExtendedWindow()) {
-            this.nonClientHandler = window.getNonClientHandler();
-        } else {
-            this.nonClientHandler = null;
-        }
     }
 
     // package private
@@ -547,7 +540,7 @@ public void setEventHandler(EventHandler eventHandler) {
         this.eventHandler = eventHandler;
     }
 
-    private boolean shouldHandleEvent() {
+    protected boolean shouldHandleEvent() {
         // Don't send any more events if the application has shutdown
         if (Application.GetApplication() == null) {
             return false;
@@ -572,17 +565,22 @@ private boolean handleKeyEvent(long time, int action,
         return false;
     }
 
-    private void handleMouseEvent(long time, int type, int button, int x, int y,
-                                  int xAbs, int yAbs,
-                                  int modifiers, boolean isPopupTrigger,
-                                  boolean isSynthesized) {
+    protected void handleMouseEvent(long time, int type, int button, int x, int y,
+                                    int xAbs, int yAbs,
+                                    int modifiers, boolean isPopupTrigger,
+                                    boolean isSynthesized) {
         if (shouldHandleEvent()) {
             eventHandler.handleMouseEvent(this, time, type, button, x, y, xAbs,
                                           yAbs, modifiers,
                                           isPopupTrigger, isSynthesized);
         }
     }
 
+    protected boolean handleNonClientMouseEvent(long time, int type, int button, int x, int y,
+                                                int xAbs, int yAbs, int modifiers, int clickCount) {
+        return false;
+    }
+
     protected boolean handleMenuEvent(int x, int y, int xAbs, int yAbs, boolean isKeyboardTrigger) {
         if (shouldHandleEvent()) {
             return this.eventHandler.handleMenuEvent(this, x, y, xAbs, yAbs, isKeyboardTrigger);
@@ -955,19 +953,22 @@ protected void notifyMouse(int type, int button, int x, int y, int xAbs,
             lastClickedTime = now;
         }
 
-        // If we have a non-client handler, we give it the first chance to handle the event.
-        // Note that a full-screen window has no non-client area, and thus the non-client handler
+        // If this is an extended window, we give the non-client handler the first chance to handle the event.
+        // Note that a full-screen window has no non-client area, and thus the non-client event handler
         // is not notified.
-        // Some implementations (like GTK) can fire synthesized events when they receive a mouse
-        // button event on the resize border. These events, even though happening on non-client
-        // regions, must not be processed by the non-client handler. For example, if a mouse click
-        // happens on the resize border that straddles the window close button, we don't want the
-        // close button to act on this click, because we just started a resize-drag operation.
-        boolean handled = !isSynthesized && !inFullscreen && nonClientHandler != null
-            && nonClientHandler.handleMouseEvent(type, button, x, y, xAbs, yAbs, clickCount);
-
-        // We never send non-client events to the application.
-        if (handled || MouseEvent.isNonClientEvent(type)) {
+        // Some implementations (like GTK) can fire synthesized events when they receive a mouse button
+        // event on the resize border. These events, even though happening on non-client regions, must
+        // not be processed by the non-client event handler. For example, if a mouse click happens on
+        // the resize border that straddles the window close button, we don't want the close button to
+        // act on this click, because we just started a resize-drag operation.
+        boolean handled = window != null
+            && window.isExtendedWindow()
+            && !isSynthesized
+            && !inFullscreen
+            && shouldHandleEvent()
+            && handleNonClientMouseEvent(now, type, button, x, y, xAbs, yAbs, modifiers, clickCount);
+
+        if (handled) {
             return;
         }