fusuma-plugin-tap 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8d626266cb1c6e86fce7c6e8f70d864dd705750299e0dce5e9c7ea30ddc27d2
-  data.tar.gz: f230dbefeaf8e249b7d05e880f55164841335580ae521f08e482cf0e91d64990
+  metadata.gz: 2bedc73a6f30eada228504ea4b0c09b7c8cfb274a67764f6bcc93df88d63439d
+  data.tar.gz: 9b00f18217502e62dc83776231bf6de7ef5f7705f04178c67f4dd1f569675a77
 SHA512:
-  metadata.gz: cd656a66fcd871a8fcee663df9b37595f5c0f5beae784104e4fc3a3bf75e7d9192bafdda5c6229e94873a8efbec61fde6527426d20b0f93ac4e4691396eb8c9e
-  data.tar.gz: b29ba3b5929c037731d8f759e007436fa8db1f2b83b30e455a0ef8daa7658a8f8b367ac83513b6e20cd647def3257c0ea486e7c4768b11d2ee1f1cc21a80d075
+  metadata.gz: 11ea664f6f1ca08ef08fc0ef759634066a7f813cf5b43502294a034e96349e58fddbce4e223d3ac858c847d9a508a91335b4f262bc25b992e91f3559a9591a82
+  data.tar.gz: a0db20541d07c7542b7c38b8c6f34cd61160dce875dfd103251446dc80cf173fd6fec1e20cc61d476bf912af7b6c2ae024e4e2e761577c1e87165f157c86cc56

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-05-04 22:12:29 +0900 using RuboCop version 0.82.0.
+# on 2020-05-10 21:28:27 +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
@@ -16,7 +16,7 @@ Gemspec/RequiredRubyVersion:
 # Offense count: 5
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
-  Max: 38
+  Max: 40
 
 # Offense count: 1
 # Configuration parameters: CountComments, ExcludedMethods.
@@ -24,17 +24,17 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 33
 
-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 23
+  Max: 24
 
 # Offense count: 5
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 45
 
