We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Properly detect Caps Lock up/down events.

file_2157.txt (text/plain), 6.49 KB, created by Tim McDaniel on 2014-08-22 00:13:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim McDaniel

Created: 2014-08-22 00:13:26 UTC

Size: 6.49 KB

patch

obsolete

>--- src/video/cocoa/SDL_cocoakeyboard.m	2014-08-21 14:31:10.000000000 
>+++ src/video/cocoa/SDL_cocoakeyboard.m	2014-08-21 15:59:23.000000000 
>@@ -25,12 +25,15 @@
> #include "SDL_cocoavideo.h"
> 
> #include "../../events/SDL_keyboard_c.h"
> #include "../../events/scancodes_darwin.h"
> 
> #include <Carbon/Carbon.h>
>+#if ASL_SDL
>+#include <IOKit/hid/IOHIDLib.h>
>+#endif
> 
> /*#define DEBUG_IME NSLog */
> #define DEBUG_IME(...)
> 
> #ifndef NX_DEVICERCTLKEYMASK
>     #define NX_DEVICELCTLKEYMASK    0x00000001
>@@ -195,12 +198,114 @@
> {
>     return [NSArray array];
> }
> 
> @end
> 
>+#if ASL_SDL
>+/*------------------------------------------------------------------------------
>+Set up a HID callback to properly detect Caps Lock up/down events.
>+Derived from:
>+http://stackoverflow.com/questions/7190852/using-iohidmanager-to-get-modifier-key-events
>+*/
>+
>+static IOHIDManagerRef s_hidManager = NULL;
>+
>+static void
>+HIDCallback(void *context, IOReturn result, void *sender, IOHIDValueRef value)
>+{
>+    IOHIDElementRef elem = IOHIDValueGetElement(value);
>+    if (IOHIDElementGetUsagePage(elem) != kHIDPage_KeyboardOrKeypad
>+        || IOHIDElementGetUsage(elem) != kHIDUsage_KeyboardCapsLock) {
>+        return;
>+    }
>+    int pressed = IOHIDValueGetIntegerValue(value);
>+    SDL_SendKeyboardKey(pressed ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_CAPSLOCK);
>+}
>+
>+static CFDictionaryRef
>+CreateHIDDeviceMatchingDictionary(UInt32 usagePage, UInt32 usage)
>+{
>+    CFMutableDictionaryRef dict = CFDictionaryCreateMutable(kCFAllocatorDefault,
>+        0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
>+    if (dict) {
>+        CFNumberRef number = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usagePage);
>+        if (number) {
>+            CFDictionarySetValue(dict, CFSTR(kIOHIDDeviceUsagePageKey), number);
>+            CFRelease(number);
>+            number = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usage);
>+            if (number) {
>+                CFDictionarySetValue(dict, CFSTR(kIOHIDDeviceUsageKey), number);
>+                CFRelease(number);
>+                return dict;
>+            }
>+        }
>+        CFRelease(dict);
>+    }
>+    return NULL;
>+}
>+
>+static void
>+QuitHIDCallback()
>+{
>+    if (!s_hidManager) {
>+        return;
>+    }
>+    IOHIDManagerUnscheduleFromRunLoop(s_hidManager, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
>+    IOHIDManagerRegisterInputValueCallback(s_hidManager, NULL, NULL);
>+    IOHIDManagerClose(s_hidManager, 0);
>+    CFRelease(s_hidManager);
>+    s_hidManager = NULL;
>+}
>+
>+static void
>+InitHIDCallback()
>+{
>+    s_hidManager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone);
>+    if (!s_hidManager) {
>+        return;
>+    }
>+    CFDictionaryRef keyboard = NULL, keypad = NULL;
>+    CFArrayRef matches = NULL;
>+    keyboard = CreateHIDDeviceMatchingDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard);
>+    if (!keyboard) {
>+        goto fail;
>+    }
>+    keypad = CreateHIDDeviceMatchingDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Keypad);
>+    if (!keypad) {
>+        goto fail;
>+    }
>+    CFDictionaryRef matchesList[] = { keyboard, keypad };
>+    matches = CFArrayCreate(kCFAllocatorDefault, (const void **)matchesList, 2, NULL);
>+    if (!matches) {
>+        goto fail;
>+    }
>+    IOHIDManagerSetDeviceMatchingMultiple(s_hidManager, matches);
>+    IOHIDManagerRegisterInputValueCallback(s_hidManager, HIDCallback, NULL);
>+    IOHIDManagerScheduleWithRunLoop(s_hidManager, CFRunLoopGetMain(), kCFRunLoopDefaultMode);
>+    if (IOHIDManagerOpen(s_hidManager, kIOHIDOptionsTypeNone) == kIOReturnSuccess) {
>+        goto cleanup;
>+    }
>+
>+fail:
>+    QuitHIDCallback();
>+
>+cleanup:
>+    if (matches) {
>+        CFRelease(matches);
>+    }
>+    if (keypad) {
>+        CFRelease(keypad);
>+    }
>+    if (keyboard) {
>+        CFRelease(keyboard);
>+    }
>+}
>+/*----------------------------------------------------------------------------*/
>+#endif // ASL_SDL
>+
> /* This is a helper function for HandleModifierSide. This
>  * function reverts back to behavior before the distinction between
>  * sides was made.
>  */
> static void
> HandleNonDeviceModifier(unsigned int device_independent_mask,
>@@ -332,12 +437,13 @@
>     }
>     if ( right_device_dependent_mask & oldMods ) {
>         SDL_SendKeyboardKey(SDL_RELEASED, right_scancode);
>     }
> }
> 
>+#if !ASL_SDL
> /* This is a helper function for DoSidedModifiers.
>  * This function handles the CapsLock case.
>  */
> static void
> HandleCapsLock(unsigned short scancode,
>                unsigned int oldMods, unsigned int newMods)
>@@ -349,12 +455,13 @@
> 
>     if (oldMask != newMask) {
>         SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_CAPSLOCK);
>         SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_CAPSLOCK);
>     }
> }
>+#endif // !ASL_SDL
> 
> /* This function will handle the modifier keys and also determine the
>  * correct side of the key.
>  */
> static void
> DoSidedModifiers(unsigned short scancode,
>@@ -378,14 +485,16 @@
>      */
>     const unsigned int left_device_mapping[]  = { NX_DEVICELSHIFTKEYMASK, NX_DEVICELCTLKEYMASK, NX_DEVICELALTKEYMASK, NX_DEVICELCMDKEYMASK };
>     const unsigned int right_device_mapping[] = { NX_DEVICERSHIFTKEYMASK, NX_DEVICERCTLKEYMASK, NX_DEVICERALTKEYMASK, NX_DEVICERCMDKEYMASK };
> 
>     unsigned int i, bit;
> 
>+#if !ASL_SDL
>     /* Handle CAPSLOCK separately because it doesn't have a left/right side */
>     HandleCapsLock(scancode, oldMods, newMods);
>+#endif
> 
>     /* Iterate through the bits, testing each against the old modifiers */
>     for (i = 0, bit = NSShiftKeyMask; bit <= NSCommandKeyMask; bit <<= 1, ++i) {
>         unsigned int oldMask, newMask;
> 
>         oldMask = oldMods & bit;
>@@ -496,12 +605,16 @@
>     /* This key is NumLock on the MacBook keyboard. :) */
>     /*SDL_SetScancodeName(SDL_SCANCODE_NUMLOCKCLEAR, "Clear");*/
>     SDL_SetScancodeName(SDL_SCANCODE_LALT, "Left Option");
>     SDL_SetScancodeName(SDL_SCANCODE_LGUI, "Left Command");
>     SDL_SetScancodeName(SDL_SCANCODE_RALT, "Right Option");
>     SDL_SetScancodeName(SDL_SCANCODE_RGUI, "Right Command");
>+
>+#if ASL_SDL
>+    InitHIDCallback();
>+#endif
> }
> 
> void
> Cocoa_StartTextInput(_THIS)
> {
>     SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
>@@ -620,11 +733,14 @@
>     }
> }
> 
> void
> Cocoa_QuitKeyboard(_THIS)
> {
>+#if ASL_SDL
>+    QuitHIDCallback();
>+#endif
> }
> 
> #endif /* SDL_VIDEO_DRIVER_COCOA */
> 
> /* vi: set ts=4 sw=4 expandtab: */

Actions: View | Diff

Attachments on bug 2157: 1837

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.