fusuma-plugin-remap 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec502b65cb84aeaf03d897edfcbab0374570ccbd442b7707b6c9ace75b9fd9b
-  data.tar.gz: 72ba8b3567fd3cd6ced5557bbb2e61a71f688485283561dd8a080a493eeb5e53
+  metadata.gz: bf0c73f3292a88f1488fc06d1c45c5bca19250df7e257063dcc78dbd74a78fb6
+  data.tar.gz: a78d663ef4cf53629c6b0d9dec965b1494e782814691564f5ce917bb02262e6e
 SHA512:
-  metadata.gz: '0787b15d69a53a2e1404ce927e630d900d34be8f33f94b18f85ad3198a437229cd06ac33c43d1826f1cc2a1c5a2c1b516c511a93c7356cbb40a8e78bb3b13357'
-  data.tar.gz: 7c8e9cf9b42d93b265f54e49fe66021b19ba80a1e944ec6d35d586704c6f6d88b894d6d473149d7d036af1f3affbf06cd7f4dcb2ea2f42bdb7f397792c042972
+  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
@@ -39,12 +37,17 @@ module Fusuma
 
           status = (data["status"] == 1) ? "pressed" : "released"
           Events::Records::KeypressRecord.new(status: status, code: data["key"], layer: data["layer"])
+        rescue EOFError => e
+          MultiLogger.error "#{self.class.name}: #{e}"
+          MultiLogger.error "Shutdown fusuma process..."
+          Process.kill("TERM", Process.pid)
         end
 
         private
 
         def setup_remapper
           config = {
+
             keyboard_name_patterns: config_params(:keyboard_name_patterns),
             touchpad_name_patterns: config_params(:touchpad_name_patterns)
           }
@@ -54,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
@@ -56,6 +54,10 @@ module Fusuma
             end
 
           Events::Records::GestureRecord.new(gesture: gesture, status: status, finger: finger, delta: nil)
+        rescue EOFError => e
+          MultiLogger.error "#{self.class.name}: #{e}"
+          MultiLogger.error "Shutdown fusuma process..."
+          Process.kill("TERM", Process.pid)
         end
 
         private
@@ -75,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
@@ -302,10 +302,15 @@ module Fusuma
           # If no device is found, it will wait for 3 seconds and try again
           # @return [Array<Revdev::EventDevice>]
           def select
+            displayed_no_keyboard = false
             loop do
               Fusuma::Device.reset # reset cache to get the latest device information
               devices = Fusuma::Device.all.select { |d| Array(@names).any? { |name| d.name =~ /#{name}/ } }
               if devices.empty?
+                unless displayed_no_keyboard
+                  MultiLogger.warn "No keyboard found: #{@names}"
+                  displayed_no_keyboard = true
+                end
                 wait_for_device
 
                 next

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/uinput_touchpad.rb

@@ -109,10 +109,10 @@ class UinputTouchpad < Ruinput::UinputDevice
     @file.ioctl UI_SET_EVBIT, Revdev::EV_ABS
     Revdev::ABS_CNT.times do |i|
       if touchpad_abs.include?(i)
-        puts "setting #{i} (#{Revdev::REVERSE_MAPS[:ABS][i]})"
+        # puts "setting #{i} (#{Revdev::REVERSE_MAPS[:ABS][i]})"
         @file.ioctl UI_SET_ABSBIT, i
       else
-        puts "skipping #{i} (#{Revdev::REVERSE_MAPS[:ABS][i]})"
+        # puts "skipping #{i} (#{Revdev::REVERSE_MAPS[:ABS][i]})"
       end
     end
 
@@ -126,10 +126,10 @@ class UinputTouchpad < Ruinput::UinputDevice
     @file.ioctl UI_SET_EVBIT, Revdev::EV_REL
     Revdev::REL_CNT.times do |i|
       if touchpad_rels.include?(i)
-        puts "setting #{i} (#{Revdev::REVERSE_MAPS[:REL][i]})"
+        # puts "setting #{i} (#{Revdev::REVERSE_MAPS[:REL][i]})"
         @file.ioctl UI_SET_RELBIT, i
       else
-        puts "skipping #{i} (#{Revdev::REVERSE_MAPS[:REL][i]})"
+        # puts "skipping #{i} (#{Revdev::REVERSE_MAPS[:REL][i]})"
       end
     end
 

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Remap
-      VERSION = "0.4.0"
+      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.0
+  version: 0.5.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma