fusuma 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8ebe6dea94f392eb2972323029d8f32ab58735020f0f5af4e70a52f3d80eb13
-  data.tar.gz: 12e77d944ef40cd9daf3c05d8f9b2de2538dd031ef0095395904f9fb4dacc238
+  metadata.gz: ea61b72e99beea075544c95d3a3307161d471feb2849d27eda02f469a0597afb
+  data.tar.gz: cccc575de906c854c49655c80848e97c4f5be4bc6e8f48645f30f5277ea25f5a
 SHA512:
-  metadata.gz: ccc8856c22dfe28666edf5163913250058b3859925b1eae7e38187663dcdb99c27b24690620a0518192c7342da664683f4821d9b691e1929d1c3472d5e208699
-  data.tar.gz: c88048e832b387171cc3ef49f015564f8b1bfc19058eaa8e9bf54e4b79a90199c0652df7c4936b3a01eea363cb26718fbb6fc839700ef10d7c407835010a2642
+  metadata.gz: cad08188f1318b0e6ccfb2630ff6d2a8960289f084d3390e2870d97ed0743d4868dd0ed4218238be1b73048f7bcd841fdb50c74ed3306ff4a56773261032e14d
+  data.tar.gz: 77c81733d411db62f3eeb55a87f55ba25cacc9e2dba495fd0026b5cae2e0f095c447458a6506f4cf81efec71dcbe4caab4b461bbc17e78c9467d344a5c3b2112

data/lib/fusuma/libinput_command.rb

@@ -20,6 +20,11 @@ module Fusuma
       Gem::Version.new(version) >= Gem::Version.new(NEW_CLI_OPTION_VERSION)
     end
 
+    # @return [Boolean]
+    def libinput_1_27_0_or_later?
+      Gem::Version.new(version) >= Gem::Version.new("1.27.0")
+    end
+
     # @return [String]
     def version
       # version_command prints "1.6.3\n"

data/lib/fusuma/plugin/base.rb

@@ -53,9 +53,8 @@ module Fusuma
 
             next if param_types.any? { |klass| val.is_a?(klass) }
 
-            MultiLogger.error("Please fix config.yml.")
-            MultiLogger.error(":#{config_index.keys.map(&:symbol)
-            .join(" => :")} => :#{key} should be #{param_types.join(" OR ")}.")
+            MultiLogger.error("Please fix config.yml")
+            MultiLogger.error("`#{config_index.keys.join(".")}.#{key}` should be #{param_types.join(" OR ")}.")
             exit 1
           end
       end

data/lib/fusuma/plugin/manager.rb

@@ -40,6 +40,7 @@ module Fusuma
             plugin_gemspec = Gem::Specification.load(plugin_gemspec_path)
             fusuma_gemspec_path = File.expand_path("../../../fusuma.gemspec", __dir__)
             fusuma_gemspec = Gem::Specification.load(fusuma_gemspec_path)
+            next if plugin_gemspec == fusuma_gemspec
 
             if plugin_gemspec.dependencies.find { |d| d.name == "fusuma" }&.match?(fusuma_gemspec)
               siblings_plugin

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

@@ -2,6 +2,7 @@
 
 require_relative "../events/records/record"
 require_relative "../events/records/gesture_record"
+require_relative "../../libinput_command"
 
 module Fusuma
   module Plugin
@@ -29,6 +30,20 @@ module Fusuma
         private
 
         def parse_libinput(line)
+          if libinput_1_27_0_or_later?
+            parse_line_1_27_0_or_later(line)
+          else
+            parse_line(line)
+          end
+        end
+
+        def libinput_1_27_0_or_later?
+          return @libinput_1_27_0_or_later if defined?(@libinput_1_27_0_or_later)
+
+          @libinput_1_27_0_or_later = Inputs::LibinputCommandInput.new.command.libinput_1_27_0_or_later?
+        end
+
+        def parse_line(line)
           _device, event_name, _time, other = line.strip.split(nil, 4)
           finger, other = other.split(nil, 2)
 
@@ -39,6 +54,22 @@ module Fusuma
           [gesture, status, finger, delta]
         end
 
+        def parse_line_1_27_0_or_later(line)
+          _device, event_name, other = line.strip.split(nil, 3)
+
+          if other[0] != "+"
+            _seq, other = other.split(nil, 2)
+          end
+
+          _time, finger, other = other.split(nil, 3)
+
+          gesture, status = *detect_gesture(event_name)
+
+          status = "cancelled" if gesture == "hold" && status == "end" && other == "cancelled"
+          delta = parse_delta(other)
+          [gesture, status, finger, delta]
+        end
+
         def detect_gesture(event_name)
           event_name =~ /GESTURE_(SWIPE|PINCH|HOLD)_(BEGIN|UPDATE|END)/
           gesture = Regexp.last_match(1).downcase

data/lib/fusuma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fusuma
-  VERSION = "3.6.1"
+  VERSION = "3.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2024-11-24 00:00:00.000000000 Z
 dependencies: []
 description: Fusuma is multitouch gesture recognizer. This gem makes your touchpad
   on Linux able to recognize swipes or pinchs and assign command to them. Read installation