-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 11

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [v0.2.0](https://github.com/iberianpig/fusuma-plugin-tap/tree/v0.2.0) (2020-05-05)
+
+[Full Changelog](https://github.com/iberianpig/fusuma-plugin-tap/compare/v0.1.3...v0.2.0)
+
+**Merged pull requests:**
+
+- Support libinput v1.15.5 [\#3](https://github.com/iberianpig/fusuma-plugin-tap/pull/3) ([iberianpig](https://github.com/iberianpig))
+
+## [v0.1.3](https://github.com/iberianpig/fusuma-plugin-tap/tree/v0.1.3) (2020-04-20)
+
+[Full Changelog](https://github.com/iberianpig/fusuma-plugin-tap/compare/v0.1.1...v0.1.3)
+
 ## [v0.1.1](https://github.com/iberianpig/fusuma-plugin-tap/tree/v0.1.1) (2020-04-19)
 
 [Full Changelog](https://github.com/iberianpig/fusuma-plugin-tap/compare/v0.1.0...v0.1.1)

data/bin/libinput_debug_events_generator.rb

@@ -12,6 +12,7 @@ class LibinputDebugEventsGenerator
     @gesture_name = Pathname.new(evemu_record).basename
     @list_devices = ENV.fetch('LIBINPUT_LIST_DEVICES', 'libinput list-devices')
     @debug_events = ENV.fetch('LIBINPUT_DEBUG_EVENTS', 'libinput debug-events')
+    @libinput_version = ENV.fetch('LIBINPUT_VERSION', 'libinput list-devices')
   end
 
   def generate_debug_events
@@ -89,7 +90,9 @@ class LibinputDebugEventsGenerator
   end
 
   def version
-    @version ||= `#{@list_devices} --version`.chomp
+    raise 'Make rebuild libinput' unless @libinput_version == `#{@list_devices} --version`.chomp
+
+    @libinput_version
   end
 end
 

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

@@ -22,7 +22,7 @@ module Fusuma
         # @param event [Event]
         # @return [NilClass, TapBuffer]
         def buffer(event)
-          return if event&.tag != source
+          return unless (event&.tag == source) || (event&.tag == 'libinput_gesture_parser')
 
           # NOTE: need to set `begin` event at first of buffer
           clear && return unless bufferable?(event)
@@ -50,12 +50,20 @@ module Fusuma
             else
               false
             end
-          else # 'keep', 'touch', 'hold', 'release'
+          when 'keep', 'touch', 'hold', 'release', 'move'
             if empty?
               false
             else
               true
             end
+          when 'update' # libinput_gesture_parser
+            if empty?
+              false
+            else
+              true
+            end
+          else
+            raise "Unexpected status: #{event.record.status}"
           end
         end
 

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

@@ -12,17 +12,16 @@ module Fusuma
 
         BASE_INTERVAL = 0.5
         BASE_HOLDING_TIME = 0.1
-        BASE_TAP_TIME = 1
+        BASE_TAP_TIME = 0.4
 
         # @param buffers [Array<Buffer>]
         # @return [Event] if event is detected
         # @return [NilClass] if event is NOT detected
         def detect(buffers)
           buffer = buffers.find { |b| b.type == BUFFER_TYPE }
+          gesture_buffer = buffers.find { |b| b.type == 'gesture' }
 
-          return if buffer.empty?
-
-          finger = buffer.finger
+          return if buffer.empty? || !gesture_buffer.empty? || moved?(buffer)
 
           holding_time = buffer.events.last.time - buffer.events.first.time
 
@@ -34,6 +33,8 @@ module Fusuma
 
           return if direction.nil?
 
+          finger = buffer.finger
+
           buffer.clear
 
           index = create_index(finger: finger, direction: direction)
@@ -53,21 +54,29 @@ module Fusuma
           )
         end
 
+        # @return [TrueClass, FalseClass]
         def hold?(buffer, holding_time)
-          return false if holding_time < 1
+          return false if holding_time < 0.7
 
           return true if buffer.finger == 4
 
           true if buffer.events.any? { |e| e.record.status == 'hold' }
         end
 
+        # @return [TrueClass, FalseClass]
         def tap?(buffer, holding_time)
           return false if holding_time > 0.15
 
-          tap_released?(buffer)
+          released_all?(buffer)
+        end
+
+        # @return [TrueClass, FalseClass]
+        def moved?(buffer)
+          buffer.events.any? { |e| e.record.status == 'move' }
         end
 
-        def tap_released?(buffer)
+        # @return [TrueClass, FalseClass]
+        def released_all?(buffer)
           touch_num = buffer.events.count { |e| (e.record.status =~ /begin|touch/) }
           release_num = buffer.events.count { |e| e.record.status =~ /release|end/ }
           MultiLogger.debug(touch_num: touch_num, release_num: release_num)

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

@@ -94,11 +94,17 @@ module Fusuma
                        1
                      end
           # KEEP
-          when /\sgesture(| state):\s/, 'LIBINPUT TIMEOUT'
+          when 'LIBINPUT TIMEOUT',   # Timeout Event
+            /\sgesture(| state):\s/  # 1.10.4 prints "gesture state: GESTURE_STATE_.*"
             # NOTE: treat the "gesture(| state):" as KEEP
             status = 'keep'
             finger = 0
 
+          # MOVE
+          when /\sPOINTER_AXIS\s/, /\sPOINTER_MOTION\s/, /\sTAP_EVENT_PALM\s/
+            status = 'move'
+            finger = 0
+
           # RELEASE
           when /\stap(?:| state):\s.*(#{(STATE[:touches] | STATE[:holds]).join('|')}) → TAP_EVENT_RELEASE → (#{STATE[:releases].join('|')})/
 
@@ -122,8 +128,8 @@ module Fusuma
 
             matched = Regexp.last_match
             finger = case matched[1]
-                     when 'TAP_STATE_DEAD'
-                       4
+                     when 'TAP_STATE_DEAD' # NOTE: 2 finger hold -> scroll become  TAP_STATE_DEAD
+                       0
                      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.2.0'
+      VERSION = '0.3.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-tap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma