fusuma 2.0.4 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f19305771a0704b1f7294b9b54653f09d7d4f6153ffbdd19a6c23a753870b09
-  data.tar.gz: 3b6c9addcda816e7379e69bb258bd11f091ea39fbae37fc8e0ef4c9ca4b7dff7
+  metadata.gz: f5d1aa62dc207e88f6b59dd13c073fe0465943f8de5ccc198475121a4fded8bb
+  data.tar.gz: 1a88e8369cd71286838b4ea52fcd692d15425864509b98cc2fb9f4116031039c
 SHA512:
-  metadata.gz: 422dc7e58b8db650754c4939ec1946456bfdfb0a8e4af33d79a20d88d84190f393952e05e1d086f711fb1ee2e6c415c4ddf6861dba8d94bf84df4f4e0585374f
-  data.tar.gz: 02e75550adfd4a6f3e3d43b4a6326377d5182131bdd9d9f3ff3ca0abcb89888e0bca9eea8551868cc87edb0a706fb9b51ee97cc517e093566c7448729359ded2
+  metadata.gz: 267f59ae0400d3266edf799981ee757357e7ecebb48b44f5e12769fb4a00c46f23276492f3b5769c5a6b02720ced7c7ddf4c52313173de223ef0eeb06860d505
+  data.tar.gz: 740b03cc4a5315b0ed70ec8f95459045dd93c13c3c8bf708f7414597fb1f710dd85d6080c9628cf3377f6e457473a5873711d3e980c1ad31987b350bf6759a12

data/README.md

@@ -1,9 +1,9 @@
-# Fusuma [![Gem Version](https://badge.fury.io/rb/fusuma.svg)](https://badge.fury.io/rb/fusuma) [![Build Status](https://travis-ci.com/iberianpig/fusuma.svg?branch=master)](https://travis-ci.com/iberianpig/fusuma) [![Coverage Status](https://coveralls.io/repos/github/iberianpig/fusuma/badge.svg?branch=master)](https://coveralls.io/github/iberianpig/fusuma?branch=master) [![Inline docs](http://inch-ci.org/github/iberianpig/fusuma.svg?branch=master)](http://inch-ci.org/github/iberianpig/fusuma)
+# Fusuma [![Gem Version](https://badge.fury.io/rb/fusuma.svg)](https://badge.fury.io/rb/fusuma) [![Build Status](https://github.com/iberianpig/fusuma/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/iberianpig/fusuma/actions/workflows/ubuntu.yml) [![Coverage Status](https://coveralls.io/repos/github/iberianpig/fusuma/badge.svg?branch=master)](https://coveralls.io/github/iberianpig/fusuma?branch=master)
 
 Fusuma is multitouch gesture recognizer.
 This gem makes your linux able to recognize swipes or pinchs and assign commands to them.
 
-![fusuma_image](https://i.gyazo.com/757fef526310b9d68f68e80eb1e4540f.png)
+![fusuma_image](https://repository-images.githubusercontent.com/69813387/60879a00-166c-11ea-9875-3bf0818c62ec)
 
 襖(Fusuma) means sliding door used to partition off rooms in a Japanese house.
 
@@ -22,13 +22,13 @@ This gem makes your linux able to recognize swipes or pinchs and assign commands
 **IMPORTANT**: You **MUST** be a member of the **INPUT** group to read touchpad by Fusuma.
 
 ```bash
-$ sudo gpasswd -a $USER input
+sudo gpasswd -a $USER input
 ```
 
 Then, You apply the change with no logout or reboot.
 
 ```bash
-$ newgrp input
+newgrp input
 ```
 
 ### For Debian Based Distros (Ubuntu, Debian, Mint, Pop!OS)
@@ -38,7 +38,7 @@ $ newgrp input
 You need `libinput` release 1.0 or later.
 
 ```bash
-$ sudo apt-get install libinput-tools
+sudo apt-get install libinput-tools
 ```
 
 #### 2. Install Ruby
@@ -46,13 +46,13 @@ $ sudo apt-get install libinput-tools
 Fusuma runs in Ruby, so you must install it first.
 
 ```bash
-$ sudo apt-get install ruby
+sudo apt-get install ruby
 ```
 
 #### 3. Install Fusuma
 
 ```bash
-$ sudo gem install fusuma
+sudo gem install fusuma
 ```
 
 #### 4. Install xdotool (optional)
@@ -60,7 +60,7 @@ $ sudo gem install fusuma
 For sending shortcuts:
 
 ```bash
-$ sudo apt-get install xdotool
+sudo apt-get install xdotool
 ```
 
 ### For Arch Based Distros (Manjaro, Arch)
@@ -70,7 +70,7 @@ $ sudo apt-get install xdotool
 You need `libinput` release 1.0 or later. This is most probably installed by default on Manjaro
 
 ```z-h
-$ sudo pacman -S libinput
+sudo pacman -S libinput
 ```
 
 #### 2. Install Ruby
@@ -78,17 +78,17 @@ $ sudo pacman -S libinput
 Fusuma runs in Ruby, so you must install it first.
 
 ```zsh
-$ sudo pacman -S ruby
+sudo pacman -S ruby
 ```
 
 #### 3. Install Fusuma
 
-**Note:** By default in Arch Linux, when running ```gem```, gems are installed per-user (into ```~/.gem/ruby/```), instead of system-wide (into ```/usr/lib/ruby/gems/```). This is considered the best way to manage gems on Arch, because otherwise they might interfere with gems installed by Pacman. (From Arch Wiki)
+**Note:** By default in Arch Linux, when running `gem`, gems are installed per-user (into `~/.gem/ruby/`), instead of system-wide (into `/usr/lib/ruby/gems/`). This is considered the best way to manage gems on Arch, because otherwise they might interfere with gems installed by Pacman. (From Arch Wiki)
 
 To install gems system-wide, see any of the methods listed on [Arch Wiki](https://wiki.archlinux.org/index.php/ruby#Installing_gems_system-wide)
 
 ```zsh
-$ sudo gem install fusuma
+sudo gem install fusuma
 ```
 
 #### 4. Install xdotool (optional)
@@ -96,7 +96,7 @@ $ sudo gem install fusuma
 For sending shortcuts:
 
 ```zsh
-$ sudo pacman -S xdotool
+sudo pacman -S xdotool
 ```
 
 ### Touchpad not working in GNOME
@@ -104,43 +104,56 @@ $ sudo pacman -S xdotool
 Ensure the touchpad events are being sent to the GNOME desktop by running the following command:
 
 ```bash
-$ gsettings set org.gnome.desktop.peripherals.touchpad send-events enabled
+gsettings set org.gnome.desktop.peripherals.touchpad send-events enabled
 ```
 
 ## Usage
 
 ```bash
-$ fusuma
+fusuma
 ```
 
 ## Update
 
 ```bash
-$ sudo gem update fusuma
+sudo gem update fusuma
 ```
 
 ## Customize Gesture Mapping
 
-You can customize the settings for gestures to put and edit `~/.config/fusuma/config.yml`.  
+You can customize the settings for gestures to put and edit `~/.config/fusuma/config.yml`.
 **NOTE: You will need to create the `~/.config/fusuma` directory if it doesn't exist yet.**
 
 ```bash
-$ mkdir -p ~/.config/fusuma        # create config directory
-$ nano ~/.config/fusuma/config.yml # edit config file.
+mkdir -p ~/.config/fusuma        # create config directory
+nano ~/.config/fusuma/config.yml # edit config file.
 ```
 
 
 ### Available gestures
 
-* `swipe:`
-  * support `3:`, `4:` fingers
-  * support `left:`, `right:`, `up:`, `down:` directions
-* `pinch:`
-  * support `2:`, `3:`, `4:` fingers
-  * support `in:`, `out:` directions
-* `rotate:`
-  * support `2:`, `3:`, `4:` fingers
-  * support `clockwise:`,`counterclockwise:` directions
+#### swipe:
+
+ * support `3:`, `4:` fingers
+ * support `left:`, `right:`, `up:`, `down:` directions
+ * support `begin:`, `update:`, `end:` events
+
+#### pinch:
+
+ * support `2:`, `3:`, `4:` fingers
+ * support `in:`, `out:` directions
+ * support `begin:`, `update:`, `end:` events
+
+#### rotate:
+
+ * support `2:`, `3:`, `4:` fingers
+ * support `clockwise:`,`counterclockwise:` directions
+ * support `begin:`, `update:`, `end:` events
+
+#### hold:
+ * require libinput version 1.19.0 or later
+ * support `1:`, `2:`, `3:`, `4:` fingers
+ * support `begin:`, `end:`, `cancelled:` events
 
 ### About YAML Basic Syntax
 
@@ -157,7 +170,7 @@ https://github.com/iberianpig/fusuma/wiki/Ubuntu
 swipe:
   3:
     left:
-      command: "xdotool key alt+Right" # History forward 
+      command: "xdotool key alt+Right" # History forward
     right:
       command: "xdotool key alt+Left" # History back
     up:
@@ -178,6 +191,9 @@ pinch:
     command: "xdotool keydown ctrl click 4 keyup ctrl" # Zoom in
   out:
     command: "xdotool keydown ctrl click 5 keyup ctrl" # Zoom out
+hold:
+  4:
+    command: "xdotool key super" # Activity
 ```
 
 ### More Example of config.yml
@@ -191,36 +207,38 @@ The following wiki pages can be edited by everyone.
 - [POP OS with Cinnamon](https://github.com/iberianpig/fusuma/wiki/POP-OS-with-Cinnamon)
 - [PopOS Default Gnome](https://github.com/iberianpig/fusuma/wiki/PopOS-Default-Gnome)
 - [Ubuntu OS to mimic Mac a little](https://github.com/iberianpig/fusuma/wiki/Ubuntu-OS-to-mimic-Mac-a-little)
+- [3 fingers Drag (OS X Style)](https://github.com/iberianpig/fusuma/wiki/3-fingers-Drag-(OS-X-Style))
+- [3 fingers Alt Tab Switcher(Windows Style)](https://github.com/iberianpig/fusuma/wiki/3-fingers-Alt-Tab-Switcher(Windows-Style))
 
 If you have a nice configuration, please share `~/.config/fusuma/config.yml` with everyone.
 
 ### Threshold and Interval
 
-if `command:` properties are blank, the swipe/pinch doesn't execute command.
+if `command:` properties are blank, the swipe/pinch/hold doesn't execute command.
 
-`threshold:` is sensitivity to swipe/pinch. Default value is 1.
+`threshold:` is sensitivity to swipe/pinch/hold. Default value is 1.
 If the swipe's threshold is `0.5`, shorten swipe-length by half.
 
-`interval:` is delay between swipes/pinches. Default value is 1.
+`interval:` is delay between swipes/pinches/hold. Default value is 1.
 If the swipe's interval is `0.5`, shorten swipe-interval by half to recognize a next swipe.
 
 ### Example of `threshold:` / `interval:` settings
 
 ```yaml
 swipe:
-  3: 
-    left: 
+  3:
+    left:
       command: 'xdotool key alt+Right' # threshold: 0.5, interval: 0.75
       threshold: 0.5
-    right: 
+    right:
       command: 'xdotool key alt+Left' # threshold: 0.5, interval: 0.75
       threshold: 0.5
-    up: 
+    up:
       command: 'xdotool key super' # threshold: 1, interval: 0.75
-    down: 
+    down:
       command: 'xdotool key super' # threshold: 1, interval: 0.75
 pinch:
-  2: 
+  2:
     in:
       command: "xdotool keydown ctrl click 4 keyup ctrl" # threshold: 0.5, interval: 0.5
     out:
@@ -234,11 +252,11 @@ interval:
   pinch: 0.5
 ```
 
-There are three priorities of `threshold:` and `interval:`.  
+There are three priorities of `threshold:` and `interval:`.
 The individual `threshold:` and `interval:` settings (under "direction") have a higher priority than the global one (under "root")
 
 1. child elements in the direction (left/right/down/up → threshold/interval)
-1. root child elements (threshold/interval → swipe/pinch)
+1. root child elements (threshold/interval → swipe/pinch/hold)
 1. default value (= 1)
 
 ### `command:` property for assigning commands
@@ -280,7 +298,7 @@ swipe:
 - `xte`
   - [xte(1) - Linux man page](https://linux.die.net/man/1/xte)
   - install with `sudo apt xautomation`
-  
+
 - [ydotool](https://github.com/ReimuNotMoe/ydotool)
   - Wayland compatible
   - Needs more maintainers.
@@ -292,8 +310,8 @@ swipe:
 - `-d`, `--daemon` : Daemonize process
 - `-l`, `--list-devices` : List available devices
 - `-v`, `--verbose` : Show details about the results of running fusuma
-- `--device="Device name"` : Open the given device only (DEPRECATED)
 - `--version` : Show fusuma version
+- `--log-file=path/to/file` : Set path of log file
 
 ### Specify touchpads by device name
 Set the following options to recognize multi-touch gestures only for the specified touchpad device.
@@ -309,8 +327,8 @@ plugin:
 
 ## Autostart (gnome-session-properties)
 
-1. Check the path where you installed fusuma with `$ which fusuma`
-2. Open `$ gnome-session-properties`
+1. Check the path where you installed fusuma with `which fusuma`
+2. Open `gnome-session-properties`
 3. Add Fusuma and enter the location where the above path was checked in the command input field
 4. Add the `-d` option at the end of the command input field
 
@@ -322,14 +340,10 @@ Following features are provided as plugins.
 - Features for specific Linux distributions
 - Setting different gestures per applications
 
-### Installation of fusuma plugins
+### Available plugins
 
 Fusuma plugins are provided with the `fusuma-plugin-XXXXX` naming convention and hosted on [RubyGems](https://rubygems.org/search?utf8=%E2%9C%93&query=fusuma-plugins).
 
-`$ sudo gem install fusuma-plugin-XXXXX`
-
-### Available plugins
-
 | Name                                                                               | Version                                                               | About                                         |
 | ---------------------------------------------------------------------------------- | --------------------------------------------------------------------- | --------------------------------------------- |
 | [fusuma-plugin-sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey)       | ![Gem Version](https://badge.fury.io/rb/fusuma-plugin-sendkey.svg)    | Emulates keyboard events                      |
@@ -338,9 +352,21 @@ Fusuma plugins are provided with the `fusuma-plugin-XXXXX` naming convention and
 | [fusuma-plugin-tap](https://github.com/iberianpig/fusuma-plugin-tap)               | ![Gem Version](https://badge.fury.io/rb/fusuma-plugin-tap.svg)        | Detects Tap and Hold gestures                 |
 | [fusuma-plugin-appmatcher](https://github.com/iberianpig/fusuma-plugin-appmatcher) | ![Gem Version](https://badge.fury.io/rb/fusuma-plugin-appmatcher.svg) | Configure app-specific gestures               |
 
+
+### Installation of Fusuma plugins
+
+```bash
+# install fusuma-plugin-XXXX
+sudo gem install fusuma-plugin-XXXXX`
+```
+```bash
+# update
+sudo gem list fusuma-plugin- | cut -d' ' -f1 | xargs --no-run-if-empty sudo gem update
+```
+
 ## Tutorial Video
 
-[![Multitouch Touchpad Gestures in Linux with Fusuma](http://img.youtube.com/vi/bn11Iwvf29I/0.jpg)](http://www.youtube.com/watch?v=bn11Iwvf29I "Multitouch Touchpad Gestures in Linux with Fusuma")  
+[![Multitouch Touchpad Gestures in Linux with Fusuma](http://img.youtube.com/vi/bn11Iwvf29I/0.jpg)](http://www.youtube.com/watch?v=bn11Iwvf29I "Multitouch Touchpad Gestures in Linux with Fusuma")
 [Multitouch Touchpad Gestures in Linux with Fusuma](http://www.youtube.com/watch?v=bn11Iwvf29I) by [Eric Adams](https://www.youtube.com/user/igster75)
 
 ## Support
@@ -349,7 +375,7 @@ I'm a Freelance Engineer in Japan and working on these products after finishing
 Currently, my open-source contribution times is not enough.
 If you like my work and want to contribute and become a sponsor, I will be able to focus on my projects.
 
-- [GitHub Sponsors](https://github.com/sponsors/iberianpig) (Zero fee!)
+- [GitHub Sponsors](https://github.com/sponsors/iberianpig)
 - [Patreon](https://www.patreon.com/iberianpig)
 
 ## Contributing

data/exe/fusuma

@@ -22,6 +22,11 @@ opt.on('-l', '--list-devices',
   option[:list] = v
 end
 
+opt.on('--log=path/to/file',
+       'Print logs to file') do |v|
+  option[:log_filepath] = v
+end
+
 opt.on('--device="Device name"',
        'Open the given device only (DEPRECATED)') do |v|
   option[:device] = v

data/fusuma.gemspec

@@ -20,7 +20,10 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.metadata['yard.run'] = 'yri' # use "yard" to build full HTML docs.
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true',
+    'yard.run' => 'yri' # use "yard" to build full HTML docs.
+  }
 
   spec.required_ruby_version = '>= 2.5.1' # https://packages.ubuntu.com/search?keywords=ruby&searchon=names&exact=1&suite=all&section=main
   # support bionic (18.04LTS) 2.5.1

data/lib/fusuma/config/searcher.rb

@@ -67,8 +67,7 @@ module Fusuma
 
       # next locations' candidates sorted by priority
       #  1. look up location with key
-      #  2. fallback to other key
-      #  3. skip the key and go to child location
+      #  2. skip the key and go to child location
       def next_location_cadidates(location, key)
         [
           location[key.symbol],

data/lib/fusuma/config.rb

@@ -84,7 +84,7 @@ module Fusuma
       end.flatten
 
       execute_params = search(index)
-      return if execute_params.nil?
+      return if execute_params.nil? || !execute_params.is_a?(Hash)
 
       @execute_keys.find { |k| execute_params.keys.include?(k) }
     end

data/lib/fusuma/custom_process.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'fusuma/string_support'
+
 module Fusuma
   # Rename process
   module CustomProcess

data/lib/fusuma/environment.rb

@@ -20,7 +20,7 @@ module Fusuma
         libinput_command = Plugin::Inputs::LibinputCommandInput.new.command
         MultiLogger.info "Fusuma: #{VERSION}"
         MultiLogger.info "libinput: #{libinput_command.version}"
-        MultiLogger.info "ruby #{ RUBY_VERSION }p#{ RUBY_PATCHLEVEL }"
+        MultiLogger.info "ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
         MultiLogger.info "OS: #{`uname -rsv`}".strip
         MultiLogger.info "Distribution: #{`cat /etc/issue`}".strip
         MultiLogger.info "Desktop session: #{`echo $DESKTOP_SESSION $XDG_SESSION_TYPE`}".strip

data/lib/fusuma/libinput_command.rb

@@ -13,10 +13,7 @@ module Fusuma
 
     # `libinput-list-devices` and `libinput-debug-events` are deprecated,
     # use `libinput list-devices` and `libinput debug-events` from 1.8.
-    NEW_CLI_OPTION_VERSION = 1.8
-
-    DEFAULT_WAIT_TIME = 0.3
-    TIMEOUT_MESSAGE = 'LIBINPUT TIMEOUT'
+    NEW_CLI_OPTION_VERSION = '1.8'
 
     # @return [Boolean]
     def new_cli_option_available?
@@ -92,10 +89,6 @@ module Fusuma
 
     private
 
-    def wait_time
-      DEFAULT_WAIT_TIME
-    end
-
     # which in ruby: Checking if program exists in $PATH from ruby
     # (https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby)
     # Cross-platform way of finding an executable in the $PATH.

data/lib/fusuma/multi_logger.rb

@@ -11,8 +11,19 @@ module Fusuma
     attr_reader :err_logger
     attr_accessor :debug_mode
 
+    class << self
+      attr_writer :filepath
+    end
+
     def initialize
-      super($stdout)
+      filepath = self.class.instance_variable_get('@filepath')
+      if filepath
+        logfile = File.new(filepath, 'a')
+        super(logfile)
+        $stderr = logfile
+      else
+        super($stdout)
+      end
       @err_logger = Logger.new($stderr)
       @debug_mode = false
     end

data/lib/fusuma/plugin/buffers/gesture_buffer.rb

@@ -46,7 +46,12 @@ module Fusuma
         def ended?
           return false if empty?
 
-          @events.last.record.status == 'end'
+          case @events.last.record.status
+          when 'end', 'cancelled'
+            true
+          else
+            false
+          end
         end
 
         # @param attr [Symbol]

data/lib/fusuma/plugin/buffers/timer_buffer.rb

@@ -8,7 +8,7 @@ module Fusuma
       # manage events and generate command
       class TimerBuffer < Buffer
         DEFAULT_SOURCE = 'timer_input'
-        DEFAULT_SECONDS_TO_KEEP = 60
+        DEFAULT_SECONDS_TO_KEEP = 3
 
         def config_param_types
           {
@@ -31,8 +31,6 @@ module Fusuma
           @events.each do |e|
             break if current_time - e.time < @seconds_to_keep
 
-            MultiLogger.debug("#{self.class.name}##{__method__}")
-
             @events.delete(e)
           end
         end

data/lib/fusuma/plugin/detectors/hold_detector.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require_relative './detector'
+
+module Fusuma
+  module Plugin
+    module Detectors
+      # Detect Hold gesture
+      class HoldDetector < Detector
+        SOURCES = %w[gesture timer].freeze
+        BUFFER_TYPE = 'gesture'
+        GESTURE_RECORD_TYPE = 'hold'
+
+        BASE_THERESHOLD = 0.7
+
+        # @param buffers [Array<Buffers::Buffer>]
+        # @return [Events::Event] if event is detected
+        # @return [Array<Events::Event>] if hold end event is detected
+        # @return [NilClass] if event is NOT detected
+        def detect(buffers)
+          hold_buffer = find_hold_buffer(buffers)
+          return if hold_buffer.empty?
+
+          hold_events = hold_buffer.events
+
+          timer_buffer = buffers.find { |b| b.type == 'timer' }
+          timer_events = timer_buffer.events
+
+          finger = hold_buffer.finger
+          holding_time = calc_holding_time(hold_events: hold_events, timer_events: timer_events)
+
+          @timeout ||= nil
+          status = case hold_events.last.record.status
+                   when 'begin'
+                     if holding_time.zero?
+                       'begin'
+                     else
+                       'timer'
+                     end
+                   when 'cancelled'
+                     'cancelled'
+                   when 'end'
+                     'end'
+                   else
+                     last_record = hold_events.last.record.status
+                     raise "Unexpected Status:#{last_record.status} in #{last_record}"
+                   end
+
+          repeat_index = create_repeat_index(finger: finger, status: status)
+          oneshot_index = create_oneshot_index(finger: finger)
+
+          @timeout = nil if status == 'begin'
+
+          if status == 'timer'
+            return if @timeout
+
+            return unless enough?(index: oneshot_index, holding_time: holding_time)
+
+            @timeout = holding_time
+            return create_event(record: Events::Records::IndexRecord.new(
+              index: oneshot_index, trigger: :oneshot
+            ))
+          end
+
+          create_event(record: Events::Records::IndexRecord.new(
+            index: repeat_index, trigger: :repeat
+          ))
+        end
+
+        # @param [Integer] finger
+        # @return [Config::Index]
+        def create_oneshot_index(finger:)
+          Config::Index.new(
+            [
+              Config::Index::Key.new(type),
+              Config::Index::Key.new(finger.to_i)
+            ]
+          )
+        end
+
+        # @param [Integer] finger
+        # @return [Config::Index]
+        def create_repeat_index(finger:, status:)
+          Config::Index.new(
+            [
+              Config::Index::Key.new(type),
+              Config::Index::Key.new(finger.to_i),
+              Config::Index::Key.new(status)
+            ]
+          )
+        end
+
+        private
+
+        # @param buffers [Array<Buffers::Buffer>]
+        # @return [Buffers::GestureBuffer]
+        def find_hold_buffer(buffers)
+          buffers.find { |b| b.type == BUFFER_TYPE }
+                 .select_from_last_begin
+                 .select_by_events { |e| e.record.gesture == GESTURE_RECORD_TYPE }
+        end
+
+        def calc_holding_time(hold_events:, timer_events:)
+          last_time = if !timer_events.empty? && (hold_events.last.time < timer_events.last.time)
+                        timer_events.last.time
+                      else
+                        hold_events.last.time
+                      end
+          last_time - hold_events.first.time
+        end
+
+        def enough?(index:, holding_time:)
+          holding_time > threshold(index: index)
+        end
+
+        def threshold(index:)
+          @threshold ||= {}
+          @threshold[index.cache_key] ||= begin
+            keys_specific = Config::Index.new [*index.keys, 'threshold']
+            keys_global = Config::Index.new ['threshold', type]
+            config_value = Config.search(keys_specific) ||
+                           Config.search(keys_global) || 1
+            BASE_THERESHOLD * config_value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fusuma/plugin/detectors/pinch_detector.rb

@@ -62,8 +62,15 @@ module Fusuma
           if status == 'update'
             return unless moved?(prev_event, event)
 
-            avg_zoom = gesture_buffer.avg_attrs(:zoom)
-            first_zoom = updating_events.first.record.delta.zoom
+            first_zoom, avg_zoom = if updating_events.size >= 10
+                                     [updating_events[-10].record.delta.zoom,
+                                      gesture_buffer.class.new(
+                                        updating_events[-10..-1]
+                                      ).avg_attrs(:zoom)]
+                                   else
+                                     [updating_events.first.record.delta.zoom,
+                                      gesture_buffer.avg_attrs(:zoom)]
+                                   end
 
             oneshot_quantity = Quantity.new(target: avg_zoom, base: first_zoom).to_f
             oneshot_direction = Direction.new(target: avg_zoom, base: first_zoom).to_s

data/lib/fusuma/plugin/detectors/rotate_detector.rb

@@ -24,8 +24,14 @@ module Fusuma
           updating_events = gesture_buffer.updating_events
           return if updating_events.empty?
 
-          updating_time = 100 * (updating_events.last.time - updating_events.first.time)
-          oneshot_angle = gesture_buffer.sum_attrs(:rotate) / updating_time
+          oneshot_angle = if updating_events.size >= 10
+                            updating_time = 100 * (updating_events[-1].time - updating_events[-10].time)
+                            last_10 = gesture_buffer.class.new(updating_events[-10..-1])
+                            last_10.sum_attrs(:rotate) / updating_time
+                          else
+                            updating_time = 100 * (updating_events.last.time - updating_events.first.time)
+                            gesture_buffer.sum_attrs(:rotate) / updating_time
+                          end
 
           return if updating_events.empty?