fusuma-plugin-thumbsense 0.9.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a991e73e2eace58e3f6732a6a0f39b12b9e968550c613977eeba03ec650dadda
-  data.tar.gz: 8735f0050e321d7171558df00925b94f39ea307e6914f350fdcf69ed805002bc
+  metadata.gz: 04f4cb11433bf62016e1a4b8155c9a9e0526796599367280705eac2a47446735
+  data.tar.gz: fe2486a552f788a3d333e3e9b46dfb4d2ea6e8ee0d20d4228713deec05b943e1
 SHA512:
-  metadata.gz: 104fcb225426e2c0310a33277ab82e9a174bfa38dd3212d3b9294f72561b48b8a9ec73860478bc9ab16f53deb6a1272c8d21ca0221c71fe797e571786f6983a8
-  data.tar.gz: d5bf0fba767a5a1d1952cd2fd7f2fd4b9f033ac3c89b76dbfdc31ad5235a5ad0b3727e04437ddd5367eac27ccc256661959859cbd816708ab841588a4a61c524
+  metadata.gz: efa45c56517dce953e877b77808b10ce9d7ab1824fa91a616b961306997c9499dfc771b4ce4d4516730cdbc1481dcdae09b4ce3fce8997844a50e3ed4cf79a9e
+  data.tar.gz: 3e4c3f38c2bf24b9ffb31b407760f50b8aecc3b982ad35540ec80d73acf01faeb3d3d12e85239c78f7ed8f65c93930a372abf941344c56b6d3c006d31184c622

data/fusuma-plugin-thumbsense.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   # support focal (20.04LTS) 2.7
   spec.add_dependency "fusuma", ">= 3.2"
   spec.add_dependency "fusuma-plugin-keypress", ">= 0.11"
-  spec.add_dependency "fusuma-plugin-remap", ">= 0.4"
+  spec.add_dependency "fusuma-plugin-remap", ">= 0.11.0"
   spec.metadata = {
     "rubygems_mfa_required" => "true"
   }

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

@@ -18,10 +18,7 @@ module Fusuma
         def clear_expired(*)
           return if @events.empty?
 
-          # skip palm/begin record
-          return if !ended?(@events.last)
-
-          clear
+          clear if ended? || cancelled?
         end
 
         # @param event [Event]
@@ -39,12 +36,16 @@ module Fusuma
           @events.map { |e| e.record.finger }.max
         end
 
-        def ended?(event)
-          event.record.status == "end"
+        def ended?
+          @events.last.record.status == "end"
+        end
+
+        def cancelled?
+          @events.last.record.status == "cancelled"
         end
 
-        def begin?(event)
-          event.record.status == "begin"
+        def begin?
+          @events.last.record.status == "begin"
         end
       end
     end

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

@@ -43,22 +43,22 @@ module Fusuma
           # touch is released   => remove thumbsense context
           # keypress -> touch   => remove thumbsense context
           if touch_released? && !thumbsense_layer?
-            MultiLogger.debug("thumbsense layer removed")
             layer_manager.send_layer(layer: LAYER_CONTEXT, remove: true)
             return
           end
 
+          before_tap, after_tap = partition_keypress_with_first_tap
+
           # When keypress event is first:
           # If current layer is thumbsense, the layer should not be changed
           # If current layer is not thumbsense, it should remain a normal key
           # In other words, if the key event comes first, do nothing
-          if keypress_first?
+          if keypress_first?(before_tap)
             MultiLogger.debug("keypress event is first")
 
             return
           end
 
-          MultiLogger.debug("thumbsense context created") unless thumbsense_layer?
           layer_manager.send_layer(layer: LAYER_CONTEXT)
 
           # create thumbsense context
@@ -69,9 +69,11 @@ module Fusuma
             )
           )
 
+          keys = pressed_codes(@keypress_buffer.events.map(&:record))
+
           # TODO: Threshold
           # create remap index
-          index = if (keys = pressed_codes) && !keys.empty?
+          index = if !pressed_codes(after_tap).empty?
             MultiLogger.debug("thumbsense remap index created: #{keys}")
             combined_keys = keys.join("+")
             create_event(
@@ -94,8 +96,7 @@ module Fusuma
         end
 
         # @return [Array<String>]
-        def pressed_codes
-          records = @keypress_buffer.events.map(&:record)
+        def pressed_codes(records)
           codes = []
           records.each do |r|
             if r.status == "pressed"
@@ -111,7 +112,7 @@ module Fusuma
         def touch_released?
           return true if @thumbsense_buffer.empty?
 
-          @thumbsense_buffer.events.map(&:record).last&.status == "end"
+          @thumbsense_buffer.ended? || @thumbsense_buffer.cancelled?
         end
 
         # @return [TrueClass, FalseClass]
@@ -133,15 +134,33 @@ module Fusuma
         # @param thumbsense_buffer [Buffer]
         # @return [TrueClass] if keypress event is first
         # @return [FalseClass] if keypress event is NOT first or buffers are empty
-        def keypress_first?
-          return false if @thumbsense_buffer.empty? || @keypress_buffer.empty?
+        def keypress_first?(keypress_records)
+          return false if @thumbsense_buffer.empty? || keypress_records.empty?
 
-          if (keys = pressed_codes) && !keys.empty?
+          if (keys = pressed_codes(keypress_records)) && !keys.empty?
             return false if MODIFIER_KEYS.include?(keys.first)
           end
 
           @keypress_buffer.events.first.time < @thumbsense_buffer.events.first.time
         end
+
+        def partition_keypress_with_first_tap
+          return [], [] if @thumbsense_buffer.empty?
+
+          first_tap_time = @thumbsense_buffer.events.first.time
+
+          before_tap = []
+          after_tap = []
+
+          @keypress_buffer.events.each do |event|
+            if event.time < first_tap_time
+              before_tap << event.record
+            else
+              after_tap << event.record
+            end
+          end
+          [before_tap, after_tap]
+        end
       end
     end
   end

data/lib/fusuma/plugin/inputs/pointing_stick_input.rb

@@ -35,12 +35,16 @@ module Fusuma
         end
 
         def process_device_events(writer)
+          # If device_name_pattern is not set, this plugin is not used, so block the thread.
+          sleep if @device_name_pattern.nil?
+
           hidraw_device = find_hidraw_device(@device_name_pattern, wait: 3)
           hidraw_parser = select_hidraw_parser(hidraw_device.bustype)
 
           mouse_state = nil
 
           hidraw_parser.new(hidraw_device).parse do |new_state|
+            # Write state to pipe only when it changes
             next if mouse_state == new_state
 
             mouse_state = new_state

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Thumbsense
-      VERSION = "0.9.0"
+      VERSION = "0.12.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-thumbsense
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.12.0
 platform: ruby
 authors:
 - iberianpig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-14 00:00:00.000000000 Z
+date: 2025-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.11.0
 description: fusuma-plugin-thumbsense is Fusuma plugin for thumbsense.
 email:
 - yhkyky@gmail.com
@@ -79,7 +79,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.19
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Thumbsense plugin for Fusuma
 test_files: []