fusuma-plugin-remap 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1a6f601df78486fb3bf89f9c7902fe9fd46e45c33e2807eff9f0c4b5a38ec45
-  data.tar.gz: 50ca1d1da716e62d9ed9cc3973b201f9b8c93b00b5e313559bc5d7d4a73bfd3d
+  metadata.gz: 22d4ef7f153876d648359c14463da56777ecc7878cac97f79d1e29784a6673e8
+  data.tar.gz: f4381c0dcc9c5277fdeb14f0a19ee49772a3a06b07adfd9a31e0f43f5fff99a2
 SHA512:
-  metadata.gz: 881a29098c368a60f0d4469d77b1ffc118d0c9eb2df02d2b7c492ba356f30ab0ad740a73bfa96e229a1fd16d46a7a839139c7b4077e26fb30b092d0c142ca28c
-  data.tar.gz: 50dd4b8c9554ee17e338a5ded7248d1b4f9215d03ca5d19d5e2c8d97731687b42b1edb2105d7ebf7539ac2718bb3d3085db4c800db26cad54426be93fe854643
+  metadata.gz: a8111498a2c1d85caaf3a3c03af770c308f4e1b4c395a739f14e7832fd91280755b65424a9626a700b411112ab54b25a27f61a2d37aa64daf460573a3a4fe925
+  data.tar.gz: 54b0014a0f13b5a040f284ba8c3f87ecde1729ac0643b1fcb9d17411dfa9f1cd79ed03c8aa24dfeed2c2856df47ac76e69970eddba433b09a223bd695635edb2

data/fusuma-plugin-remap.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   # https://packages.ubuntu.com/search?keywords=ruby&searchon=names&exact=1&suite=all&section=main
   # support focal (20.04LTS) 2.7
 
-  spec.add_dependency "fusuma", ">= 3.4"
+  spec.add_dependency "fusuma", ">= 3.11.0"
   spec.add_dependency "fusuma-plugin-keypress", ">= 0.11.0"
   spec.add_dependency "fusuma-plugin-sendkey", ">= 0.12.0"
   spec.add_dependency "msgpack"

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../remap/touchpad_remapper"
+require_relative "../remap/device_selector"
 
 module Fusuma
   module Plugin
@@ -46,51 +47,37 @@ module Fusuma
         private
 
         def setup_remapper
-          source_touchpads = TouchpadSelector.new(config_params(:touchpad_name_patterns)).select
-          if source_touchpads.empty?
-            MultiLogger.error("No touchpad found: #{config_params(:touchpad_name_patterns)}")
-            exit
-          end
-
-          MultiLogger.info("set up remapper")
-          MultiLogger.info("touchpad: #{source_touchpads}")
-
           # layer_manager = Remap::LayerManager.instance
 
           # physical touchpad input event
           @fusuma_reader, fusuma_writer = IO.pipe
+          touchpad_name_patterns = config_params(:touchpad_name_patterns)
 
           fork do
             # layer_manager.writer.close
             @fusuma_reader.close
+
+            # DeviceSelector waits until touchpad is found (like KeyboardSelector)
+            # NOTE: This must be inside fork to avoid blocking the main Fusuma process
+            source_touchpads = Remap::DeviceSelector.new(
+              name_patterns: touchpad_name_patterns,
+              device_type: :touchpad
+            ).select(wait: true)
+
+            MultiLogger.info("set up remapper")
+            MultiLogger.info("touchpad: #{source_touchpads}")
+
             remapper = Remap::TouchpadRemapper.new(
               # layer_manager: layer_manager,
               fusuma_writer: fusuma_writer,
-              source_touchpads: source_touchpads
+              source_touchpads: source_touchpads,
+              touchpad_name_patterns: touchpad_name_patterns
             )
             remapper.run
           end
           # layer_manager.reader.close
           fusuma_writer.close
         end
