fusuma-plugin-tap 0.3.2 → 0.4.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5831e58a7d0a238e4c39c5cb8ebf59817f117a98ec3133dc3bf2977548d2f39d
-  data.tar.gz: e7b40ec4d65ec04e4d6520c04716f13cfa7a21c87a05759250eeabe9f7a6f2e6
+  metadata.gz: 17a8597b18f259832d7d6d0dce336d6d9435d000a1adc6656a1dc67b53d3037e
+  data.tar.gz: 5f909eb2fe3be8766cef41235c80710880a51ebde67c0e91e76affe12b000722
 SHA512:
-  metadata.gz: ea15af733e2ba297f3fac04e273a8534cc67996465e93758646a0e2c65a0bae77ed1b84622dc821918868b260a37d38a78c1f0d047969478080fa82c81916ae9
-  data.tar.gz: 8a70912f3db0c623aad8acb0201d6804fb26dfdfd8c36e6d339870d2689c7c5d4e4b02e3b3869ffccb438e192d16f9207c1bb409cd70a42911c175d4aa1b7aae
+  metadata.gz: fe0c32c71db497489620a5ceefbb4ac172c8d7003fe957432f3a779e27ed7ecbe5f4c96c3f23a38f67bc557421d250e0582a729eef31cb00f2b248606826d4f5
+  data.tar.gz: 5f8b2730af48d13f85f4bdf42073669f7d8aea9eb0d2a70f4c521327b2aa1506714c50d80c21fbd3e516ced76cf72015976593a6859b602c71ed38b6df6c534a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [v0.4.0.pre](https://github.com/iberianpig/fusuma-plugin-tap/tree/v0.4.0.pre) (2020-11-09)
+
+[Full Changelog](https://github.com/iberianpig/fusuma-plugin-tap/compare/v0.3.2...v0.4.0.pre)
+
 ## [v0.3.2](https://github.com/iberianpig/fusuma-plugin-tap/tree/v0.3.2) (2020-08-13)
 
 [Full Changelog](https://github.com/iberianpig/fusuma-plugin-tap/compare/v0.3.1...v0.3.2)

data/fusuma-plugin-tap.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3' # https://packages.ubuntu.com/search?keywords=ruby&searchon=names&exact=1&suite=all&section=main
 
-  spec.add_dependency 'fusuma', '~> 1.10'
+  spec.add_dependency 'fusuma', '~> 2.0.0.pre'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.14'

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

@@ -18,24 +18,27 @@ module Fusuma
         # @return [Event] if event is detected
         # @return [NilClass] if event is NOT detected
         def detect(buffers)
-          buffer = buffers.find { |b| b.type == BUFFER_TYPE }
+          tap_buffer = buffers.find { |b| b.type == BUFFER_TYPE }
           gesture_buffer = buffers.find { |b| b.type == 'gesture' }
+          timer_buffer = buffers.find { |b| b.type == 'timer' }
 
-          return if buffer.empty? || moved?(tap_buffer: buffer, gesture_buffer: gesture_buffer)
+          if tap_buffer.empty? || moved?(tap_buffer: tap_buffer, gesture_buffer: gesture_buffer)
+            return
+          end
 
-          holding_time = buffer.events.last.time - buffer.events.first.time
+          holding_time = calc_holding_time(tap_buffer: tap_buffer, timer_buffer: timer_buffer)
 
-          direction = if hold?(buffer, holding_time)
+          direction = if hold?(tap_buffer, holding_time)
                         'hold'
-                      elsif tap?(buffer, holding_time)
+                      elsif tap?(tap_buffer, holding_time)
                         'tap'
                       end
 
           return if direction.nil?
 
-          finger = buffer.finger
+          finger = tap_buffer.finger
 
-          buffer.clear
+          tap_buffer.clear # NOTE: Clear after detecting hold
 
           index = create_index(finger: finger, direction: direction)
 
@@ -97,6 +100,16 @@ module Fusuma
           end
         end
 
+        def calc_holding_time(tap_buffer:, timer_buffer:)
+          last_time = if timer_buffer && !timer_buffer.empty? &&
+                         (tap_buffer.events.last.time < timer_buffer.events.last.time)
+                        timer_buffer.events.last.time
+                      else
+                        tap_buffer.events.last.time
+                      end
+          last_time - tap_buffer.events.first.time
+        end
+
         private
 
         def enough?(index:, direction:)

data/lib/fusuma/plugin/parsers/tap_parser.rb

@@ -98,8 +98,7 @@ module Fusuma
                        1
                      end
           # KEEP
-          when 'LIBINPUT TIMEOUT',   # Timeout Event
-            /\sgesture(| state):\s/  # 1.10.4 prints "gesture state: GESTURE_STATE_.*"
+          when /\sgesture(| state):\s/ # 1.10.4 prints "gesture state: GESTURE_STATE_.*"
             # NOTE: treat the "gesture(| state):" as KEEP
             status = 'keep'
             finger = 0

data/lib/fusuma/plugin/tap/version.rb

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Tap
-      VERSION = '0.3.2'
+      VERSION = '0.4.0.pre'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-tap
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0.pre
 platform: ruby
 authors:
 - iberianpig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.0.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.0.0.pre
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ homepage: https://github.com/iberianpig/fusuma-plugin-tap
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,12 +180,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Tap gesture plugin for Fusuma
 test_files: []