Added hint to getKeyCodeForChar to enable numeric keypad

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

@@ -252,11 +252,16 @@ public class KeyEvent {
      * Returns a VK_ code of a key capable of producing the given unicode
      * character with respect to the currently active keyboard layout or
      * VK_UNDEFINED if the character isn't present in the current layout.
+     * The hint is the KeyCode of the key the system is attempting to match.
+     * It can be used to optimize the search or to distinguish between the
+     * main keyboard and the numeric keypad.
      *
+     * @param c the character
+     * @param hint the code of the key the system is attempting to match
      * @return integer code for the given char
      */
-    public static int getKeyCodeForChar(char c) {
-        return Application.getKeyCodeForChar(c);
+    public static int getKeyCodeForChar(char c, int hint) {
+        return Application.getKeyCodeForChar(c, hint);
     }
 
     /**

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

@@ -738,17 +738,21 @@ public final boolean supportsSystemMenu() {
         return _supportsSystemMenu();
     }
 
-    protected abstract int _getKeyCodeForChar(char c);
+    protected abstract int _getKeyCodeForChar(char c, int hint);
     /**
      * Returns a VK_ code of a key capable of producing the given unicode
      * character with respect to the currently active keyboard layout or
      * VK_UNDEFINED if the character isn't present in the current layout.
+     * The hint is the KeyCode of the key the system is attempting to match.
+     * It can be used to optimize the search or to distinguish between the
+     * main keyboard and the numeric keypad.
      *
      * @param c the character
+     * @param hint the code of the key the system is attempting to match
      * @return integer code for the given char
      */
-    public static int getKeyCodeForChar(char c) {
-        return application._getKeyCodeForChar(c);
+    public static int getKeyCodeForChar(char c, int hint) {
+        return application._getKeyCodeForChar(c, hint);
     }
 
     protected int _isKeyLocked(int keyCode) {

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

@@ -462,7 +462,7 @@ protected boolean _supportsInputMethods() {
     }
 
     @Override
-    protected native int _getKeyCodeForChar(char c);
+    protected native int _getKeyCodeForChar(char c, int hint);
 
     @Override
     protected native int _isKeyLocked(int keyCode);

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

@@ -283,5 +283,5 @@ public boolean hasMultiTouch() {
     }
 
     @Override
-    protected native int _getKeyCodeForChar(char c);
+    protected native int _getKeyCodeForChar(char c, int hint);
 }

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

@@ -384,7 +384,7 @@ public String getDataDirectory() {
     }
 
     @Override
-    protected native int _getKeyCodeForChar(char c);
+    protected native int _getKeyCodeForChar(char c, int hint);
 
     @Override
     protected native int _isKeyLocked(int keyCode);

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

@@ -195,7 +195,7 @@ private char[] getKeyChars(KeyState state, int key) {
         return c == '\000' ? NO_CHAR : new char[] { c };
     }
 
-    int getKeyCodeForChar(char c) {
+    int getKeyCodeForChar(char c, int hint) {
         c = Character.toUpperCase(c);
         // remove shift modification
         switch (c) {

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

@@ -354,8 +354,8 @@ void leaveDndEventLoop() {
     }
 
     @Override
-    protected int _getKeyCodeForChar(char c) {
-        return KeyInput.getInstance().getKeyCodeForChar(c);
+    protected int _getKeyCodeForChar(char c, int hint) {
+        return KeyInput.getInstance().getKeyCodeForChar(c, hint);
     }
 
 }

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

@@ -376,7 +376,7 @@ public String getDataDirectory() {
     }
 
     @Override
-    protected native int _getKeyCodeForChar(char c);
+    protected native int _getKeyCodeForChar(char c, int hint);
 
     @Override
     protected native int _isKeyLocked(int keyCode);

modules/javafx.graphics/src/main/java/com/sun/javafx/tk/DummyToolkit.java

@@ -226,7 +226,7 @@ public Shape createStrokedShape(Shape shape, StrokeType pgtype, double strokewid
     }
 
     @Override
-    public int getKeyCodeForChar(String character) {
+    public int getKeyCodeForChar(String character, int hint) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 

modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java

@@ -702,7 +702,7 @@ protected static final double clampStopOffset(double offset) {
                            float[] dashArray,
                            float dashOffset);
 
-    public abstract int getKeyCodeForChar(String character);
+    public abstract int getKeyCodeForChar(String character, int hint);
     public abstract Dimension2D getBestCursorSize(int preferredWidth, int preferredHeight);
     public abstract int getMaximumCursorColors();
     public abstract PathElement[] convertShapeToFXPath(Object shape);

modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java

@@ -1079,10 +1079,10 @@ public Shape createStrokedShape(Shape shape,
         return 2;
     }
 
-    @Override public int getKeyCodeForChar(String character) {
+    @Override public int getKeyCodeForChar(String character, int hint) {
         return (character.length() == 1)
                 ? com.sun.glass.events.KeyEvent.getKeyCodeForChar(
-                          character.charAt(0))
+                          character.charAt(0), hint)
                 : com.sun.glass.events.KeyEvent.VK_UNDEFINED;
     }
 

modules/javafx.graphics/src/main/java/javafx/scene/input/KeyCharacterCombination.java

@@ -113,7 +113,7 @@ public boolean match(final KeyEvent event) {
             return false;
         }
         return (event.getCode().getCode()
-                       == Toolkit.getToolkit().getKeyCodeForChar(getCharacter()))
+                       == Toolkit.getToolkit().getKeyCodeForChar(getCharacter(), event.getCode().getCode()))
                    && super.match(event);
     }
 

modules/javafx.graphics/src/main/native-glass/gtk/glass_key.cpp

@@ -321,10 +321,10 @@ extern "C" {
 /*
  * Class:     com_sun_glass_ui_gtk_GtkApplication
  * Method:    _getKeyCodeForChar
- * Signature: (C)I
+ * Signature: (CI)I
  */
 JNIEXPORT jint JNICALL Java_com_sun_glass_ui_gtk_GtkApplication__1getKeyCodeForChar
-  (JNIEnv *env, jobject jApplication, jchar character)
+  (JNIEnv *env, jobject jApplication, jchar character, jint hint)
 {
     (void)env;
     (void)jApplication;

modules/javafx.graphics/src/main/native-glass/ios/GlassKey.m

@@ -34,10 +34,10 @@
 /*
  * Class:     com_sun_glass_ui_ios_IosApplication
  * Method:    _getKeyCodeForChar
- * Signature: (C)I
+ * Signature: (CI)I
  */
 JNIEXPORT jint JNICALL Java_com_sun_glass_ui_ios_IosApplication__1getKeyCodeForChar
-(JNIEnv * env, jobject jApplication, jchar c)
+(JNIEnv * env, jobject jApplication, jchar c, jint hint)
 {
     GLASS_LOG("Java_com_sun_glass_ui_ios_IosApplication__1getKeyCodeForChar");
 

modules/javafx.graphics/src/main/native-glass/mac/GlassKey.m

@@ -603,10 +603,10 @@ BOOL GetMacKey(jint javaKeyCode, unsigned short *outMacKeyCode)
 /*
  * Class:     com_sun_glass_ui_mac_MacApplication
  * Method:    _getKeyCodeForChar
- * Signature: (C)I
+ * Signature: (CI)I
  */
 JNIEXPORT jint JNICALL Java_com_sun_glass_ui_mac_MacApplication__1getKeyCodeForChar
-(JNIEnv * env, jobject jApplication, jchar c)
+(JNIEnv * env, jobject jApplication, jchar c, jint hint)
 {
     LOG("Java_com_sun_glass_ui_mac_MacApplication__1getKeyCodeForChar");
 

modules/javafx.graphics/src/main/native-glass/win/KeyTable.cpp

@@ -345,10 +345,10 @@ BOOL IsExtendedKey(UINT vkey) {
 /*
  * Class:     Java_com_sun_glass_ui_win_WinApplication
  * Method:    _getKeyCodeForChar
- * Signature: (C)I
+ * Signature: (CI)I
  */
 JNIEXPORT jint JNICALL Java_com_sun_glass_ui_win_WinApplication__1getKeyCodeForChar
-  (JNIEnv * env, jobject jApplication, jchar c)
+  (JNIEnv * env, jobject jApplication, jchar c, jint hint)
 {
     // The Delete key doesn't generate a character so ViewContainer::HandleViewKeyEvent
     // synthesizes one. Here we reverse that process.

modules/javafx.graphics/src/shims/java/com/sun/glass/ui/monocle/MonocleApplicationShim.java

@@ -27,8 +27,8 @@
 
 public class MonocleApplicationShim {
 
-    public static int _getKeyCodeForChar(char c) {
-        return MonocleApplication.getKeyCodeForChar(c);
+    public static int _getKeyCodeForChar(char c, int hint) {
+        return MonocleApplication.getKeyCodeForChar(c, hint);
     }
 
 }

modules/javafx.graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java

@@ -606,7 +606,7 @@ public void waitFor(Task t) {
     }
 
     @Override
-    public int getKeyCodeForChar(String character) {
+    public int getKeyCodeForChar(String character, int hint) {
         if (charToKeyCodeMap != null) {
             final KeyCode keyCode = charToKeyCodeMap.get(character);
             if (keyCode != null) {