fusuma-plugin-thumbsense 0.1.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d0537256a434caffdd6352ed5fc05c87b2cd42390cda27a99fd82a70333b0ce
-  data.tar.gz: fe06a449472593962f48a12b90fd924ff8237ce2d941baea2c860109fb00f61c
+  metadata.gz: 5494b5713dbb7f0c3662a93c3a966654088ab3f0f18995d3d8800636b5c047ef
+  data.tar.gz: ddd397cc8989c331a6ed9be6f362d775ef7ef93647567902cb85a96e28013a68
 SHA512:
-  metadata.gz: a064ff6b695e31fc3a659e2df78cae7e5f662a45db76a99f165a04675e1773bd6d1feada686bfad5563ce44fb06bbf56f255d65c6ad76133df14366f651c349f
-  data.tar.gz: '08f214210a1b45169dacca331ce07f3a2c480346b90fd71c89438b4cbac68f94330ae461f59fc4f8e58b8f7bce46a1dcf6d597b077bf385978f64594ce03b1b4'
+  metadata.gz: 5c36d63723ec56dc2ab0f17a7f8d7de68a56e5956215a9abd5b04f2213589bd1df47c659de0a9067523fd744192540eb663653059479e44d6f92208fab795e46
+  data.tar.gz: 12d14e2f883e3d8e3bf824388ba494a0527f0076b38040abea187aa6883cbc9d219d9cdbcb251c59a77dbf13d439ee6d87a72ed2db9f4e794a1e88e90e9d3e1c

data/README.md

@@ -1,4 +1,4 @@
-# Fusuma::Plugin::Thumbsense [![Gem Version](https://badge.fury.io/rb/fusuma-plugin-thumbsense.svg)](https://badge.fury.io/rb/fusuma-plugin-thumbsense) [![Build Status](https://github.com/iberianpig/fusuma-plugin-thumbsense/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/iberianpig/fusuma-plugin-thumbsense/actions/workflows/ubuntu.yml)
+# Fusuma::Plugin::Thumbsense [![Gem Version](https://badge.fury.io/rb/fusuma-plugin-thumbsense.svg)](https://badge.fury.io/rb/fusuma-plugin-thumbsense) [![Build Status](https://github.com/iberianpig/fusuma-plugin-thumbsense/actions/workflows/main.yml/badge.svg)](https://github.com/iberianpig/fusuma-plugin-thumbsense/actions/workflows/main.yml)
 
 **THIS PLUGIN IS EXPERIMENTAL.**
 

