Merge branch 'master' of github.com:processing/processing

benfry · benfry · commit d6a3c6ff03ee · 2015-06-04T15:22:40.000-05:00
diff --git a/core/src/processing/opengl/PSurfaceJOGL.java b/core/src/processing/opengl/PSurfaceJOGL.java
@@ -855,6 +855,17 @@ protected void nativeKeyEvent(com.jogamp.newt.event.KeyEvent nativeEvent,
     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 @@ private static int mapToPConst(short code) {
       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;