-
-        class TouchpadSelector
-          def initialize(names = nil)
-            @names = names
-          end
-
-          # @return [Array<Revdev::EventDevice>]
-          def select
-            devices = if @names
-              Fusuma::Device.all.select { |d| Array(@names).any? { |name| d.name =~ /#{name}/ } }
-            else
-              # available returns only touchpad devices
-              Fusuma::Device.available
-            end
-
-            devices.map { |d| Revdev::EventDevice.new("/dev/input/#{d.id}") }
-          end
-        end
       end
     end
   end

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "revdev"
+require "fusuma/device"
+
+module Fusuma
+  module Plugin
+    module Remap
+      # Common device selector for touchpad and keyboard detection
+      # Unifies TouchpadSelector implementations across the codebase
+      class DeviceSelector
+        POLL_INTERVAL = 3 # seconds
+
+        # @param name_patterns [Array, String, nil] patterns for device names
+        # @param device_type [Symbol] :touchpad or :keyboard (for logging)
+        def initialize(name_patterns: nil, device_type: :touchpad)
+          @name_patterns = name_patterns
+          @device_type = device_type
+          @displayed_waiting = false
+        end
+
+        # Select devices that match the name patterns
+        # @param wait [Boolean] if true, wait until device is found (polling loop)
+        # @return [Array<Revdev::EventDevice>]
+        def select(wait: false)
+          loop do
+            Fusuma::Device.reset # reset cache to get the latest device information
+            devices = find_devices
+            return to_event_devices(devices) unless devices.empty?
+            return [] unless wait
+
+            log_waiting_message unless @displayed_waiting
+            sleep POLL_INTERVAL
+          end
+        end
+
+        private
+
+        def find_devices
+          if @name_patterns
+            Fusuma::Device.all.select { |d|
+              Array(@name_patterns).any? { |name| d.name =~ /#{name}/ }
+            }
+          else
+            # available returns only touchpad devices
+            Fusuma::Device.available
+          end
+        end
+
+        def to_event_devices(devices)
+          devices.map { |d| Revdev::EventDevice.new("/dev/input/#{d.id}") }
+        end
+
+        def log_waiting_message
+          MultiLogger.warn "No #{@device_type} found: #{@name_patterns || "(default patterns)"}"
+          MultiLogger.warn "Waiting for #{@device_type} to be connected..."
+          @displayed_waiting = true
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ require "msgpack"
 require "set"
 require_relative "layer_manager"
 require_relative "uinput_keyboard"
+require_relative "device_selector"
 require "fusuma/device"
 
 module Fusuma
@@ -12,6 +13,7 @@ module Fusuma
         include Revdev
 
         VIRTUAL_KEYBOARD_NAME = "fusuma_virtual_keyboard"
+        DEFAULT_EMERGENCY_KEYBIND = "RIGHTCTRL+LEFTCTRL".freeze
 
         # Key conversion tables for better performance and readability
         KEYMAP = Revdev.constants.select { |c| c.start_with?("KEY_", "BTN_") }
@@ -80,25 +82,39 @@ module Fusuma
             end
 
             remapped = current_mapping.fetch(input_key.to_sym, nil)
-            if remapped.nil?
+            case remapped
+            when String, Symbol
+              # Remapped to another key - continue processing below
+            when Hash
+              # Command execution (e.g., {:SENDKEY=>"LEFTCTRL+BTN_LEFT", :CLEARMODIFIERS=>true})
+              # Skip input event processing and let Fusuma's Executor handle this
+              next
+            when nil
+              # Not remapped - write original key event as-is
               uinput_keyboard.write_input_event(input_event)
               next
+            else
+              # Invalid remapping configuration
+              MultiLogger.warn("Invalid remapped value - type: #{remapped.class}, key: #{input_key}")
+              next
             end
 
             remapped_code = key_to_code(remapped)
             if remapped_code.nil?
-              MultiLogger.warn("Invalid remapped key: #{remapped}, skipping...")
+              MultiLogger.warn("Invalid remapped value - unknown key: #{remapped}, input: #{input_key}")
               uinput_keyboard.write_input_event(input_event)
               next
             end
 
             remapped_event = InputEvent.new(nil, input_event.type, remapped_code, input_event.value)
 
-            # Workaround to solve the problem that the remapped key remains pressed
-            # when the key pressed before remapping is released after remapping
-            unless record_virtual_keyboard_event?(remapped, remapped_event.value)
-              # set original key before remapping
+            # Workaround: If a key was pressed before remapping started and is being released,
+            # use the original key code to ensure proper key release
+            if should_use_original_key?(remapped, remapped_event.value)
               remapped_event.code = input_event.code
+            else
+              # Only update virtual key state if we're using the remapped key
+              update_virtual_key_state(remapped, remapped_event.value)
             end
 
             # remap to command will be nil
@@ -140,21 +156,34 @@ module Fusuma
           @pressed_virtual_keys ||= Set.new
         end
 
-        # record virtual keyboard event
+        # Update virtual keyboard key state
         # @param [String] remapped_value remapped key name
-        # @param [Integer] event_value event value
-        # @return [Boolean] false if the key was pressed before remapping started and was released
-        # @return [Boolean] true if the key was not pressed before remapping started
-        def record_virtual_keyboard_event?(remapped_value, event_value)
+        # @param [Integer] event_value event value (0: release, 1: press, 2: repeat)
+        # @return [void]
+        def update_virtual_key_state(remapped_value, event_value)
           case event_value
-          when 0
-            pressed_virtual_keys.delete?(remapped_value)
-          when 1
-            pressed_virtual_keys.add?(remapped_value)
-            true # Always return true because the remapped key may be the same
-          else
-            # 2 is repeat
-            true
+          when 0 # key release
+            pressed_virtual_keys.delete(remapped_value)
+          when 1 # key press
+            pressed_virtual_keys.add(remapped_value)
+            # when 2 is repeat - no state change needed
+          end
+        end
+
+        # Check if we should use the original key code instead of remapped key
+        # This handles the case where a key was pressed before remapping started
+        # and is released after remapping
+        # @param [String] remapped_value remapped key name
+        # @param [Integer] event_value event value (0: release, 1: press, 2: repeat)
+        # @return [Boolean] true if we should use original key code
+        def should_use_original_key?(remapped_value, event_value)
+          case event_value
+          when 0 # key release
+            # If the key was not in our pressed set, it means it was pressed
+            # before remapping started, so we should use original key
+            !pressed_virtual_keys.include?(remapped_value)
+          when 1, 2 # key press or repeat
+            false # Always use remapped key for press/repeat events
           end
         end
 
@@ -164,29 +193,36 @@ module Fusuma
 
         def create_virtual_keyboard
           touchpad_name_patterns = @config[:touchpad_name_patterns]
-          internal_touchpad = TouchpadSelector.new(touchpad_name_patterns).select.first
-
-          if internal_touchpad.nil?
-            MultiLogger.error("No touchpad found: #{touchpad_name_patterns}")
-            exit
-          end
+          # Use DeviceSelector without wait - keyboard remap should work even without touchpad
+          internal_touchpad = DeviceSelector.new(
+            name_patterns: touchpad_name_patterns,
+            device_type: :touchpad
+          ).select(wait: false).first
 
           MultiLogger.info "Create virtual keyboard: #{VIRTUAL_KEYBOARD_NAME}"
 
-          uinput_keyboard.create VIRTUAL_KEYBOARD_NAME,
-            Revdev::InputId.new(
-              # disable while typing is enabled when
-              # - Both the keyboard and touchpad are BUS_I8042
-              # - The touchpad and keyboard have the same vendor/product
-              # ref: (https://wayland.freedesktop.org/libinput/doc/latest/palm-detection.html#disable-while-typing)
-              #
-              {
-                bustype: Revdev::BUS_I8042,
-                vendor: internal_touchpad.device_id.vendor,
-                product: internal_touchpad.device_id.product,
-                version: internal_touchpad.device_id.version
-              }
-            )
+          if internal_touchpad.nil?
+            MultiLogger.warn("No touchpad found: #{touchpad_name_patterns}")
+            MultiLogger.warn("Disable-while-typing feature will not work without a touchpad")
+            # Create virtual keyboard without touchpad device ID
+            # disable-while-typing will not work in this case
+            uinput_keyboard.create VIRTUAL_KEYBOARD_NAME
+          else
+            uinput_keyboard.create VIRTUAL_KEYBOARD_NAME,
+              Revdev::InputId.new(
+                # disable while typing is enabled when
+                # - Both the keyboard and touchpad are BUS_I8042
+                # - The touchpad and keyboard have the same vendor/product
+                # ref: (https://wayland.freedesktop.org/libinput/doc/latest/palm-detection.html#disable-while-typing)
+                #
+                {
+                  bustype: Revdev::BUS_I8042,
+                  vendor: internal_touchpad.device_id.vendor,
+                  product: internal_touchpad.device_id.product,
+                  version: internal_touchpad.device_id.version
+                }
+              )
+          end
         end
 
         def grab_keyboards(keyboards)
@@ -224,8 +260,6 @@ module Fusuma
           Signal.trap(:TERM) { @destroy.call(1) }
         end
 
-        DEFAULT_EMERGENCY_KEYBIND = "RIGHTCTRL+LEFTCTRL".freeze
-
         # Emergency stop keybind for virtual keyboard
         def set_emergency_ungrab_keys(keybind_string)
           keybinds = keybind_string&.split("+")
@@ -369,24 +403,6 @@ module Fusuma
             sleep 3
           end
         end
-
-        class TouchpadSelector
-          def initialize(names = nil)
-            @names = names
-          end
-
-          # @return [Array<Revdev::EventDevice>]
-          def select
-            devices = if @names
-              Fusuma::Device.all.select { |d| Array(@names).any? { |name| d.name =~ /#{name}/ } }
-            else
-              # available returns only touchpad devices
-              Fusuma::Device.available
-            end
-
-            devices.map { |d| Revdev::EventDevice.new("/dev/input/#{d.id}") }
-          end
-        end
       end
     end
   end

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

@@ -3,6 +3,8 @@ require "msgpack"
 require "set"
 
 require_relative "uinput_touchpad"
+require_relative "device_selector"
+require "fusuma/device"
 
 module Fusuma
   module Plugin
@@ -14,9 +16,11 @@ module Fusuma
 
         # @param fusuma_writer [IO]
         # @param source_touchpads [Revdev::Device]
-        def initialize(fusuma_writer:, source_touchpads:)
+        # @param touchpad_name_patterns [Array, String, nil] patterns for touchpad device names (for reconnection)
+        def initialize(fusuma_writer:, source_touchpads:, touchpad_name_patterns: nil)
           @source_touchpads = source_touchpads # original touchpad
           @fusuma_writer = fusuma_writer # write event to fusuma_input
+          @touchpad_name_patterns = touchpad_name_patterns # for reconnection
 
           @palm_detectors = @source_touchpads.each_with_object({}) do |source_touchpad, palm_detectors|
             palm_detectors[source_touchpad] = PalmDetection.new(source_touchpad)
@@ -157,7 +161,19 @@ module Fusuma
               prev_status = status
               prev_valid_touch = valid_touch
             end
+          rescue Errno::ENODEV => e
+            MultiLogger.error "Touchpad device is removed: #{e.message}"
+            MultiLogger.info "Waiting for touchpad to reconnect..."
+            reload_touchpads
+            touch_state = {}
+            mt_slot = 0
+            finger_state = nil
+            prev_valid_touch = false
+            prev_status = nil
+            retry
           end
+        rescue IOError => e
+          MultiLogger.error "Touchpad IO error: #{e.message}"
         rescue => e
           MultiLogger.error "An error occurred: #{e.message}"
         ensure
@@ -176,6 +192,34 @@ module Fusuma
           uinput.create_from_device(name: VIRTUAL_TOUCHPAD_NAME, device: @source_touchpads.first)
         end
 
+        # Reload touchpads after device disconnection
+        # This method waits until a touchpad is reconnected
+        def reload_touchpads
+          # Destroy virtual touchpad
+          begin
+            uinput.destroy
+          rescue IOError
+            # already destroyed
+          end
+          @uinput = nil
+
+          # Wait and detect touchpad using DeviceSelector
+          @source_touchpads = DeviceSelector.new(
+            name_patterns: @touchpad_name_patterns,
+            device_type: :touchpad
+          ).select(wait: true)
+
+          # Reinitialize palm detectors
+          @palm_detectors = @source_touchpads.each_with_object({}) do |source_touchpad, palm_detectors|
+            palm_detectors[source_touchpad] = PalmDetection.new(source_touchpad)
+          end
+
+          # Recreate virtual touchpad
+          create_virtual_touchpad
+
+          MultiLogger.info "Touchpad reconnected: #{@source_touchpads}"
+        end
+
         def set_trap
           @destroy = lambda do
             begin

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Remap
-      VERSION = "0.11.1"
+      VERSION = "0.12.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-remap
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - iberianpig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-10 00:00:00.000000000 Z
+date: 2026-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: fusuma-plugin-keypress
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - lib/fusuma/plugin/inputs/remap_touchpad_input.rb
 - lib/fusuma/plugin/inputs/remap_touchpad_input.yml
 - lib/fusuma/plugin/remap.rb
+- lib/fusuma/plugin/remap/device_selector.rb
 - lib/fusuma/plugin/remap/keyboard_remapper.rb
 - lib/fusuma/plugin/remap/layer_manager.rb
 - lib/fusuma/plugin/remap/touchpad_remapper.rb