diff options
| author | Pietro Gagliardi <[email protected]> | 2014-08-11 11:52:10 -0400 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2014-08-11 11:52:10 -0400 |
| commit | bb8603ed4e169cc4a9666e462cc5cd4f341ad100 (patch) | |
| tree | ad7310294dbb5997aa7463e87ab3931881515de7 /redo/area_darwin.go | |
| parent | 5a67a81e0bf7e91635546597dfb1a15d28dca593 (diff) | |
Moved Mac OS X modifier flags constants to the Objective-C side for maximum safety.
Diffstat (limited to 'redo/area_darwin.go')
| -rw-r--r-- | redo/area_darwin.go | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/redo/area_darwin.go b/redo/area_darwin.go index b6140b2..1cb2e4b 100644 --- a/redo/area_darwin.go +++ b/redo/area_darwin.go @@ -60,25 +60,17 @@ func areaView_drawRect(self C.id, rect C.struct_xrect, data unsafe.Pointer) { } func parseModifiers(e C.id) (m Modifiers) { - const ( - // TODO define these on the Objective-C side - _NSShiftKeyMask = 1 << 17 - _NSControlKeyMask = 1 << 18 - _NSAlternateKeyMask = 1 << 19 - _NSCommandKeyMask = 1 << 20 - ) - - mods := uintptr(C.modifierFlags(e)) - if (mods & _NSControlKeyMask) != 0 { + mods := C.modifierFlags(e) + if (mods & C.cNSControlKeyMask) != 0 { m |= Ctrl } - if (mods & _NSAlternateKeyMask) != 0 { + if (mods & C.cNSAlternateKeyMask) != 0 { m |= Alt } - if (mods & _NSShiftKeyMask) != 0 { + if (mods & C.cNSShiftKeyMask) != 0 { m |= Shift } - if (mods & _NSCommandKeyMask) != 0 { + if (mods & C.cNSCommandKeyMask) != 0 { m |= Super } return m |