From eacaf696d4be4b92bcae5141e2e33f32df76d646 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Mon, 5 Jul 2021 07:02:23 -0400 Subject: [PATCH] check on how modifiers are used in FX and GL, should be all set --- core/src/processing/opengl/PSurfaceJOGL.java | 4 ++++ todo.txt | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/processing/opengl/PSurfaceJOGL.java b/core/src/processing/opengl/PSurfaceJOGL.java index 96617a272..70473327d 100644 --- a/core/src/processing/opengl/PSurfaceJOGL.java +++ b/core/src/processing/opengl/PSurfaceJOGL.java @@ -1092,7 +1092,10 @@ public class PSurfaceJOGL implements PSurface { protected void nativeMouseEvent(com.jogamp.newt.event.MouseEvent nativeEvent, int peAction) { + // SHIFT, CTRL, META, and ALT are identical to the processing.event.Event, + // so the modifiers are left intact here. int modifiers = nativeEvent.getModifiers(); + // Could limit to just the specific modifiers, but why bother? /* int peModifiers = modifiers & (InputEvent.SHIFT_MASK | @@ -1159,6 +1162,7 @@ public class PSurfaceJOGL implements PSurface { protected void nativeKeyEvent(com.jogamp.newt.event.KeyEvent nativeEvent, int peAction) { + // SHIFT, CTRL, META, and ALT are identical to processing.event.Event int modifiers = nativeEvent.getModifiers(); // int peModifiers = nativeEvent.getModifiers() & // (InputEvent.SHIFT_MASK | diff --git a/todo.txt b/todo.txt index afc9570d0..37da2a31c 100755 --- a/todo.txt +++ b/todo.txt @@ -12,6 +12,9 @@ X remove jdt.compiler.jar from subprojects X no longer using JRE (doesn't exist), so it's not needed o can we remove it altogether, or is it used by the PDE? X remove lots of dead/unused parts of javafx/build.xml +X fix up modifiers for key events (after completing mouse) in Java2D +X set args for JavaFX and OpenGL for the mouse and key events +X make sure that everything is set properly, also for keys readme X was fixed in the source for 4.0a5, but may not have been included in the dist @@ -60,8 +63,6 @@ X https://github.com/processing/processing4/pull/219 for next release -_ fix up modifiers for key events (after completing mouse) in Java2D -_ set args for JavaFX and OpenGL for the mouse and key events _ move ISSUE_TEMPLATE to .github subfolder _ only export 'tool' subfolder for Movie Maker (and Theme Engine?)