fusuma-plugin-remap 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13ff7a06cbeae8f56ebc57ffbc347fe6adf2d7dba7b9fab4977047be9786aebc
-  data.tar.gz: 80a99b69509058b34c58fcea076be99b881a008193bbfb7065134c2d4f75291b
+  metadata.gz: b55e5ef616cbf48bc0a8c3a4c0b9b91dbed01c3b4dc87f53f09fa51ab6c34227
+  data.tar.gz: 1e34c8882e52d3191092576ab5d056d74c1ea0d130963a37304ce2a8bc6b0fdf
 SHA512:
-  metadata.gz: ed14e66220bb7a483c666f777f2a17cbdd2d0be0ca8b0659f28ca2259d310ac7601f3280f2601ffc4fb809e87d7b37875c352e8cf01d92587e23123fe79f0be6
-  data.tar.gz: 97faa8067e4a49ba9821298a2347d2e3b6ce18a0137f2af1a718ea1a2d5e543a0bb089e081b6544d9375977f498079547d9f657c089730753cf58874a587c808
+  metadata.gz: bb30877c6629814e6aff80127aa63045e4901d416a568d1a6f0e7f268254509903df5df8d90382a7d739ea3b2a6b666a461f57d9af0ce00941152d2296953efd
+  data.tar.gz: f11178d8bf7c553a1568b67e1a62b4cb747d51c0b67008330b98b17228b82a5d41cecd5b4de2f259d2d572f539e4f55daaa75f79fdd7c3a2608ac4013a2473f7

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "../remap/touchpad_remapper"
-# require_relative "../remap/layer_manager"
 
 module Fusuma
   module Plugin
@@ -35,22 +34,7 @@ module Fusuma
 
           gesture = "touch"
           finger = data["finger"]
-
-          # @touch_state ||= {}
-          # @mt_slot ||= 0
-          # @touch_state[@mt_slot] ||= {
-          #   MT_TRACKING_ID: nil,
-          #   X: nil,
-          #   Y: nil,
-          #   valid_touch_point: false
-          # }
-          # TODO: implement update touch_state
-          status =
-            if data["touch_state"].any? { |_, v| v["valid_touch_point"] }
-              "begin"
-            else
-              "end"
-            end
+          status = data["status"]
 
           Events::Records::GestureRecord.new(gesture: gesture, status: status, finger: finger, delta: nil)
         rescue EOFError => e

data/lib/fusuma/plugin/remap/touchpad_remapper.rb

@@ -18,7 +18,6 @@ module Fusuma
           @source_touchpads = source_touchpads # original touchpad
           @fusuma_writer = fusuma_writer # write event to fusuma_input
 
-          # FIXME: PalmDetection should be initialized with each touchpad
           @palm_detectors = @source_touchpads.each_with_object({}) do |source_touchpad, palm_detectors|
             palm_detectors[source_touchpad] = PalmDetection.new(source_touchpad)
           end
@@ -34,6 +33,9 @@ module Fusuma
           touch_state = {}
           mt_slot = 0
           finger_state = nil
+
+          prev_valid_touch = false
+          prev_status = nil
           loop do
             ios = IO.select(@source_touchpads.map(&:file)) # , @layer_manager.reader])
             io = ios&.first&.first
@@ -131,10 +133,29 @@ module Fusuma
             end
 
             if syn_report
+              # Whether any slot is valid (touching)
+              valid_touch = touch_state.any? { |_, st| st[:valid_touch_point] }
+
+              status =
+                if valid_touch
+                  prev_valid_touch ? "update" : "begin"
+                else
+                  prev_valid_touch ? "end" : "cancelled"
+                end
+
+              if status == prev_status
+                next
+              end
+
               # TODO: define format as fusuma_input
               # TODO: Add data to identify multiple touchpads
-              data = {finger: finger_state, touch_state: touch_state}
+              data = {
+                finger: finger_state,
+                status: status
+              }
               @fusuma_writer.write(data.to_msgpack)
+              prev_status = status
+              prev_valid_touch = valid_touch
             end
           end
         rescue => e

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Remap
-      VERSION = "0.10.0"
+      VERSION = "0.11.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-remap
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - iberianpig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-11 00:00:00.000000000 Z
+date: 2025-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma