fusuma-plugin-remap 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaaa77e6fd8c9cee0a54568993df26b41d6f51cdb23863c09880e904c915ff5b
-  data.tar.gz: fc5192209c0a3b277b1acbb7172c99d7271ec7597738b4e26a9066050674e25e
+  metadata.gz: fb42159c757f56d2da9af424bfc088719bc22c965ad72bed52bc9bd81ad86e9f
+  data.tar.gz: cdddfbf418ecb85c1ad0cd3991d04ca5f022833ce4b344b1e9e37594c6c82ae9
 SHA512:
-  metadata.gz: f25bc7503fb3cafc2f58266e859c26f3a298063e0fa29047883297164150eddabcc5a83504dd61a2245b5adcb8f0bb1d142a07d883d59f81b5358585a8f6b1b4
-  data.tar.gz: 80477884b33eab4ead8bb591da4c9c59c048622608a7870746c3c33a945cbccb03efa0510aaa61618f575d73c083aa4a755078bf9147bb631d57f5da38d46306
+  metadata.gz: d8255feb9082b3f8e18962b8edfe73ba44ebb61d53f159ebeeadf6fda53ca796cbce18f100d4efdb8dcf3c8290920458c30ccffb924973b8a6a9eb0c855db555
+  data.tar.gz: c24ca94224d7aadb892af07c62fe689ff74e07b38ff09cc0a15b6755d1aa3092a2255c553aff93f6c6c4401220456ec665776fd9eb5b57da3e102816929f9182

data/README.md

@@ -37,26 +37,6 @@ $ sudo udevadm control --reload-rules && sudo udevadm trigger
 $ sudo gem install fusuma-plugin-remap
 ```
 
-### Set plugin properties
-
-Open `~/.config/fusuma/config.yml` and add the following code at the bottom in primary context(first section separated by `---`).
-
-```yaml
-plugin:
-  inputs:
-    remap_keyboard_input:
-      keyboard_name_patterns: xremap # (optional) specifiy other source keyboard name
-  buffers:
-    keypress_buffer:
-      source: remap_keyboard_input # (required) use buffer of fusuma-plugin-keypress
-  executors:
-    sendkey_executor:
-      device_name: fusuma_virtual_keyboard # (optional) when you use fusuma-plugin-sendkey
-
----
-
-```
-
 ## Properties
 
 ### Remap

data/fusuma-plugin-remap.gemspec

@@ -20,8 +20,11 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.5.1"
-  spec.add_dependency "fusuma", "~> 3.0"
+  spec.required_ruby_version = ">= 2.7"
+  # 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.1"
   spec.add_dependency "fusuma-plugin-keypress", "~> 0.5"
   spec.add_dependency "msgpack"
   spec.add_dependency "revdev"

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/inputs/remap_keyboard_input.yml

@@ -0,0 +1,10 @@
+plugin:
+  inputs:
+    remap_keyboard_input:
+      keyboard_name_patterns: ["keyboard", "Keyboard", "KEYBOARD"]
+  buffers:
+    keypress_buffer:
+      source: remap_keyboard_input
+  executors:
+    sendkey_executor:
+      device_name: fusuma_virtual_keyboard

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.2.0"
+      VERSION = "0.3.1"
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-remap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-20 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: fusuma-plugin-keypress
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,7 @@ files:
 - exe/fusuma-remap
 - fusuma-plugin-remap.gemspec
 - lib/fusuma/plugin/inputs/remap_keyboard_input.rb
+- lib/fusuma/plugin/inputs/remap_keyboard_input.yml
 - lib/fusuma/plugin/remap.rb
 - lib/fusuma/plugin/remap/layer_manager.rb
 - lib/fusuma/plugin/remap/remapper.rb
@@ -118,14 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.1
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: A Fusuma plugin for remapping keyboard events into virtual input devices.