Merge 6dbbc9e into 8635642

Author: honkar-jdk

src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,8 +63,13 @@
 static int gsEventNumber;
 static int* gsButtonEventNumber;
 static NSTimeInterval gNextKeyEventTime;
+static CGEventFlags initFlags;
+static CGEventFlags allModifiersMask = kCGEventFlagMaskShift | kCGEventFlagMaskControl
+                              | kCGEventFlagMaskAlternate | kCGEventFlagMaskCommand
+                              | kCGEventFlagMaskAlphaShift | kCGEventFlagMaskSecondaryFn;
 
 static inline CGKeyCode GetCGKeyCode(jint javaKeyCode);
+static inline int GetCGKeyMask(int cgKeyCode);
 
 static void PostMouseEvent(const CGPoint point, CGMouseButton button,
                            CGEventType type, int clickCount, int eventNumber);
@@ -121,6 +126,13 @@ static inline void autoDelay(BOOL isMove) {
             jboolean copy = JNI_FALSE;
 
             setupDone = 1;
+            // initialize CGEventFlags here - which is used in keyEvent
+            initFlags = CGEventSourceFlagsState(kCGEventSourceStateHIDSystemState);
+
+            // Clear Function flag bits if they are set
+            if ((initFlags & kCGEventFlagMaskSecondaryFn) != 0) {
+                initFlags ^= kCGEventFlagMaskSecondaryFn;
+            }
             // Don't block local events after posting ours
             CGSetLocalEventsSuppressionInterval(0.0);
 
@@ -291,12 +303,25 @@ static inline void autoDelay(BOOL isMove) {
         CGEventSourceRef source = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
         CGKeyCode keyCode = GetCGKeyCode(javaKeyCode);
         CGEventRef event = CGEventCreateKeyboardEvent(source, keyCode, keyPressed);
+
         if (event != NULL) {
-            CGEventFlags flags = CGEventSourceFlagsState(kCGEventSourceStateHIDSystemState);
-            if ((flags & kCGEventFlagMaskSecondaryFn) != 0) {
-                flags ^= kCGEventFlagMaskSecondaryFn;
-                CGEventSetFlags(event, flags);
+            int flagMaskValue = GetCGKeyMask(keyCode);
+            if (OSX_Undefined != flagMaskValue) {
+                if (keyCode == OSX_CapsLock) {
+                    if (keyPressed) {
+                        initFlags ^= flagMaskValue;
+                    }
+                } else {
+                    initFlags = keyPressed
+                                ? (initFlags | flagMaskValue)    // add flag bits if modifier key pressed
+                                : (initFlags & ~flagMaskValue);  // clear flag bits if modifier key released
+                }
             }
+
+            CGEventFlags flags = CGEventSourceFlagsState(kCGEventSourceStateHIDSystemState);
+            flags = (initFlags & allModifiersMask) | (flags & (~allModifiersMask));
+            CGEventSetFlags(event, flags);
+
             CGEventPost(kCGHIDEventTap, event);
             CFRelease(event);
         }
@@ -398,6 +423,12 @@ static inline CGKeyCode GetCGKeyCode(jint javaKeyCode)
     return [keyCodeMapping getOSXKeyCodeForJavaKey:javaKeyCode];
 }
 
+static inline int GetCGKeyMask(int cgKeyCode)
+{
+    CRobotKeyCodeMapping *keyCodeMapping = [CRobotKeyCodeMapping sharedInstance];
+    return [keyCodeMapping getFlagMaskForCGKey:cgKeyCode];
+}
+
 static int GetClickCount(BOOL isDown) {
     NSTimeInterval now = [[NSDate date] timeIntervalSinceReferenceDate];
     NSTimeInterval clickInterval = now - gsLastClickTime;

src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,9 +148,11 @@ const static int OSX_Undefined                  = 0x7F;
 }
 
 @property (readwrite, retain) NSDictionary *javaToMacKeyMap;
+@property (readwrite, retain) NSDictionary *modifierKeyToMaskMap;
 
 + (CRobotKeyCodeMapping *)sharedInstance ;
 - (int)getOSXKeyCodeForJavaKey:(int) javaKey;
+- (int)getFlagMaskForCGKey:(int) cgKeyCode;
 
 @end
 

src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 @implementation CRobotKeyCodeMapping
 
 @synthesize javaToMacKeyMap;
+@synthesize modifierKeyToMaskMap;
 
 +(CRobotKeyCodeMapping *) sharedInstance {
     static CRobotKeyCodeMapping *instance = nil;
@@ -160,6 +161,15 @@ -(id) init {
             [NSNumber numberWithInt : OSX_F19], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_F19],
             [NSNumber numberWithInt : OSX_F20], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_F20],
 
+            nil];
+
+        self.modifierKeyToMaskMap = [NSDictionary dictionaryWithObjectsAndKeys:
+            [NSNumber numberWithInt : kCGEventFlagMaskShift], [NSNumber numberWithInt : OSX_Shift],
+            [NSNumber numberWithInt : kCGEventFlagMaskControl], [NSNumber numberWithInt : OSX_Control],
+            [NSNumber numberWithInt : kCGEventFlagMaskAlternate], [NSNumber numberWithInt : OSX_Option],
+            [NSNumber numberWithInt : kCGEventFlagMaskCommand], [NSNumber numberWithInt : OSX_Command],
+            [NSNumber numberWithInt : kCGEventFlagMaskAlphaShift], [NSNumber numberWithInt : OSX_CapsLock],
+
             nil];
     }
 
@@ -176,4 +186,14 @@ -(int) getOSXKeyCodeForJavaKey : (int) javaKey {
     }
 }
 
+-(int) getFlagMaskForCGKey : (int) cgKeyCode {
+    id val = [modifierKeyToMaskMap objectForKey : [NSNumber numberWithInt : cgKeyCode]];
+
+    if (nil != val) {
+        return [val intValue];
+    } else {
+        return OSX_Undefined;
+    }
+}
+
 @end