WIP

mstr2 · mstr2 · commit 74389635d0d3 · 2024-10-17T21:26:25.000+02:00
diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/events/MouseEvent.java b/modules/javafx.graphics/src/main/java/com/sun/glass/events/MouseEvent.java
@@ -1,83 +1,83 @@
-/*
- * Copyright (c) 2010, 2024, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.glass.events;
-
-import com.sun.glass.ui.Window;
-import com.sun.glass.ui.WindowControlsOverlay;
-import java.lang.annotation.Native;
-
-public class MouseEvent {
-    @Native final static public int BUTTON_NONE     = 211;
-    @Native final static public int BUTTON_LEFT     = 212;
-    @Native final static public int BUTTON_RIGHT    = 213;
-    @Native final static public int BUTTON_OTHER    = 214;
-    @Native final static public int BUTTON_BACK     = 215;
-    @Native final static public int BUTTON_FORWARD  = 216;
-
-    @Native final static public int DOWN            = 221;
-    @Native final static public int UP              = 222;
-    @Native final static public int DRAG            = 223;
-    @Native final static public int MOVE            = 224;
-    @Native final static public int ENTER           = 225;
-    @Native final static public int EXIT            = 226;
-    @Native final static public int CLICK           = 227; // synthetic
-
-    /**
-     * Artificial WHEEL event type.
-     * This kind of mouse event is NEVER sent to an app.
-     * The app must listen to Scroll events instead.
-     * 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 Window#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;
-        };
-    }
-}
+/*
+ * Copyright (c) 2010, 2024, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.glass.events;
+
+import com.sun.glass.ui.Window;
+import com.sun.glass.ui.WindowControlsOverlay;
+import java.lang.annotation.Native;
+
+public class MouseEvent {
+    @Native final static public int BUTTON_NONE     = 211;
+    @Native final static public int BUTTON_LEFT     = 212;
+    @Native final static public int BUTTON_RIGHT    = 213;
+    @Native final static public int BUTTON_OTHER    = 214;
+    @Native final static public int BUTTON_BACK     = 215;
+    @Native final static public int BUTTON_FORWARD  = 216;
+
+    @Native final static public int DOWN            = 221;
+    @Native final static public int UP              = 222;
+    @Native final static public int DRAG            = 223;
+    @Native final static public int MOVE            = 224;
+    @Native final static public int ENTER           = 225;
+    @Native final static public int EXIT            = 226;
+    @Native final static public int CLICK           = 227; // synthetic
+
+    /**
+     * Artificial WHEEL event type.
+     * This kind of mouse event is NEVER sent to an app.
+     * The app must listen to Scroll events instead.
+     * 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 Window#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;
+        };
+    }
+}
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKSceneListener.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/TKSceneListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, 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
diff --git a/modules/javafx.graphics/src/main/native-glass/win/ViewContainer.cpp b/modules/javafx.graphics/src/main/native-glass/win/ViewContainer.cpp
@@ -1063,7 +1063,6 @@ void ViewContainer::NotifyCaptureChanged(HWND hwnd, HWND to)
 
 void ViewContainer::ResetMouseTracking(HWND hwnd)
 {
-return;
     if (!m_bTrackingMouse) {
         return;
     }
diff --git a/modules/javafx.graphics/src/main/native-glass/win/common.h b/modules/javafx.graphics/src/main/native-glass/win/common.h
@@ -1,69 +1,69 @@
-/*
- * Copyright (c) 2011, 2024, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#ifndef _GLASS_COMMON_
-#define _GLASS_COMMON_
-
-#ifndef _WIN32_WINNT
-    #define _WIN32_WINNT 0x0601
-#endif
-#ifndef _WIN32_IE
-    #define _WIN32_IE 0x0500
-#endif
-
-#ifndef _WIN32_WINNT_
-    #define _WIN32_WINNT_ _WIN32_WINNT
-#endif
-
-#pragma warning(disable : 4675)
-
-#include <assert.h>
-#include <comdef.h>
-#include <comutil.h>
-#include <imm.h>
-#include <jni.h>
-#include <malloc.h>
-#include <manipulations.h>
-#include <memory>
-#include <mmsystem.h>
-#include <new>
-#include <ole2.h>
-#include <shlobj.h>
-#include <stdio.h>
-#include <string.h>
-#include <Tpcshrd.h>
-#include <tchar.h>
-#include <vector>
-#include <wchar.h>
-#include <windows.h>
-#include <windowsx.h>
-#include <shellapi.h>
-#include <versionhelpers.h>
-
-#include "Utils.h"
-#include "OleUtils.h"
-#include "Dwmapi.h"
-
-#endif /* #ifndef _GLASS_COMMON_ */
+/*
+ * Copyright (c) 2011, 2024, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#ifndef _GLASS_COMMON_
+#define _GLASS_COMMON_
+
+#ifndef _WIN32_WINNT
+    #define _WIN32_WINNT 0x0601
+#endif
+#ifndef _WIN32_IE
+    #define _WIN32_IE 0x0500
+#endif
+
+#ifndef _WIN32_WINNT_
+    #define _WIN32_WINNT_ _WIN32_WINNT
+#endif
+
+#pragma warning(disable : 4675)
+
+#include <assert.h>
+#include <comdef.h>
+#include <comutil.h>
+#include <imm.h>
+#include <jni.h>
+#include <malloc.h>
+#include <manipulations.h>
+#include <memory>
+#include <mmsystem.h>
+#include <new>
+#include <ole2.h>
+#include <shlobj.h>
+#include <stdio.h>
+#include <string.h>
+#include <Tpcshrd.h>
+#include <tchar.h>
+#include <vector>
+#include <wchar.h>
+#include <windows.h>
+#include <windowsx.h>
+#include <shellapi.h>
+#include <versionhelpers.h>
+
+#include "Utils.h"
+#include "OleUtils.h"
+#include "Dwmapi.h"
+
+#endif /* #ifndef _GLASS_COMMON_ */

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
Original file line number	Diff line number	Diff line change
`@@ -1063,7 +1063,6 @@ void ViewContainer::NotifyCaptureChanged(HWND hwnd, HWND to)`
`1063`	`1063`
`1064`	`1064`	`void ViewContainer::ResetMouseTracking(HWND hwnd)`
`1065`	`1065`	`{`
`1066`		`-return;`
`1067`	`1066`	`if (!m_bTrackingMouse) {`
`1068`	`1067`	`return;`
`1069`	`1068`	`}`