Skip to content

Electron 29 Support #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Electron 29 Support #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f81bf3
fix single os prebuild getting extracted for missing versions
chevonc Dec 4, 2021
e46a0ca
make module context aware
chevonc Dec 4, 2021
7bf5190
changes for electron 28 support
alexciarlillo Jan 31, 2024
1b33ecd
downgrade node-gyp
alexciarlillo Jan 31, 2024
29100e3
use legacy even dispatch on OSX
alexciarlillo Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function build(runtime, version, abi) {
];

if (/^electron/i.test(runtime)) {
args.push('--dist-url=https://atom.io/download/electron');
args.push('--dist-url=https://electronjs.org/headers');
}

if (parseInt(abi) >= 80) {
Expand Down
1 change: 1 addition & 0 deletions install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ function install(runtime, abi, platform, arch, cb) {
console.error('# npm run build');
console.error('');
}
return;
}

let options = {
Expand Down
2 changes: 1 addition & 1 deletion libuiohook/src/darwin/input_hook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ static inline void process_key_pressed(uint64_t timestamp, CGEventRef event_ref)
tis_message->length = 0;
bool is_runloop_main = CFEqual(event_loop, CFRunLoopGetMain());

if (dispatch_sync_f_f != NULL && dispatch_main_queue_s != NULL && !is_runloop_main) {
if (false && dispatch_sync_f_f != NULL && dispatch_main_queue_s != NULL && !is_runloop_main) {
logger(LOG_LEVEL_DEBUG, "%s [%u]: Using dispatch_sync_f for key typed events.\n", __FUNCTION__, __LINE__);
(*dispatch_sync_f_f)(dispatch_main_queue_s, tis_message, &keycode_to_lookup);
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
"jest": "^26.6.3",
"lint-staged": "^11.0.0",
"minimist": "^1.2.5",
"nan": "^2.15.0",
"nan": "^2.18.0",
"node-abi": "^2.19.3",
"node-gyp": "^7.1.2",
"node-gyp": "^8.4.0",
"prebuild": "^10.0.1",
"prettier": "^2.3.1",
"robotjs": "^0.6.0",
Expand Down
5 changes: 3 additions & 2 deletions src/iohook.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,8 @@ void stop() {
}

#ifdef _WIN32
// Create event handles for the thread hook.
// wait for hook thread clean exit
WaitForSingleObject(hook_thread, INFINITE);
CloseHandle(hook_thread);
DeleteCriticalSection(&hook_running_mutex);
DeleteCriticalSection(&hook_control_mutex);
Expand Down Expand Up @@ -564,4 +565,4 @@ NAN_MODULE_INIT(Init) {
Nan::GetFunction(Nan::New<FunctionTemplate>(GrabMouseClick)).ToLocalChecked());
}

NODE_MODULE(nodeHook, Init)
NAN_MODULE_WORKER_ENABLED(nodeHook, Init)
Loading