RFR: 8150709: Mac OSX and German Keyboard Layout (Y/Z) [v4]

[Tom Schindl]

On Thu, 25 Mar 2021 17:41:40 GMT, Martin Fox <github.com+12087024+beldenfox at openjdk.org> wrote:

>> This PR adds code to ensure that KeyCodeCombinations match KeyEvents as expected by more accurately mapping from a Mac key code to a Java key code based on the user’s active keyboard layout (the existing code assumes a US QWERTY layout). The new code first identifies a set of Mac keys which can produce different characters based on the user’s keyboard layout. A Mac key code outside that area is processed exactly as before. For a key inside the layout-sensitive area the code calls UCKeyTranslate to translate the key to an unshifted ASCII character based on the active keyboard and uses that to determine the Java key code.
>> 
>> When performing the reverse mapping for the Robot the code first uses the old QWERTY mapping to find a candidate key. If it lies in the layout-sensitive area the code then scans the entire area calling UCKeyTranslate until it finds a match. If the key lies outside the layout-sensitive area it’s processed exactly as before.
>> 
>> There are multiple duplicates of these bugs logged against Mac applications built with JavaFX.
>> 
>> https://bugs.openjdk.java.net/browse/JDK-8090257 Mac: Inconsistent KeyEvents with alternative keyboard layouts
>> https://bugs.openjdk.java.net/browse/JDK-8088120 [Accelerator, Mac] CMD + Z accelerator is not working with French keyboard
>> https://bugs.openjdk.java.net/browse/JDK-8087915 Mac: accelerator doesn't take into account azerty keyboard layout
>> https://bugs.openjdk.java.net/browse/JDK-8150709 Mac OSX and German Keyboard Layout (Y/Z)
>
> Martin Fox has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Fixed whitespace error.

For reference this was the code I had around from my first iteration working on that problem

diff --git a/modules/javafx.graphics/src/main/native-glass/mac/GlassKey.m b/modules/javafx.graphics/src/main/native-glass/mac/GlassKey.m
index 38a828a41e..8657519f13 100644
--- a/modules/javafx.graphics/src/main/native-glass/mac/GlassKey.m
+++ b/modules/javafx.graphics/src/main/native-glass/mac/GlassKey.m
@@ -247,6 +247,24 @@ jint GetJavaKeyCodeFor(unsigned short keyCode)
 
 jint GetJavaKeyCode(NSEvent *event)
 {
+	NSString *chars = [event charactersIgnoringModifiers];
+	
+	if ([chars length] > 0) {
+		NSInteger offset;
+	
+		unichar ch = [chars characterAtIndex:0];
+		if ([[NSCharacterSet letterCharacterSet] characterIsMember:ch]) {
+			NSLog(@"Letter char");
+			unichar lower;
+			lower = tolower(ch);
+			offset = lower - 'a';
+			if (offset >= 0 && offset <= 25) {
+				NSLog(@"Hello Char it is");
+				return com_sun_glass_events_KeyEvent_VK_A + offset;
+			}
+		}
+	}
+	
     return GetJavaKeyCodeFor([event keyCode]);
 }

-------------

PR: https://git.openjdk.java.net/jfx/pull/425