Skip to content

Commit

Permalink
Merge branch 'custom' of https://github.com/wurikiji/iohook into custom
Browse files Browse the repository at this point in the history
  • Loading branch information
wurikiji committed Sep 21, 2018
2 parents f446eee + 5ae1439 commit c4b9b32
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Found a bug? Have an idea? Feel free to post an [issue](https://github.com/Wilix
iohook provides prebuilt version for a bunch of OSes and runtime versions.

```bash
npm install iohook --save # or yarn add iohook
npm i git+https://github.com:wurikiji/iohook.git # or yarn add iohook
```

from git
Expand All @@ -28,12 +28,11 @@ npm i git+https://github.com:wurikiji/iohook.git
```

### Windows
- for Node.js usage just make sure that you have installed following components
- for Node.js usage just make sure that you have installed following components and it will be built by install script
- [![](https://cmake.org/wp-content/uploads/2014/06/favicon.png) CMake](https://cmake.org)
- [![](http://landinghub.visualstudio.com/favicon.ico) Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools)
- [CMake.js](https://www.npmjs.com/package/cmake-js)
and it will be built by install script
- for Electron go to installation dir (node_modules/iohook) and recompile it according to your Electron version. e.g. `cmake-js compile -r electron -v 2.0.0`
- for Electron go to installation dir (node_modules/iohook) and recompile it according to your Electron version. e.g. `cmake-js rebuild -r electron -v 2.0.0`

## Added feature

Expand Down
4 changes: 2 additions & 2 deletions libuiohook/src/x11/input_hook.c
Original file line number Diff line number Diff line change
Expand Up @@ -1074,8 +1074,8 @@ static void init_grab() {
win = XDefaultRootWindow(disp);
}

UIOHOOK_API void grab_keyboad(bool enable) {
grab_keyboad = enable;
UIOHOOK_API void grab_keyboard(bool enable) {
grab_keyboard_event = enable;
}

static void enable_grab_mouse() {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"main": "index.js",
"types": "index.d.ts",
"scripts": {
"install": "node install.js",
"install": "node install.js || cmake-js build",
"install-all": "node install.js --all",
"build": "cmake-js compile",
"build": "cmake-js build",
"deploy": "node build.js",
"test": "jest",
"docs:dev": "vuepress dev docs",
Expand Down

0 comments on commit c4b9b32

Please sign in to comment.