rkremap 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 127371f8cab9cd5ff002b35b886b79a3a4424d779f4bf938b9006fb633917a51
-  data.tar.gz: a02bd1649a62f30916e125582409f9b9ab8d57c33caf10bdfc5f7e6392ece992
+  metadata.gz: 6476d10293c91c5afb744c6ebe1162d26ab253ad06aade6f5f2568db05bb7631
+  data.tar.gz: 35fd73d5a2d71ca797fd626397a789e8f22b5bd54cfa2ef0ca08f46adc6efa7f
 SHA512:
-  metadata.gz: 111e0d08dfaec939535f150eb8d2852c5bbda078d705191d8d03d0d035782088cf73f7c861029cc49b99860f8645be46c1ef557326bae1e17170d15116ee887d
-  data.tar.gz: a1124ae0dabd8f87286d7ae2cc375a0490ffc58a884c2fb0f9694f51cee9d97b309ea83842afeb46f86184a1523e96c06429688bf71aa05e1a6e9555d6f488cb
+  metadata.gz: bdf4f1364db8aa24dc49dab823e4f16200994058a6ff8d8e3323272d0783139af49f6fcdbb7f22b573dab92554d39d92429d24aa7b5fedf80e27139cf62bd120
+  data.tar.gz: d868e6b7af37edfa90324014669ff7de5595f392116bedeaf011cf95cd49ce9621782f1dda6e402c4e6117509ae0a0337322447028975ab743324da318479d0b

data/README.md