data/fusuma-plugin-thumbsense.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   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
-  spec.add_dependency "fusuma", "~> 2.0"
+  spec.add_dependency "fusuma", ">= 2.0"
   spec.add_dependency "fusuma-plugin-keypress", ">= 0.5"
   spec.add_dependency "fusuma-plugin-remap"
   spec.metadata = {

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

@@ -10,7 +10,7 @@ module Fusuma
     module Detectors
       # Detect Thumbsense context and change remap layer of fusuma-plugin-remap
       class ThumbsenseDetector < Detector
-        SOURCES = %w[thumbsense gesture keypress].freeze
+        SOURCES = %w[thumbsense keypress].freeze
         BUFFER_TYPE = "thumbsense"
 
         MODIFIER_KEYS = Set.new(%w[
@@ -25,8 +25,11 @@ module Fusuma
           RIGHTMETA
         ])
 
+        LAYER_CONTEXT = {thumbsense: true}.freeze
+
+        # Detect Context event and change remap layer of fusuma-plugin-remap
         # @param buffers [Array<Buffer>]
-        # @return [Event] if event is detected
+        # @return [Event] if Thumbsense context is detected
         # @return [NilClass] if event is NOT detected
         def detect(buffers)
           thumbsense_buffer = buffers.find { |b| b.type == BUFFER_TYPE }
@@ -36,57 +39,38 @@ module Fusuma
           MultiLogger.debug("thumbsense_buffer: #{thumbsense_buffer.events.map(&:record).map { |r| "#{r.finger} #{r.gesture} #{r.status}" }}")
 
           layer_manager = Fusuma::Plugin::Remap::LayerManager.instance
-          layer = {thumbsense: true}
 
           if touch_released?(thumbsense_buffer)
-            layer_manager.send_layer(layer: layer, remove: true)
+            layer_manager.send_layer(layer: LAYER_CONTEXT, remove: true)
             return
           end
 
           keypress_buffer = buffers.find { |b| b.type == "keypress" }
+
+          # If only modifier keys are pressed or no key is pressed
           if pressed_codes(keypress_buffer).all? { |code| MODIFIER_KEYS.include?(code) }
 
             # Even if the palm is detected, keep the thumbsense layer until `:end` event
             if palm_detected?(thumbsense_buffer)
-              hold_events = fetch_hold_events(buffers)
-              MultiLogger.debug "hold_events: #{hold_events.map(&:record).map { |r| "#{r.finger} #{r.gesture} #{r.status}" }}"
-              if hold_events.empty? || hold_events.last.record.status != "begin"
-                layer_manager.send_layer(layer: layer, remove: true)
-                return
-              end
+              layer_manager.send_layer(layer: LAYER_CONTEXT, remove: true)
+              return
             end
 
-            layer_manager.send_layer(layer: layer)
-            # FIXME: create thumbsense context
-            # record = Events::Records::ContextRecord.new(
-            #   name: "thumbsense",
-            #   value: true
-            # )
-            # return create_event(record: record)
-          end
-          nil
-        end
+            layer_manager.send_layer(layer: LAYER_CONTEXT)
 
-        # Change remap layer of fusuma-plugin-remap
-        # @param context [Hash]
-        def add_layer
-          Fusuma::Plugin::Remap::Layer.add({thumbsense: true})
-        end
+            # create thumbsense context
+            record = Events::Records::ContextRecord.new(
+              name: :thumbsense,
+              value: true
+            )
+            return create_event(record: record)
+          end
 
-        # Remove remap layer of fusuma-plugin-remap
-        # @param context [Hash]
-        def remove_layer
-          Fusuma::Plugin::Remap::Layer.remove({thumbsense: true})
+          nil
         end
 
         private
 
-        def fetch_hold_events(buffers)
-          buffers.find { |b| b.type == "gesture" }
-            .select_from_last_begin
-            .select_by_events { |e| e.record.gesture == "hold" }.events
-        end
-
         def pressed_codes(keypress_buffer)
           records = keypress_buffer.events.map(&:record)
           codes = []
@@ -113,15 +97,32 @@ module Fusuma
           touch_num <= release_num
         end
 
+        # Detect palm, except when there is another touch
+        # @param thumbsense_buffer [Buffer]
+        # @return [TrueClass, FalseClass]
         def palm_detected?(thumbsense_buffer)
-          thumbsense_buffer.events.any? { |e| (e.record.status == "palm") }
-        end
-
-        def palm_count(thumbsense_buffer)
-          thumbsense_buffer.events.count { |e| (e.record.status == "palm") }
-        end
-
-        def thumbsense_keys
+          # finger is a number to distinguish different touches and palms
+          # If the count remains, it is judged as a touch state
+          touch_state_per_finger = {}
+          thumbsense_buffer.events.each do |e|
+            f = e.record.finger
+            touch_state_per_finger[f] ||= 0
+
+            case e.record.status
+            when "begin"
+              touch_state_per_finger[f] += 1
+            when "palm"
+              if touch_state_per_finger[f] < 0
+                # NOTE: If Palm continues, it is equivalent to end
+                touch_state_per_finger[f] = 0
+              else
+                touch_state_per_finger[f] -= 1
+              end
+            when "end"
+              touch_state_per_finger[f] = 0
+            end
+          end
+          touch_state_per_finger.values.all?(&:zero?)
         end
       end
     end

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Thumbsense
-      VERSION = "0.1.5"
+      VERSION = "0.3.0"
     end
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-thumbsense
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.3.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency