7
7
#if defined(IS_MACOSX )
8
8
#include <ApplicationServices/ApplicationServices.h>
9
9
#import <IOKit/hidsystem/IOHIDLib.h>
10
- #import <IOKit/hidsystem/ev_keymap.h>
10
+ #import <IOKit/hidsystem/ev_keymap.h>
11
11
#elif defined(USE_X11 )
12
12
#include <X11/extensions/XTest.h>
13
13
#include "xdisplay.h"
30
30
31
31
#if defined(IS_MACOSX )
32
32
bool keyCodeRequiresSystemDefinedEvent (MMKeyCode code ) {
33
- return code == NX_KEYTYPE_SOUND_UP ||
34
- code == NX_KEYTYPE_SOUND_DOWN ||
35
- code == NX_KEYTYPE_MUTE ||
36
- code == NX_KEYTYPE_PLAY ||
37
- code == NX_KEYTYPE_BRIGHTNESS_UP ||
38
- code == NX_KEYTYPE_BRIGHTNESS_DOWN ||
39
- code == NX_KEYTYPE_PLAY ||
40
- code == NX_KEYTYPE_PREVIOUS ||
41
- code == NX_KEYTYPE_NEXT ||
42
- code == NX_KEYTYPE_ILLUMINATION_UP ||
43
- code == NX_KEYTYPE_ILLUMINATION_DOWN ||
44
- code == NX_KEYTYPE_ILLUMINATION_TOGGLE
45
- ;
33
+ return code == NX_KEYTYPE_SOUND_UP ||
34
+ code == NX_KEYTYPE_SOUND_DOWN ||
35
+ code == NX_KEYTYPE_MUTE ||
36
+ code == NX_KEYTYPE_PLAY ||
37
+ code == NX_KEYTYPE_BRIGHTNESS_UP ||
38
+ code == NX_KEYTYPE_BRIGHTNESS_DOWN ||
39
+ code == NX_KEYTYPE_PLAY ||
40
+ code == NX_KEYTYPE_PREVIOUS ||
41
+ code == NX_KEYTYPE_NEXT ||
42
+ code == NX_KEYTYPE_ILLUMINATION_UP ||
43
+ code == NX_KEYTYPE_ILLUMINATION_DOWN ||
44
+ code == NX_KEYTYPE_ILLUMINATION_TOGGLE ;
46
45
}
47
46
static io_connect_t _getAuxiliaryKeyDriver (void )
48
47
{
49
- static mach_port_t sEventDrvrRef = 0 ;
50
- mach_port_t masterPort , service , iter ;
51
- kern_return_t kr ;
52
-
53
- if (!sEventDrvrRef )
54
- {
55
- kr = IOMasterPort ( bootstrap_port , & masterPort );
56
- assert (KERN_SUCCESS == kr );
57
- kr = IOServiceGetMatchingServices (masterPort , IOServiceMatching ( kIOHIDSystemClass ), & iter );
58
- assert (KERN_SUCCESS == kr );
59
- service = IOIteratorNext ( iter );
60
- assert (service );
61
- kr = IOServiceOpen (service , mach_task_self (), kIOHIDParamConnectType , & sEventDrvrRef );
62
- assert (KERN_SUCCESS == kr );
63
- IOObjectRelease (service );
64
- IOObjectRelease (iter );
65
- }
66
- return sEventDrvrRef ;
48
+ static mach_port_t sEventDrvrRef = 0 ;
49
+ mach_port_t masterPort , service , iter ;
50
+ kern_return_t kr ;
51
+
52
+ if (!sEventDrvrRef ) {
53
+ kr = IOMasterPort ( bootstrap_port , & masterPort );
54
+ assert (KERN_SUCCESS == kr );
55
+ kr = IOServiceGetMatchingServices (masterPort , IOServiceMatching ( kIOHIDSystemClass ), & iter );
56
+ assert (KERN_SUCCESS == kr );
57
+ service = IOIteratorNext ( iter );
58
+ assert (service );
59
+ kr = IOServiceOpen (service , mach_task_self (), kIOHIDParamConnectType , & sEventDrvrRef );
60
+ assert (KERN_SUCCESS == kr );
61
+ IOObjectRelease (service );
62
+ IOObjectRelease (iter );
63
+ }
64
+ return sEventDrvrRef ;
67
65
}
68
66
#endif
69
67
@@ -85,9 +83,9 @@ void toggleKeyCode(MMKeyCode code, const bool down, MMKeyFlags flags)
85
83
{
86
84
#if defined(IS_MACOSX )
87
85
if (keyCodeRequiresSystemDefinedEvent (code )) {
88
- NXEventData event ;
89
- kern_return_t kr ;
90
- IOGPoint loc = { 0 , 0 };
86
+ NXEventData event ;
87
+ kern_return_t kr ;
88
+ IOGPoint loc = { 0 , 0 };
91
89
UInt32 evtInfo = code << 16 | (down ?NX_KEYDOWN :NX_KEYUP ) << 8 ;
92
90
bzero (& event , sizeof (NXEventData ));
93
91
event .compound .subType = NX_SUBTYPE_AUX_CONTROL_BUTTONS ;
0 commit comments