Mac acc perm #2
Mac acc perm #2
Conversation
…p-hotkeys into feature/aggregate_iohook � Conflicts: � index.js
…t/globalhotkeys into feature/aggregate_iohook
remove diagn code
code formatting
# Conflicts: # libuiohook
| @@ -1,3 +1,79 @@ | |||
| var binding = require('node-gyp-build')(__dirname); | |||
| module.exports = binding; | |||
| class ShortcutHelper { | |||
There was a problem hiding this comment.
Indentations look off, should be 2 spaces per https://github.com/zelloptt/zello-code-style/tree/master/javascript#zello-javascript-code-style-and-standards
index.js
Outdated
| throw new TypeError('win32 impl does not track the keys'); | ||
| } | ||
| this.impl.collectPressedKeyCodes(true); | ||
| return true; |
There was a problem hiding this comment.
Since this always returns true (or throws), we can probably just remove this return value
| @@ -1,6 +1,6 @@ | |||
| { | |||
| "name": "desktop-hotkeys", | |||
| "version": "1.0.3", | |||
| "version": "1.4.3", | |||
There was a problem hiding this comment.
Any reason why the version jumped from 1.0 to 1.4 and not 1.1?
There was a problem hiding this comment.
There were several (published) releases in between
| const F1 = (process.platform === 'win32') ? 112 : 59; | ||
| const F6 = F1 + 5; | ||
| const F7 = F6 + 1; | ||
| try { |
There was a problem hiding this comment.
Indentation looks off, code inside the try block should be indented
sample/sample.js
Outdated
| const F7 = 65; | ||
|
|
||
| hk1 = dh.registerShortcut([ CTRL, ALT, F1 ], fnPressed, fnReleased) | ||
| const CTRL = (process.platform === 'win32') ? 17 : 29; |
There was a problem hiding this comment.
Can extract this condition to const isWindows = process.platform === 'win32'
src/HotkeysLinuxEmptyImpl.cpp
Outdated
| exports.Set("macCheckAccessibilityGranted", Napi::Function::New(env, HotKeys::macCheckAccessibilityGranted)); | ||
| exports.Set("macShowAccessibilitySettings", Napi::Function::New(env, HotKeys::macShowAccessibilitySettings)); | ||
| exports.Set("macSubscribeAccessibilityUpdates", Napi::Function::New(env, HotKeys::macSubscribeAccessibilityUpdates)); | ||
| exports.Set("macUnsubscribeAccessibilityUpdates", Napi::Function::New(env, HotKeys::macUnsubscribeAccessibilityUpdates)); |
Co-authored-by: Adam Bailey <[email protected]>
# Conflicts: # sample/sample.js
| } | ||
|
|
||
| collectPressedKeyCodes() { | ||
| console.log('\r\n(DHK) looking for pressed keys'); |
There was a problem hiding this comment.
i think this should be behind an interface of some kind
| } | ||
|
|
||
| setupAccessibilityCallback(enable, cb) { | ||
| if (process.platform === 'darwin') { |
There was a problem hiding this comment.
check for this.macImpl instead?
| Napi::Number HotKeys::macSubscribeAccessibilityUpdates(const Napi::CallbackInfo& info) | ||
| { | ||
| Napi::Env env = info.Env(); | ||
| if (info.Length() < 1 || !info[0].IsFunction()) { |
There was a problem hiding this comment.
formatting is off in this file as well, let's please fix
this branch includes bugfixes
and contains link to the forked libuiohook project,
and client code which in general follows src code from libuiohook mac sample.