fusuma-plugin-remap 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2455d59dcc7050237331988d27f8def95586791fd1f86974146ceb7a373ff35
-  data.tar.gz: c39286dafd8112602c61953512d16f85f0e3b51c318e215431d5539efd33eadd
+  metadata.gz: bf0c73f3292a88f1488fc06d1c45c5bca19250df7e257063dcc78dbd74a78fb6
+  data.tar.gz: a78d663ef4cf53629c6b0d9dec965b1494e782814691564f5ce917bb02262e6e
 SHA512:
-  metadata.gz: a40ff642c159e4f7a8f627929c01f99e44e666c0de24f5c977fff7c2967a37fce1693152053d6477edc9f4c87e7691b4b987ca7bd0fdbade5029d40f12d6e1a5
-  data.tar.gz: efb92a3fb8c1d67b93e811ad631d0437e5f0a2000035a2c2637ae942d25072869efb7c88a00478dfb6606239a3283f86bf6fc4ab970feeb6c295c1ed99f70d5f
+  metadata.gz: 9c79bdd354f1188569afd8fe45d7b4e42b5d2463307c8ef26ed74191113d8b38a639ab7c846223a6d30821cc012bb82a1a3b17eeb5d61e8198eb8abe76b785c4
+  data.tar.gz: 3c915a96eb1f285c294e368f25390864534c3ed0ba792a42722083f9796cb3717042e45a8adea477363aa805e38a66996c49820f5aa88636659e72cf6a6485ba

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

@@ -18,8 +18,6 @@ module Fusuma
           }
         end
 
-        attr_reader :pid
-
         def initialize
           super
           setup_remapper
@@ -49,6 +47,7 @@ module Fusuma
 
         def setup_remapper
           config = {
+
             keyboard_name_patterns: config_params(:keyboard_name_patterns),
             touchpad_name_patterns: config_params(:touchpad_name_patterns)
           }
@@ -58,7 +57,7 @@ module Fusuma
           # physical keyboard input event
           @fusuma_reader, fusuma_writer = IO.pipe
 
-          @pid = fork do
+          fork do
             layer_manager.writer.close
             @fusuma_reader.close
             remapper = Remap::KeyboardRemapper.new(

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

@@ -17,8 +17,6 @@ module Fusuma
           }
         end
 
-        attr_reader :pid
-
         def initialize
           super
           setup_remapper
@@ -79,7 +77,7 @@ module Fusuma
           # physical touchpad input event
           @fusuma_reader, fusuma_writer = IO.pipe
 
-          @pid = fork do
+          fork do
             # layer_manager.writer.close
             @fusuma_reader.close
             remapper = Remap::TouchpadRemapper.new(

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

@@ -92,7 +92,7 @@ module Fusuma
         rescue EOFError => e # device is closed
           MultiLogger.error "Device is closed: #{e.message}"
         ensure
-          @destroy.call
+          @destroy&.call
         end
 
         private

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

@@ -18,6 +18,8 @@ module Fusuma
           @source_touchpad = source_touchpad # original touchpad
           @fusuma_writer = fusuma_writer # write event to fusuma_input
           @palm_detector ||= PalmDetection.new(source_touchpad)
+
+          set_trap
         end
 
         # TODO: grab touchpad events and remap them
@@ -125,6 +127,10 @@ module Fusuma
               @fusuma_writer.write(data.to_msgpack)
             end
           end
+        rescue => e
+          MultiLogger.error "An error occurred: #{e.message}"
+        ensure
+          @destroy&.call
         end
 
         private
@@ -134,11 +140,24 @@ module Fusuma
         end
 
         def create_virtual_touchpad
-          MultiLogger.info "Create virtual keyboard: #{VIRTUAL_TOUCHPAD_NAME}"
-
+          MultiLogger.info "Create virtual touchpad: #{VIRTUAL_TOUCHPAD_NAME}"
           uinput.create_from_device(name: VIRTUAL_TOUCHPAD_NAME, device: @source_touchpad)
         end
 
+        def set_trap
+          @destroy = lambda do
+            begin
+              uinput.destroy
+            rescue IOError
+              # already destroyed
+            end
+            exit 0
+          end
+
+          Signal.trap(:INT) { @destroy.call }
+          Signal.trap(:TERM) { @destroy.call }
+        end
+
         # Detect palm touch
         class PalmDetection
           def initialize(touchpad)

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Remap
-      VERSION = "0.4.1"
+      VERSION = "0.5.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-remap
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-07 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma