Skip to content

Commit faddf9c

Browse files
author
Gurel Erceis
committed
Update keypress.c
1 parent 163feb5 commit faddf9c

File tree

1 file changed

+33
-35
lines changed

1 file changed

+33
-35
lines changed

src/keypress.c

+33-35
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#if defined(IS_MACOSX)
88
#include <ApplicationServices/ApplicationServices.h>
99
#import <IOKit/hidsystem/IOHIDLib.h>
10-
#import <IOKit/hidsystem/ev_keymap.h>
10+
#import <IOKit/hidsystem/ev_keymap.h>
1111
#elif defined(USE_X11)
1212
#include <X11/extensions/XTest.h>
1313
#include "xdisplay.h"
@@ -30,40 +30,38 @@
3030

3131
#if defined(IS_MACOSX)
3232
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;
4645
}
4746
static io_connect_t _getAuxiliaryKeyDriver(void)
4847
{
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;
6765
}
6866
#endif
6967

@@ -85,9 +83,9 @@ void toggleKeyCode(MMKeyCode code, const bool down, MMKeyFlags flags)
8583
{
8684
#if defined(IS_MACOSX)
8785
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 };
9189
UInt32 evtInfo = code << 16 | (down?NX_KEYDOWN:NX_KEYUP) << 8;
9290
bzero(&event, sizeof(NXEventData));
9391
event.compound.subType = NX_SUBTYPE_AUX_CONTROL_BUTTONS;

0 commit comments

Comments
 (0)