Mac: Fix keyboard state if capslock was toggled while app wasn't in foreground.
authorRyan C. Gordon <icculus@icculus.org>
Sun, 27 Dec 2015 23:39:43 -0500
changeset 9972 734c90ea9990
parent 9971 fa7c016ac2d3
child 9973 4d8a561cf978
Mac: Fix keyboard state if capslock was toggled while app wasn't in foreground.
src/video/cocoa/SDL_cocoawindow.m
--- a/src/video/cocoa/SDL_cocoawindow.m	Sun Dec 27 22:26:27 2015 -0500
+++ b/src/video/cocoa/SDL_cocoawindow.m	Sun Dec 27 23:39:43 2015 -0500
@@ -588,6 +588,17 @@
     if ((isFullscreenSpace) && ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP)) {
         [NSMenu setMenuBarVisible:NO];
     }
+
+    /* On pre-10.6, you might have the capslock key state wrong now. */
+    if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_6) {
+        const unsigned int oldflags = _data->videodata->modifierFlags & NSAlphaShiftKeyMask;
+        const unsigned int newflags = [NSEvent modifierFlags] & NSAlphaShiftKeyMask;
+        if (oldflags != newflags) {
+            _data->videodata->modifierFlags = (_data->videodata->modifierFlags & ~NSAlphaShiftKeyMask) | newflags;
+            SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_CAPSLOCK);
+            SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_CAPSLOCK);
+        }
+    }
 }
 
 - (void)windowDidResignKey:(NSNotification *)aNotification