@@ -22,6 +22,7 @@ KERNEL=="uinput", GROUP="input"
 ```
 という内容で作れば `/dev/uinput` のグループを `input` にできるっぽい。
 
+`$VERBOSE` が真の場合はデバイスを検出したときと切断を検出したときにデバイス名を標準出力に出力する。
 
 ## Rkremap
 

data/example/mac-shortcut.rb

@@ -48,18 +48,24 @@ rk.match(app: /terminal/i) do |event, mod|
   # Super+Ctrl はそのまま
   if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && (mod[KEY_LEFTCTRL] || mod[KEY_RIGHTCTRL])
     rk.event(code: event.code, type: event.type)
-  end
+  # Super+0/Minus は Ctrl+0/Minus に変換
+  elsif (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && Rkremap::CODE_KEY[event.code] =~ /\AKEY_(0|MINUS)\z/
+    rk.with_modifier(mod_disable_all.merge(KEY_LEFTCTRL => true)) do
+      rk.event(code: event.code, type: event.type)
+    end
   # Super+KEY は Ctrl+Shift+KEY に変換
-  if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && Rkremap::CODE_KEY[event.code] =~ /\AKEY_[A-Z]\z/
+  elsif (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && Rkremap::CODE_KEY[event.code] =~ /\AKEY_([A-Z]|EQUAL)\z/
     rk.with_modifier(mod_disable_meta.merge(KEY_LEFTCTRL => true, KEY_LEFTSHIFT => true)) do
       rk.event(code: event.code, type: event.type)
     end
-  else
+  # それ以外はそのまま
+  else # rubocop:disable Lint/DuplicateBranch
     rk.event(code: event.code, type: event.type)
   end
   event.skip
 end
 
+# その他のウィンドウ
 rk.start do |code, mod|
   # Super + Ctrl + 何か はそのまま
   if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && (mod[KEY_LEFTCTRL] || mod[KEY_RIGHTCTRL])
@@ -67,8 +73,8 @@ rk.start do |code, mod|
     next
   end
 
-  # SUPER+[A-Z]/Enter を Ctrl+[A-Z]/Enter に変換
-  if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && (Rkremap::CODE_KEY[code] =~ /\AKEY_[A-Z]\z/ || code == KEY_ENTER)
+  # Super+[A-Z]/Minus/Equal/Enter を Ctrl+[A-Z]/Minus/Equal/Enter に変換
+  if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && (Rkremap::CODE_KEY[code] =~ /\AKEY_([0-9A-Z]|MINUS|EQUAL|ENTER)\z/)
     rk.key(code, mod.merge(mod_disable_meta, KEY_LEFTCTRL => true))
     next
   end

data/example/tmtms.rb

@@ -5,7 +5,7 @@ require 'tmtms_timer'
 
 include Rkremap::KeyCode
 
-rk = Rkremap.new(*ARGV, mouse: true, exclude: /touchpad/)
+rk = Rkremap.new(*ARGV, mouse: true, exclude: /touchpad/i)
 rk.grab = true
 rk.x11 = true
 
@@ -107,13 +107,18 @@ rk.match(app: /terminal/i) do |event, mod|
   # Super+Ctrl はそのまま
   if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && (mod[KEY_LEFTCTRL] || mod[KEY_RIGHTCTRL])
     rk.event(code: event.code, type: event.type)
-  end
+  # Super+0/Minus は Ctrl+0/Minus に変換
+  elsif (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && Rkremap::CODE_KEY[event.code] =~ /\AKEY_(0|MINUS)\z/
+    rk.with_modifier(mod_disable_all.merge(KEY_LEFTCTRL => true)) do
+      rk.event(code: event.code, type: event.type)
+    end
   # Super+KEY は Ctrl+Shift+KEY に変換
-  if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && Rkremap::CODE_KEY[event.code] =~ /\AKEY_[A-Z]\z/
+  elsif (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && Rkremap::CODE_KEY[event.code] =~ /\AKEY_([A-Z]|EQUAL)\z/
     rk.with_modifier(mod_disable_meta.merge(KEY_LEFTCTRL => true, KEY_LEFTSHIFT => true)) do
       rk.event(code: event.code, type: event.type)
     end
-  else
+  # それ以外はそのまま
+  else # rubocop:disable Lint/DuplicateBranch
     rk.event(code: event.code, type: event.type)
   end
   event.skip
@@ -139,8 +144,8 @@ rk.start do |code, mod|
     next
   end
 
-  # Super+[A-Z]/Enter を Ctrl+[A-Z]/Enter に変換
-  if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && (Rkremap::CODE_KEY[code] =~ /\AKEY_[A-Z]\z/ || code == KEY_ENTER)
+  # Super+[A-Z]/Minus/Equal/Enter を Ctrl+[A-Z]/Minus/Equal/Enter に変換
+  if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && (Rkremap::CODE_KEY[code] =~ /\AKEY_([0-9A-Z]|MINUS|EQUAL|ENTER)\z/)
     rk.key(code, mod.merge(mod_disable_meta, KEY_LEFTCTRL => true))
     next
   end

data/lib/rkremap/evdev.rb

@@ -18,6 +18,10 @@ class Rkremap
       @grab = false
     end
 
+    def inspect
+      "#<Rkremap::Evdev: #{name} (#{path})>"
+    end
+
     def eql?(other)
       other.is_a?(Evdev) && self.path == other.path
     end
@@ -92,12 +96,12 @@ class Rkremap
     #   unsigned short code;
     #   unsigned int value;
     # };
-    # @return [Array<Time, Integer, Integer, Integer>]
+    # @return [Rkremap::Event]
     def read_event
       raw = io.sysread(24)  # sizeof(struct input_event)
       sec, usec, type, code, value = raw.unpack('Q!Q!SSl')
       time = Time.at(sec, usec)
-      return time, type, code, value
+      Event.new(self, time, type, code, value)
     end
 
     # @param pattern [Symbol, Regexp]

data/lib/rkremap/evdev_list.rb

@@ -44,19 +44,25 @@ class Rkremap
       new_devs -= @device_list.keys
       new_devs.each do |path|
         ev = Evdev.new(path)
-        next if @exclude && ev.name =~ @exclude
-        if ev.keyboard? || (@detect_mouse && ev.mouse?)
+        stat = nil
+        if @exclude && ev.name =~ @exclude
+          stat = 'excluded'
+        elsif ev.keyboard? || (@detect_mouse && ev.mouse?)
           ev.grab if ev.match?(@grab)
-          puts "detect: #{ev.name} (#{ev.path}) #{ev.grab? ? 'grab' : 'not grab'}" if $VERBOSE
           @io2evdev[ev.io] = ev
           @device_list[path] = ev
+          stat = ev.grab? ? 'grabbed' : 'not grabbed'
+        else
+          stat = 'ignored'
         end
+        puts "detect: #{ev.name} (#{ev.path}) #{stat}" if $VERBOSE
       end
     end
 
     # @param evdev [path]
     def remove_device(path)
       evdev = @device_list[path]
+      puts "disconnect: #{evdev.name} (#{evdev.path})" if $VERBOSE
       @io2evdev.delete evdev.io
       evdev.close
       @device_list.delete path
@@ -74,7 +80,7 @@ class Rkremap
         evdev = select(3)
         next unless evdev
         begin
-          return Event.new(evdev)
+          return evdev.read_event
         rescue Errno::ENODEV
           remove_device(evdev.path)
         end

data/lib/rkremap/event.rb

@@ -1,39 +1,29 @@
 class Rkremap
   class Event
-    Raw = Struct.new(:time, :type, :code, :value)
-
     attr_accessor :app
-    attr_reader :raw, :ev_type
-    attr_writer :code
+    attr_reader :device
+    attr_reader :time
+    attr_reader :ev_type
+    attr_accessor :code
+    attr_accessor :value
 
     # @param evdev [Rkremap::Evdev]
-    # @param app [Rkremap::App]
-    def initialize(evdev)
-      @evdev = evdev
-      @raw = []
-      while true
-        s = evdev.read_event
-        @raw.push Raw.new(*s)
-        break if s[1] == EV_SYN
-      end
-      @ev_type = (@raw.find{_1[1] != EV_MSC && _1[1] != EV_SYN} || @raw.first)[1]
-    end
-
-    # @return [Rkremap::Event::Raw]
-    def key
-      @key ||= @raw.find{_1.type == EV_KEY}
-    end
-
-    def device
-      @evdev
-    end
-
-    def code
-      @code ||= key.code
-    end
-
-    def value
-      key.value
+    # @param time [Time]
+    # @param type [Integer]
+    # @param code [Integer]
+    # @param value [Integer]
+    def initialize(evdev, time, type, code, value)
+      @device = evdev
+      @time = time
+      @ev_type = type
+      @code = code
+      @value = value
+      @app = nil
+      @skipped = false
+    end
+
+    def inspect
+      "#<Rkremap::Event: #{code}(#{CODE_KEY[code]}) #{value} #{device.inspect}>"
     end
 
     def type

data/lib/rkremap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Rkremap
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/rkremap.rb

@@ -76,9 +76,7 @@ class Rkremap
       event = @evdev_list.read_event
       if event.ev_type != EV_KEY
         if event.device.grab?
-          event.raw.each do |r|
-            @uinput.write_event(r.type, r.code, r.value)
-          end
+          @uinput.write_event(event.ev_type, event.code, event.value)
         end
         next
       end
@@ -158,7 +156,6 @@ class Rkremap
   # @param value [Integer] 0:release / 1:press / 2:repeat
   def write_event(code, value)
     @uinput.write_event(EV_KEY, code, value)
-    @uinput.write_event(EV_SYN, SYN_REPORT, 0)
   end
 
   class App

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rkremap
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - TOMITA Masahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tmtms_timer