fusuma-plugin-tap 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e02d886ca531aba36e5b71ed134b76062a72430a17a21f7a0a5a5941652c657f
-  data.tar.gz: 8107fa9c300cd78028589198fe64ee4897bf5abbf3dc1621779102d0a3d66c58
+  metadata.gz: b8d626266cb1c6e86fce7c6e8f70d864dd705750299e0dce5e9c7ea30ddc27d2
+  data.tar.gz: f230dbefeaf8e249b7d05e880f55164841335580ae521f08e482cf0e91d64990
 SHA512:
-  metadata.gz: 45f9c11102b3b6e530c647c9b8c7c9f10e5ea9820f5742cb858ea2dd2a014e5fbcb0b0ba37821d6c88268111c548a0276b0319a004ccd8ffeb64ca4e9eb31b3e
-  data.tar.gz: 904e5c91e57005cf20000986621979b2da18abf171161b6b831a7ffb8432d4bed6e408352655107c9c8667ddc7aea9c5d545e48a147b900775325d3a3be361df
+  metadata.gz: cd656a66fcd871a8fcee663df9b37595f5c0f5beae784104e4fc3a3bf75e7d9192bafdda5c6229e94873a8efbec61fde6527426d20b0f93ac4e4691396eb8c9e
+  data.tar.gz: b29ba3b5929c037731d8f759e007436fa8db1f2b83b30e455a0ef8daa7658a8f8b367ac83513b6e20cd647def3257c0ea486e7c4768b11d2ee1f1cc21a80d075

data/.rubocop_todo.yml

@@ -1,19 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-04-20 01:40:44 +0900 using RuboCop version 0.82.0.
+# on 2020-05-04 22:12:29 +0900 using RuboCop version 0.82.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
-# Include: **/*.gemspec
-Gemspec/OrderedDependencies:
-  Exclude:
-    - 'fusuma-plugin-tap.gemspec'
-
 # Offense count: 1
 # Configuration parameters: Include.
 # Include: **/*.gemspec
@@ -35,7 +27,7 @@ Metrics/BlockLength:
 # Offense count: 1
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 22
+  Max: 23
 
 # Offense count: 5
 # Configuration parameters: CountComments, ExcludedMethods.
@@ -45,7 +37,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 10
+  Max: 11
 
 # Offense count: 1
 Style/Documentation:
@@ -53,3 +45,12 @@ Style/Documentation:
     - 'spec/**/*'
     - 'test/**/*'
     - 'bin/evemu_recorder.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/fusuma/plugin/detectors/tap_detector.rb'

data/.travis.yml

@@ -5,8 +5,9 @@ cache: bundler
 
 env:
   matrix:
-    - SPEC_LIBINPUT_VERSION=1.10.4
-    - SPEC_LIBINPUT_VERSION=1.14.1
+    - LIBINPUT_VERSION=1.10.4
+    - LIBINPUT_VERSION=1.14.1
+    - LIBINPUT_VERSION=1.15.5
 
 cache:
   directories:
@@ -17,5 +18,6 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
 
 before_install: gem install bundler --no-document -v 2.0.1

data/Makefile

@@ -0,0 +1,14 @@
+.PHONY: all test clean
+
+all: help
+
+build: ## build libinput with LIBINPUT_VERSION
+	cd $(LIBINPUT_SOURCE_DIR) && \
+		git checkout $(LIBINPUT_VERSION) && \
+		meson --prefix=/usr builddir/ -Dlibwacom=false -Ddebug-gui=false -Dtests=false -Ddocumentation=false --reconfigure && \
+		ninja -C builddir/
+	$(LIBINPUT_LIST_DEVICES) --version
+
+help: ## show help
+	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | uniq | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$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.5'
+  spec.add_dependency 'fusuma', '~> 1.10'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.14'

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

@@ -14,6 +14,11 @@ module Fusuma
           }
         end
 
+        # clear old events
+        def clear_expired(*)
+          clear if @events.any? { |e| ended?(e) }
+        end
+
         # @param event [Event]
         # @return [NilClass, TapBuffer]
         def buffer(event)
@@ -38,14 +43,14 @@ module Fusuma
         def bufferable?(event)
           case event.record.status
           when 'end'
-            false
+            true
           when 'begin'
             if empty?
               true
             else
               false
             end
-          else
+          else # 'keep', 'touch', 'hold', 'release'
             if empty?
               false
             else

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

@@ -69,7 +69,7 @@ module Fusuma
 
         def tap_released?(buffer)
           touch_num = buffer.events.count { |e| (e.record.status =~ /begin|touch/) }
-          release_num = buffer.events.count { |e| e.record.status == 'release' }
+          release_num = buffer.events.count { |e| e.record.status =~ /release|end/ }
           MultiLogger.debug(touch_num: touch_num, release_num: release_num)
 
           case buffer.finger
@@ -80,7 +80,7 @@ module Fusuma
           when 3
             touch_num == release_num + 1
           when 4
-            touch_num == release_num + 1
+            touch_num > 0 && release_num > 0
           else
             false
           end

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

@@ -54,13 +54,14 @@ module Fusuma
           gesture = 'tap'
 
           case record.to_s
-            # BEGIN
+
+          # BEGIN
           when /\stap(?:| state):\s.*TAP_STATE_IDLE → TAP_EVENT_TOUCH → TAP_STATE_TOUCH/
             status = 'begin'
             finger = 1
 
-            # TOUCH
-          when /\stap(?:| state):\s.*(#{STATE[:touches].join('|')}) → TAP_EVENT_TOUCH → (#{STATE[:touches].join('|')})/
+          # TOUCH
+          when /\stap(?:| state):\s.*(#{STATE[:touches].join('|')}) → TAP_EVENT_(?:TOUCH|MOTION) → (#{STATE[:touches].join('|')})/
 
             status = 'touch'
 
@@ -93,7 +94,7 @@ module Fusuma
                        1
                      end
           # KEEP
-          when /\sgesture(| state):\s/
+          when /\sgesture(| state):\s/, 'LIBINPUT TIMEOUT'
             # NOTE: treat the "gesture(| state):" as KEEP
             status = 'keep'
             finger = 0
@@ -121,6 +122,8 @@ module Fusuma
 
             matched = Regexp.last_match
             finger = case matched[1]
+                     when 'TAP_STATE_DEAD'
+                       4
                      when 'TAP_STATE_TOUCH_3', 'TAP_STATE_TOUCH_3_HOLD'
                        3
                      when 'TAP_STATE_TOUCH_2', 'TAP_STATE_TOUCH_2_HOLD', 'TAP_STATE_TOUCH_2_RELEASE'

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Tap
-      VERSION = '0.1.3'
+      VERSION = '0.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-tap
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,7 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - bin/console