From 9deaf2da2c4bce2e4e8548a1d8ddb33a22f5373f Mon Sep 17 00:00:00 2001 From: Rico Tiongson Date: Fri, 8 May 2020 00:03:18 +0800 Subject: [PATCH] Specify disabled swipes (#86) * Configure swipes ok for mouse3/4 = move * Use filled heavy check mark --- README.md | 37 ++++++++++++++++++++----------------- VERSION | 2 +- comfortable-swipe | 8 ++++---- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index c07f2d6..8d5bf2f 100644 --- a/README.md +++ b/README.md @@ -419,46 +419,49 @@ Possible Values: - scroll - 3/4 finger natural scroll (no acceleration, very experimental) - scroll_reverse - 3/4 finger reverse scroll (no acceleration, very experimental) +> **Tip**: You can clear mouse gestures by setting them blank +> +> ``` +> comfortable-swipe mouse3 = +> comfortable-swipe mouse4 = +> ``` + Examples: -- 3/4-finger drag +✔️ swipes OK +⭕ swipes DISABLED + +- 3/4-finger drag ⭕ + ```bash comfortable-swipe mouse3 = button1 - ``` - ```bash comfortable-swipe mouse4 = button1 ``` -- 3/4-finger natural scroll - ```bash - comfortable-swipe mouse3 = scroll - ``` + You can also use `button2` for middle click and `button3` for right click. + +- 3/4-finger natural scroll ⭕ ```bash + comfortable-swipe mouse3 = scroll comfortable-swipe mouse4 = scroll ``` -- 3/4-finger reverse scroll +- 3/4-finger reverse scroll ⭕ ```bash comfortable-swipe mouse3 = scroll_reverse - ``` - - ```bash comfortable-swipe mouse4 = scroll_reverse ``` -- Move 3/4-fingers with the cursor +- Move 3/4-fingers with the cursor ✔️ ```bash comfortable-swipe mouse3 = move + comfortable-swipe mouse4 = move ``` - ```bash - mcomfortable-swipe ouse4 = move - ``` - -> **Warning**: Applying any mouse-mouse configuration will **disable up/left/right/down behavior** to avoid gesture conflicts. The logic of this will be improved in the future. +> **Warning**: Some mouse configuration will **disable up/left/right/down behavior** to avoid gesture conflicts. The logic of this will be improved in the future. ## Debugging diff --git a/VERSION b/VERSION index b6c8bcf..10c1a16 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v1.2.2 +v1.2.3 diff --git a/comfortable-swipe b/comfortable-swipe index fcfe5d5..0b6436a 100755 --- a/comfortable-swipe +++ b/comfortable-swipe @@ -200,10 +200,10 @@ function status { else vstatus="VALID" if [[ "$key" != mouse* ]]; then - if [[ "$key" == *3 && -n "$mouse3" ]]; then - vstatus="IGNORED" - elif [[ "$key" == *4 && -n "$mouse4" ]]; then - vstatus="IGNORED" + if [[ "$key" == *3 && -n "$mouse3" && "$mouse3" != move ]]; then + vstatus="DISABLED" + elif [[ "$key" == *4 && -n "$mouse4" && "$mouse4" != move ]]; then + vstatus="DISABLED" fi fi if [[ "$key" == threshold ]]; then