fusuma-plugin-remap 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1a6f601df78486fb3bf89f9c7902fe9fd46e45c33e2807eff9f0c4b5a38ec45
-  data.tar.gz: 50ca1d1da716e62d9ed9cc3973b201f9b8c93b00b5e313559bc5d7d4a73bfd3d
+  metadata.gz: 5eb6be3cd4ee3e56a0fa412b29381e336c0b25207ca42d716a8a124cf907a5f8
+  data.tar.gz: d3b19a185e0cc03b7abcb00be6a8d7f63340827dafd1136adc941671457b2a80
 SHA512:
-  metadata.gz: 881a29098c368a60f0d4469d77b1ffc118d0c9eb2df02d2b7c492ba356f30ab0ad740a73bfa96e229a1fd16d46a7a839139c7b4077e26fb30b092d0c142ca28c
-  data.tar.gz: 50dd4b8c9554ee17e338a5ded7248d1b4f9215d03ca5d19d5e2c8d97731687b42b1edb2105d7ebf7539ac2718bb3d3085db4c800db26cad54426be93fe854643
+  metadata.gz: 593c365c6ef1ffc67a3865e188baeb8c59fa69a37aaaa3f75bad64b251d77d9abd9f914f2b90739f59dffc40b94dbb29c50fb894b8a524ba5820980ba364d8e6
+  data.tar.gz: 4cbd18fda7bfa3a05622f82cb4d558e7d00ea4b6d1a97c7c6617003eec64e1b6cb6caabd3fcfff91ef9c6c5c957b7681004c4a234f5c3a5e75a6878ba05526ca

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

@@ -12,6 +12,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 +81,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 +155,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 (0: release, 1: press, 2: repeat)
+        # @return [void]
+        def update_virtual_key_state(remapped_value, event_value)
+          case event_value
+          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
-        # @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 [Boolean] true if we should use original key code
+        def should_use_original_key?(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
+            # 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
 
@@ -224,8 +252,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("+")

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Remap
-      VERSION = "0.11.1"
+      VERSION = "0.11.2"
     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.11.2
 platform: ruby
 authors:
 - iberianpig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-10 00:00:00.000000000 Z
+date: 2025-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma