diff src/macosx/native/sun/awt/AWTView.m @ 10139:15d846fe8ee3

8028617: Dvorak keyboard mapping not honored when ctrl key pressed Reviewed-by: pchelko, anthony
author anashaty
date Thu, 29 May 2014 17:31:41 +0400
parents 9c6ff56dfe00
children
line wrap: on
line diff
--- a/src/macosx/native/sun/awt/AWTView.m	Wed May 28 15:36:10 2014 +0400
+++ b/src/macosx/native/sun/awt/AWTView.m	Thu May 29 17:31:41 2014 +0400
@@ -440,17 +440,20 @@
     JNIEnv *env = [ThreadUtilities getJNIEnv];
 
     jstring characters = NULL;
+    jstring charactersIgnoringModifiers = NULL;
     if ([event type] != NSFlagsChanged) {
         characters = JNFNSToJavaString(env, [event characters]);
+        charactersIgnoringModifiers = JNFNSToJavaString(env, [event charactersIgnoringModifiers]);
     }
 
     static JNF_CLASS_CACHE(jc_NSEvent, "sun/lwawt/macosx/NSEvent");
-    static JNF_CTOR_CACHE(jctor_NSEvent, jc_NSEvent, "(IISLjava/lang/String;)V");
+    static JNF_CTOR_CACHE(jctor_NSEvent, jc_NSEvent, "(IISLjava/lang/String;Ljava/lang/String;)V");
     jobject jEvent = JNFNewObject(env, jctor_NSEvent,
                                   [event type],
                                   [event modifierFlags],
                                   [event keyCode],
-                                  characters);
+                                  characters,
+                                  charactersIgnoringModifiers);
     CHECK_NULL(jEvent);
 
     static JNF_CLASS_CACHE(jc_PlatformView, "sun/lwawt/macosx/CPlatformView");