fusuma-plugin-remap 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 489bf6bf8a1b161db98aad213b9a3444c3374ecda95c7790772a9c1d49d987e9
-  data.tar.gz: b74218e6acc04e51a4dd168995925ef2492093eaefff172543eee3a72051c311
+  metadata.gz: fb42159c757f56d2da9af424bfc088719bc22c965ad72bed52bc9bd81ad86e9f
+  data.tar.gz: cdddfbf418ecb85c1ad0cd3991d04ca5f022833ce4b344b1e9e37594c6c82ae9
 SHA512:
-  metadata.gz: 1295235a7bac8f4e18d43c1659b16621d3db8f06099d4b02d98506b16ee6d0f185c90027e598efab180a4f722a91d583ab16d978590787a091f97ee3e038d02c
-  data.tar.gz: 17796ef9b95b12b134bcda2d92c3780fdf9da1f491a984dcc27e75e09d13f8e822d07ebb2a93a3e994bee7879d45b1c6cab7141a4643e782dd6bf47edf8222fa
+  metadata.gz: d8255feb9082b3f8e18962b8edfe73ba44ebb61d53f159ebeeadf6fda53ca796cbce18f100d4efdb8dcf3c8290920458c30ccffb924973b8a6a9eb0c855db555
+  data.tar.gz: c24ca94224d7aadb892af07c62fe689ff74e07b38ff09cc0a15b6755d1aa3092a2255c553aff93f6c6c4401220456ec665776fd9eb5b57da3e102816929f9182

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

@@ -51,15 +51,15 @@ module Fusuma
         private
 
         def setup_remapper
+          source_keyboards = KeyboardSelector.new(config_params(:keyboard_name_patterns)).select
+          internal_touchpad = TouchpadSelector.new(config_params(:touchpad_name_patterns)).select.first
+          MultiLogger.info(source_keyboards: source_keyboards.map(&:device_name), internal_touchpad: internal_touchpad.device_name)
+
           layer_manager = Remap::LayerManager.instance
 
           # physical keyboard input event
           @keyboard_reader, keyboard_writer = IO.pipe
 
-          source_keyboards = KeyboardSelector.new(config_params(:keyboard_name_patterns)).select
-          internal_touchpad = TouchpadSelector.new(config_params(:touchpad_name_patterns)).select.first
-          MultiLogger.info(source_keyboards: source_keyboards.map(&:device_name), internal_touchpad: internal_touchpad.device_name)
-
           @pid = fork do
             layer_manager.writer.close
             @keyboard_reader.close
@@ -96,11 +96,7 @@ module Fusuma
           # @return [Array<Revdev::EventDevice>]
           def select
             devices = if @names
-              Fusuma::Device.all.select do |d|
-                Array(@names).any? do |name|
-                  d.name =~ /#{name}/
-                end
-              end
+              Fusuma::Device.all.select { |d| Array(@names).any? { |name| d.name =~ /#{name}/ } }
             else
               # available returns only touchpad devices
               Fusuma::Device.available

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

@@ -1,9 +1,9 @@
 require "revdev"
 require "msgpack"
 require "set"
-require_relative "./layer_manager"
+require_relative "layer_manager"
 
-require_relative "./ruinput_device_patched"
+require_relative "ruinput_device_patched"
 
 module Fusuma
   module Plugin
@@ -79,7 +79,8 @@ module Fusuma
 
             remapped_event = InputEvent.new(nil, input_event.type, find_code_from_key(remapped), input_event.value)
 
-            # When Set.delete? fails, it means that the key was pressed before remapping started and was released.
+            # 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
               remapped_event.code = input_event.code
@@ -94,14 +95,20 @@ module Fusuma
           end
         end
 
-        # @param [Revdev::InputEvent] event
-        # @return [void]
+        private
+
+        # record virtual keyboard event
+        # @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)
           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
@@ -129,7 +136,13 @@ module Fusuma
 
         def grab_keyboards
           @source_keyboards.each do |keyboard|
-            wait_release_all_keys(keyboard) && keyboard.grab
+            wait_release_all_keys(keyboard)
+            begin
+              keyboard.grab
+              MultiLogger.info "Grabbed #{keyboard.device_name}"
+            rescue Errno::EBUSY
+              MultiLogger.error "Failed to grab #{keyboard.device_name}"
+            end
           end
         end
 

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Remap
-      VERSION = "0.3.0"
+      VERSION = "0.3.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-remap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma