From 1d105b4e14c462a4703b5cc19481efd3b8cfbbb4 Mon Sep 17 00:00:00 2001 From: codeanticode Date: Thu, 4 Jun 2015 15:54:59 -0400 Subject: [PATCH] properly identify CMD key as VK_META --- core/src/processing/opengl/PSurfaceJOGL.java | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/core/src/processing/opengl/PSurfaceJOGL.java b/core/src/processing/opengl/PSurfaceJOGL.java index 18ec76a53..4e92f9f6e 100644 --- a/core/src/processing/opengl/PSurfaceJOGL.java +++ b/core/src/processing/opengl/PSurfaceJOGL.java @@ -855,6 +855,17 @@ public class PSurfaceJOGL implements PSurface { sketch.postEvent(ke); } + private static boolean isPCodedKey(short code) { + return code == com.jogamp.newt.event.KeyEvent.VK_UP || + code == com.jogamp.newt.event.KeyEvent.VK_DOWN || + code == com.jogamp.newt.event.KeyEvent.VK_LEFT || + code == com.jogamp.newt.event.KeyEvent.VK_RIGHT || + code == com.jogamp.newt.event.KeyEvent.VK_ALT || + code == com.jogamp.newt.event.KeyEvent.VK_CONTROL || + code == com.jogamp.newt.event.KeyEvent.VK_SHIFT || + code == com.jogamp.newt.event.KeyEvent.VK_WINDOWS; + } + // Why do we need this mapping? // Relevant discussion and links here: // http://forum.jogamp.org/Newt-wrong-keycode-for-key-td4033690.html#a4033697 @@ -874,20 +885,12 @@ public class PSurfaceJOGL implements PSurface { return PConstants.CONTROL; } else if (code == com.jogamp.newt.event.KeyEvent.VK_SHIFT) { return PConstants.SHIFT; + } else if (code == com.jogamp.newt.event.KeyEvent.VK_WINDOWS) { + return java.awt.event.KeyEvent.VK_META; } return code; } - private static boolean isPCodedKey(short code) { - return code == com.jogamp.newt.event.KeyEvent.VK_UP || - code == com.jogamp.newt.event.KeyEvent.VK_DOWN || - code == com.jogamp.newt.event.KeyEvent.VK_LEFT || - code == com.jogamp.newt.event.KeyEvent.VK_RIGHT || - code == com.jogamp.newt.event.KeyEvent.VK_ALT || - code == com.jogamp.newt.event.KeyEvent.VK_CONTROL || - code == com.jogamp.newt.event.KeyEvent.VK_SHIFT; - } - private static boolean isHackyKey(short code) { return code == com.jogamp.newt.event.KeyEvent.VK_BACK_SPACE || code == com.jogamp.newt.event.KeyEvent.VK_TAB;