Skip to content

Commit 3ab73d0

Browse files
s1hofmanns1hofmann
committedSep 3, 2020
(#20) Formatting
1 parent 1f6749a commit 3ab73d0

File tree

3 files changed

+144
-95
lines changed

3 files changed

+144
-95
lines changed
 

Diff for: ‎src/linux/keypress.c

+32-18
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,29 @@
77
#include <X11/extensions/XTest.h>
88
#include "../xdisplay.h"
99

10-
#define X_KEY_EVENT(display, key, is_press) \
11-
(XTestFakeKeyEvent(display, \
12-
XKeysymToKeycode(display, key), \
13-
is_press, CurrentTime), \
14-
XSync(display, false))
10+
#define X_KEY_EVENT(display, key, is_press) \
11+
(XTestFakeKeyEvent(display, \
12+
XKeysymToKeycode(display, key), \
13+
is_press, CurrentTime), \
14+
XSync(display, false))
1515
#define X_KEY_EVENT_WAIT(display, key, is_press) \
16-
(X_KEY_EVENT(display, key, is_press), \
17-
microsleep(DEADBEEF_UNIFORM(0.0, 62.5)))
16+
(X_KEY_EVENT(display, key, is_press), \
17+
microsleep(DEADBEEF_UNIFORM(0.0, 62.5)))
1818

1919
void toggleKeyCode(MMKeyCode code, const bool down, MMKeyFlags flags)
2020
{
2121
Display *display = XGetMainDisplay();
2222
const Bool is_press = down ? True : False; /* Just to be safe. */
2323

2424
/* Parse modifier keys. */
25-
if (flags & MOD_META) X_KEY_EVENT_WAIT(display, K_META, is_press);
26-
if (flags & MOD_ALT) X_KEY_EVENT_WAIT(display, K_ALT, is_press);
27-
if (flags & MOD_CONTROL) X_KEY_EVENT_WAIT(display, K_CONTROL, is_press);
28-
if (flags & MOD_SHIFT) X_KEY_EVENT_WAIT(display, K_SHIFT, is_press);
25+
if (flags & MOD_META)
26+
X_KEY_EVENT_WAIT(display, K_META, is_press);
27+
if (flags & MOD_ALT)
28+
X_KEY_EVENT_WAIT(display, K_ALT, is_press);
29+
if (flags & MOD_CONTROL)
30+
X_KEY_EVENT_WAIT(display, K_CONTROL, is_press);
31+
if (flags & MOD_SHIFT)
32+
X_KEY_EVENT_WAIT(display, K_SHIFT, is_press);
2933

3034
X_KEY_EVENT(display, code, is_press);
3135
}
@@ -42,7 +46,8 @@ void toggleKey(char c, const bool down, MMKeyFlags flags)
4246

4347
//Prevent unused variable warning for Mac and Linux.
4448

45-
if (isupper(c) && !(flags & MOD_SHIFT)) {
49+
if (isupper(c) && !(flags & MOD_SHIFT))
50+
{
4651
flags |= MOD_SHIFT; /* Not sure if this is safe for all layouts. */
4752
}
4853

@@ -71,24 +76,32 @@ void typeString(const char *str)
7176
unsigned short c3;
7277
unsigned long n;
7378

74-
while (*str != '\0') {
79+
while (*str != '\0')
80+
{
7581
c = *str++;
7682

7783
// warning, the following utf8 decoder
7884
// doesn't perform validation
79-
if (c <= 0x7F) {
85+
if (c <= 0x7F)
86+
{
8087
// 0xxxxxxx one byte
8188
n = c;
82-
} else if ((c & 0xE0) == 0xC0) {
89+
}
90+
else if ((c & 0xE0) == 0xC0)
91+
{
8392
// 110xxxxx two bytes
8493
c1 = (*str++) & 0x3F;
8594
n = ((c & 0x1F) << 6) | c1;
86-
} else if ((c & 0xF0) == 0xE0) {
95+
}
96+
else if ((c & 0xF0) == 0xE0)
97+
{
8798
// 1110xxxx three bytes
8899
c1 = (*str++) & 0x3F;
89100
c2 = (*str++) & 0x3F;
90101
n = ((c & 0x0F) << 12) | (c1 << 6) | c2;
91-
} else if ((c & 0xF8) == 0xF0) {
102+
}
103+
else if ((c & 0xF8) == 0xF0)
104+
{
92105
// 11110xxx four bytes
93106
c1 = (*str++) & 0x3F;
94107
c2 = (*str++) & 0x3F;
@@ -109,7 +122,8 @@ void typeStringDelayed(const char *str, const unsigned cpm)
109122
/* Average milli-seconds per character */
110123
const double mspc = (cps == 0.0) ? 0.0 : 1000.0 / cps;
111124

112-
while (*str != '\0') {
125+
while (*str != '\0')
126+
{
113127
tapUniKey(*str++);
114128
microsleep(mspc + (DEADBEEF_UNIFORM(0.0, 62.5)));
115129
}

Diff for: ‎src/macos/keypress.c

+41-24
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ static io_connect_t _getAuxiliaryKeyDriver(void)
1414
mach_port_t masterPort, service, iter;
1515
kern_return_t kr;
1616

17-
if (!sEventDrvrRef) {
18-
kr = IOMasterPort( bootstrap_port, &masterPort );
17+
if (!sEventDrvrRef)
18+
{
19+
kr = IOMasterPort(bootstrap_port, &masterPort);
1920
assert(KERN_SUCCESS == kr);
20-
kr = IOServiceGetMatchingServices(masterPort, IOServiceMatching( kIOHIDSystemClass), &iter );
21+
kr = IOServiceGetMatchingServices(masterPort, IOServiceMatching(kIOHIDSystemClass), &iter);
2122
assert(KERN_SUCCESS == kr);
22-
service = IOIteratorNext( iter );
23+
service = IOIteratorNext(iter);
2324
assert(service);
24-
kr = IOServiceOpen(service, mach_task_self(), kIOHIDParamConnectType, &sEventDrvrRef );
25+
kr = IOServiceOpen(service, mach_task_self(), kIOHIDParamConnectType, &sEventDrvrRef);
2526
assert(KERN_SUCCESS == kr);
2627
IOObjectRelease(service);
2728
IOObjectRelease(iter);
@@ -32,18 +33,21 @@ static io_connect_t _getAuxiliaryKeyDriver(void)
3233
void toggleKeyCode(MMKeyCode code, const bool down, MMKeyFlags flags)
3334
{
3435
/* The media keys all have 1000 added to them to help us detect them. */
35-
if (code >= 1000) {
36+
if (code >= 1000)
37+
{
3638
code = code - 1000; /* Get the real keycode. */
37-
NXEventData event;
39+
NXEventData event;
3840
kern_return_t kr;
39-
IOGPoint loc = { 0, 0 };
40-
UInt32 evtInfo = code << 16 | (down?NX_KEYDOWN:NX_KEYUP) << 8;
41+
IOGPoint loc = {0, 0};
42+
UInt32 evtInfo = code << 16 | (down ? NX_KEYDOWN : NX_KEYUP) << 8;
4143
bzero(&event, sizeof(NXEventData));
4244
event.compound.subType = NX_SUBTYPE_AUX_CONTROL_BUTTONS;
4345
event.compound.misc.L[0] = evtInfo;
44-
kr = IOHIDPostEvent( _getAuxiliaryKeyDriver(), NX_SYSDEFINED, loc, &event, kNXEventDataVersion, 0, FALSE );
45-
assert( KERN_SUCCESS == kr );
46-
} else {
46+
kr = IOHIDPostEvent(_getAuxiliaryKeyDriver(), NX_SYSDEFINED, loc, &event, kNXEventDataVersion, 0, FALSE);
47+
assert(KERN_SUCCESS == kr);
48+
}
49+
else
50+
{
4751
CGEventRef keyEvent = CGEventCreateKeyboardEvent(NULL, (CGKeyCode)code, down);
4852
assert(keyEvent != NULL);
4953

@@ -64,7 +68,8 @@ void toggleKey(char c, const bool down, MMKeyFlags flags)
6468
{
6569
MMKeyCode keyCode = keyCodeForChar(c);
6670

67-
if (isupper(c) && !(flags & MOD_SHIFT)) {
71+
if (isupper(c) && !(flags & MOD_SHIFT))
72+
{
6873
flags |= MOD_SHIFT; /* Not sure if this is safe for all layouts. */
6974
}
7075

@@ -85,20 +90,23 @@ void toggleUnicodeKey(unsigned long ch, const bool down)
8590
* flags. It is therefore only used in typeString() and typeStringDelayed()
8691
* -- if you need modifier keys, use the above functions instead. */
8792
CGEventRef keyEvent = CGEventCreateKeyboardEvent(NULL, 0, down);
88-
if (keyEvent == NULL) {
93+
if (keyEvent == NULL)
94+
{
8995
fputs("Could not create keyboard event.\n", stderr);
9096
return;
9197
}
9298

93-
if (ch > 0xFFFF) {
99+
if (ch > 0xFFFF)
100+
{
94101
// encode to utf-16 if necessary
95102
unsigned short surrogates[] = {
96103
0xD800 + ((ch - 0x10000) >> 10),
97-
0xDC00 + (ch & 0x3FF)
98-
};
104+
0xDC00 + (ch & 0x3FF)};
99105

100106
CGEventKeyboardSetUnicodeString(keyEvent, 2, &surrogates);
101-
} else {
107+
}
108+
else
109+
{
102110
CGEventKeyboardSetUnicodeString(keyEvent, 1, &ch);
103111
}
104112

@@ -125,24 +133,32 @@ void typeString(const char *str)
125133
unsigned short c3;
126134
unsigned long n;
127135

128-
while (*str != '\0') {
136+
while (*str != '\0')
137+
{
129138
c = *str++;
130139

131140
// warning, the following utf8 decoder
132141
// doesn't perform validation
133-
if (c <= 0x7F) {
142+
if (c <= 0x7F)
143+
{
134144
// 0xxxxxxx one byte
135145
n = c;
136-
} else if ((c & 0xE0) == 0xC0) {
146+
}
147+
else if ((c & 0xE0) == 0xC0)
148+
{
137149
// 110xxxxx two bytes
138150
c1 = (*str++) & 0x3F;
139151
n = ((c & 0x1F) << 6) | c1;
140-
} else if ((c & 0xF0) == 0xE0) {
152+
}
153+
else if ((c & 0xF0) == 0xE0)
154+
{
141155
// 1110xxxx three bytes
142156
c1 = (*str++) & 0x3F;
143157
c2 = (*str++) & 0x3F;
144158
n = ((c & 0x0F) << 12) | (c1 << 6) | c2;
145-
} else if ((c & 0xF8) == 0xF0) {
159+
}
160+
else if ((c & 0xF8) == 0xF0)
161+
{
146162
// 11110xxx four bytes
147163
c1 = (*str++) & 0x3F;
148164
c2 = (*str++) & 0x3F;
@@ -163,7 +179,8 @@ void typeStringDelayed(const char *str, const unsigned cpm)
163179
/* Average milli-seconds per character */
164180
const double mspc = (cps == 0.0) ? 0.0 : 1000.0 / cps;
165181

166-
while (*str != '\0') {
182+
while (*str != '\0')
183+
{
167184
tapUniKey(*str++);
168185
microsleep(mspc + (DEADBEEF_UNIFORM(0.0, 62.5)));
169186
}

0 commit comments

Comments
 (0)
Please sign in to comment.