fusuma-plugin-sendkey 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4f7a138b1d95791f1aaaa0f2c87478a19cda797fae84a041d971c82918748e0
-  data.tar.gz: ed5e3faf1a337514dc4143b94a197ba8fdaa6d1f6f4ff1db34f3f104c27e3b0b
+  metadata.gz: c879caf4905b45fb0ac0b341920ce05b46656aaa8cceac946c6d80d672ef15b0
+  data.tar.gz: c3342151efbd9026776a576a5a888a1928f425e4a41c90d92b21639d9b4d04d8
 SHA512:
-  metadata.gz: 9f88aca512a3ce515737955bcf51e000e7744559e42aeb2681074ac70286cbd84353bd5d899b595a46a63fe3c704c89c912ed86f13c00dc4b34cdb873da83972
-  data.tar.gz: e88bc67bb77ed35261d441710f9a5d409bbe3549ac0354424067822503aab833389539ee9d6ea8eaf901058b31f862b86c836fc0896b7b8228907dbb45dda3c0
+  metadata.gz: 941608c2566984699567bbcd75ddcd04e777f43f910c1761b5f2533a9dea288d0426b1442bbdf8bae9cfce6f884fc13da1063d714f8e997b308497275510f033
+  data.tar.gz: 68b49087774f96a9be5b4b892a0f7c7c88226e27ab9bc7901f34da778acce22c717bfa5b2546c45675a87bb07e9939f7946d39898c60c78ecc444725298a2b79

data/exe/fusuma-sendkey

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require 'fusuma/config'
 require 'fusuma/plugin/inputs/libinput_command_input.rb'
 require_relative '../lib/fusuma/plugin/sendkey/keyboard.rb'
 require_relative '../lib/fusuma/plugin/sendkey/version.rb'
@@ -20,8 +21,13 @@ end
 
 opt.parse!(ARGV)
 
+device_name = Fusuma::Config.instance.fetch_config_params(
+  :device_name,
+  Fusuma::Config::Index.new([:plugin, :executors, :sendkey_executor])
+).fetch(:device_name, nil)
+
 if option[:list]
-  puts Fusuma::Plugin::Sendkey::Keyboard.new(name_pattern: nil).search_codes
+  puts Fusuma::Plugin::Sendkey::Keyboard.new(name_pattern: device_name).search_codes
   return
 end
 
@@ -38,5 +44,5 @@ if param.nil?
   exit 1
 end
 
-keyboard = Fusuma::Plugin::Sendkey::Keyboard.new
+keyboard = Fusuma::Plugin::Sendkey::Keyboard.new(name_pattern: device_name)
 keyboard.valid?(param: param) && keyboard.type(param: param)

data/fusuma-plugin-sendkey.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.5.1" # https://packages.ubuntu.com/search?keywords=ruby&searchon=names&exact=1&suite=all&section=main
-  # support bionic (18.04LTS) 2.5.1
+
+  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", ">= 2.0"
   spec.add_dependency "revdev"

data/lib/fusuma/plugin/executors/sendkey_executor.rb

@@ -59,7 +59,7 @@ module Fusuma
         # @return [String]
         def search_keypress(event)
           # if fusuma_virtual_keyboard exists, don't have to keep modifiers
-          return "" if keyboard.use_virtual_keyboard?
+          return "" if @device_name == "fusuma_virtual_keyboard"
 
           keys = event.record.index.keys
           keypress_index = keys.find_index { |k| k.symbol == :keypress }

data/lib/fusuma/plugin/executors/sendkey_executor.yml

@@ -0,0 +1,4 @@
+plugin:
+  executors:
+    sendkey_executor:
+      device_name: keyboard|Keyboard|KEYBOARD

data/lib/fusuma/plugin/sendkey/keyboard.rb

@@ -24,20 +24,17 @@ module Fusuma
           KEY_RIGHTMETA
         ].freeze
 
-        DEFAULT_NAME_PATTERN = "keyboard|Keyboard|KEYBOARD"
-        VIRTUAL_KEYBOARD = "fusuma_virtual_keyboard" # fusuma-plugin-remap creates uinput device
-
         def self.find_device(name_pattern:)
           Fusuma::Device.reset
-          Fusuma::Device.all.find { |d| d.name.match(/#{name_pattern}/) }
+          Fusuma::Device.all.find { |d|
+            next unless d.capabilities.include? "keyboard"
+
+            d.name.match(/#{name_pattern}/)
+          }
         end
 
         def initialize(name_pattern: nil)
-          device = if name_pattern
-            Keyboard.find_device(name_pattern: name_pattern)
-          else
-            Keyboard.find_device(name_pattern: VIRTUAL_KEYBOARD) || Keyboard.find_device(name_pattern: DEFAULT_NAME_PATTERN)
-          end
+          device = Keyboard.find_device(name_pattern: name_pattern)
 
           if device.nil?
             warn "sendkey: Keyboard: /#{name_pattern}/ is not found"
@@ -45,14 +42,9 @@ module Fusuma
           end
           MultiLogger.info "sendkey: Keyboard: #{device.name}"
 
-          @use_virtual_keyboard = device.name.match(/#{VIRTUAL_KEYBOARD}/o)
           @device = Device.new(path: "/dev/input/#{device.id}")
         end
 
-        def use_virtual_keyboard?
-          @use_virtual_keyboard
-        end
-
         # @param param [String] key names separated by '+' to type
         # @param keep [String] key names separated by '+' to keep
         # @param clear [String, Symbol, TrueClass] key names separated by '+' to clear or :all to relase all modifiers

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Sendkey
-      VERSION = "0.9.0"
+      VERSION = "0.10.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-sendkey
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-19 00:00:00.000000000 Z
+date: 2023-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma
@@ -53,6 +53,7 @@ files:
 - exe/fusuma-sendkey
 - fusuma-plugin-sendkey.gemspec
 - lib/fusuma/plugin/executors/sendkey_executor.rb
+- lib/fusuma/plugin/executors/sendkey_executor.yml
 - lib/fusuma/plugin/sendkey.rb
 - lib/fusuma/plugin/sendkey/device.rb
 - lib/fusuma/plugin/sendkey/keyboard.rb
@@ -69,14 +70,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: Fusuma plugin to send keyboard events