rkremap 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2052faf03d55e5ca684ee7c991fe42ecb187f2294376216e333d9aced2a45188
-  data.tar.gz: cc901a01fec47fcafc320ea355c5ea71dd8cc8e54c05f4f7774f02beda3ab328
+  metadata.gz: 93f0a2d7d2c705b779d942618d4da708ef395386bc9529d06cc4c4f644243bac
+  data.tar.gz: bddb932d29c287b3e00105adac03fc420506253c5f00c309dee22da46678502f
 SHA512:
-  metadata.gz: dad24b3679af4213746a787811812afe8791d4964eba2ea018debffb94f7558dec29915a9be18e3aa1952a6817ea6ec823045c0ab8ae45afc9d22649f8c90374
-  data.tar.gz: 6dbef790e758293b32891d2aabd4cc939b3259b55b5c6d5ed297d2a96ffe9feaeb657675c98b16cd3c73480f3d6f0b35e98f12fadd0d0f41a3020cca894cf069
+  metadata.gz: 41fff4f8444a6c585403ac5a3655eb5b4e1d631332594c95e4d3149a973dced926b4a726cf912522e7ac3c0dcbb4ba0e3ea6461dfe6853e04c1a9086162307e2
+  data.tar.gz: 88b6bdb97c04ed2629d1eac337e89f9854f954daf392b4e0a395e6df94699ff1c7e7e66be78ea3adeb3221fff8a6a88d2d8a38699f503575c5376bbdfcf96556

data/example/henkan-super.rb

@@ -16,8 +16,10 @@ rk.remap(hold: 0.5, map: {
 
 # マウスボタンイベントはそのまま
 rk.match(device: :mouse) do |event|
-  rk.event(code: event.code, type: event.type)
-  event.skip
+  unless Rkremap::CODE_KEY[event.code] =~ /^KEY_/
+    rk.event(code: event.code, type: event.type)
+    event.skip
+  end
 end
 
 rk.start do |code, mod|

data/example/tmtms.rb

@@ -20,8 +20,10 @@ rk.remap(hold: 0.5, map: {
 
 # マウスボタンイベントはそのまま
 rk.match(device: :mouse) do |event|
-  rk.event(code: event.code, type: event.type)
-  event.skip
+  unless Rkremap::CODE_KEY[event.code] =~ /^KEY_/
+    rk.event(code: event.code, type: event.type)
+    event.skip
+  end
 end
 
 # CAPSLOCK は CTRL に変換
@@ -55,12 +57,26 @@ mod_disable_meta = {
 }
 mod_disable_all = {}.merge(mod_disable_ctrl, mod_disable_shift, mod_disable_alt, mod_disable_meta)
 
-# Emacs や VirtualBox ではそのまま
-rk.match(app: /Emacs|VirtualBox Machine/) do |event|
+# VirtualBox
+rk.match(app: /VirtualBox Machine/) do |event|
   rk.event(code: event.code, type: event.type)
   event.skip
 end
 
+# Emacs
+rk.match(app: {class_name: 'Emacs'}) do |event, mod|
+  # 修飾キーが Super だけの場合は Alt として扱う。ただしキーが TAB の場合は除く。
+  mod_enabled = mod.select{_2}.keys
+  if !mod_enabled.empty? && mod_enabled.all?{_1 == KEY_LEFTMETA || _1 == KEY_RIGHTMETA} && event.code != KEY_TAB
+    rk.with_modifier(mod_disable_meta.merge(KEY_LEFTALT => true)) do
+      rk.event(code: event.code, type: event.type)
+    end
+  else
+    rk.event(code: event.code, type: event.type)
+  end
+  event.skip
+end
+
 # 端末
 rk.match(app: /terminal/i) do |event, mod|
   # Super+Ctrl はそのまま
@@ -83,6 +99,16 @@ rk.match(app: /terminal/i) do |event, mod|
   event.skip
 end
 
+# Firefox で Super+Ctrl+C は Alt+Ctrl+C に変換
+rk.match(app: {class_name: 'firefox'}) do |event, mod|
+  if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && (mod[KEY_LEFTCTRL] || mod[KEY_RIGHTCTRL]) && event.code == KEY_C
+    rk.with_modifier(mod_disable_meta.merge(KEY_LEFTCTRL => true, KEY_LEFTALT => true)) do
+      rk.event(code: event.code, type: event.type)
+    end
+    event.skip
+  end
+end
+
 # その他のウィンドウ
 ctrl_map = {
   KEY_A => KEY_HOME,
@@ -108,6 +134,11 @@ rk.start do |code, mod|
     rk.key(code, mod.merge(mod_disable_meta, KEY_LEFTCTRL => true))
     next
   end
+  # Super+[←→] を Alt+[←→] に変換
+  if (mod[KEY_LEFTMETA] || mod[KEY_RIGHTMETA]) && (Rkremap::CODE_KEY[code] =~ /\AKEY_(LEFT|RIGHT)\z/)
+    rk.key(code, mod.merge(mod_disable_meta, KEY_LEFTALT => true))
+    next
+  end
 
   # Alt + F, B は Ctrl + →, ← に変換
   if (mod[KEY_LEFTALT] || mod[KEY_RIGHTALT]) && (code == KEY_F || code == KEY_B)

data/lib/rkremap/event.rb

@@ -23,11 +23,15 @@ class Rkremap
     end
 
     def inspect
-      "#<Rkremap::Event: #{code}(#{CODE_KEY[code]}) #{value} #{device.inspect}>"
+      if ev_type == EV_KEY
+        "#<Rkremap::Event: #{code}(#{CODE_KEY[code]}) #{value} #{device.inspect}>"
+      else
+        "#<Rkremap::Event: type: #{ev_type}>"
+      end
     end
 
     def type
-      @type ||= value == 1 ? :press : value == 0 ? :release : :repeat
+      value == 1 ? :press : value == 0 ? :release : :repeat
     end
 
     def match?(device:, code:, type:, app:)

data/lib/rkremap/remap.rb

@@ -26,6 +26,10 @@ class Rkremap
         end
       end
 
+      @rk.match(code: keycodes, type: :repeat) do |event|
+        event.skip
+      end
+
       @rk.match(code: keycodes, type: :release) do |event|
         if @pressed[event.code]
           @rk.event(code: @pressed[event.code], type: :release)
@@ -59,12 +63,17 @@ class Rkremap
       end
 
       @rk.match(code: keycodes, type: :release) do |event|
-        if jobs[event.code]&.cancel
-          @rk.key(event.code)
-        elsif map[event.code]
-          @rk.event(code: map[event.code], type: :release)
+        code = event.code
+        if jobs[code]
+          if jobs[code].cancel
+            event.value = 1
+            @rk.append_event(Event.new(event.device, event.time, event.ev_type, event.code, 0))
+          elsif map[code]
+            event.code = map[code]
+            @pressed[code] = nil
+          end
+          jobs[code] = nil
         end
-        event.skip
       end
 
       @rk.match(type: :press) do
@@ -89,17 +98,21 @@ class Rkremap
     # @param to [Integer, Array<Integer>]
     # @param event [Rkremap::Event, nil]
     def make_press_event(to, event=nil)
-      Array(to).each do |key|
+      to = Array(to)
+      f = true
+      to.each do |key|
         @pressed[event.code] = key if event
         if @rk.modifiers.include? key
           @rk.event(code: key, type: :press)
-          event&.skip
         elsif event
           event.code = key
+          f = false
         else
-          @rk.key(code: key, type: :press)
+          @rk.key(key)
+          f = false
         end
       end
+      event&.skip if f
     end
   end
 end

data/lib/rkremap/version.rb

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

data/lib/rkremap.rb

@@ -83,9 +83,10 @@ class Rkremap
     @evdev_list.detect_loop
     @mod_state = @modifiers.map.to_h{|m| [m, false]}
     winattr = WinAttr.new if @x11
+    @events = []
     while true
       @keys = []
-      event = @evdev_list.read_event
+      event = @events.shift || @evdev_list.read_event
       if event.ev_type != EV_KEY
         if event.device.grab?
           @uinput.write_event(event.ev_type, event.code, event.value)
@@ -138,6 +139,12 @@ class Rkremap
     end
   end
 
+  # @param event [Rkremap::Event]
+  def append_event(event)
+    @events.push event
+    @events.push Event.new(event.device, event.time, EV_SYN, SYN_REPORT, 0)
+  end
+
   private
 
   def update_modifiers(code, value)
@@ -190,7 +197,7 @@ class Rkremap
     # @param app [Array, Hash, String, Regexp]
     # @return [Boolean]
     def match?(app)
-      Array(app).each do |a|
+      [app].flatten.each do |a|
         a = {class_name: a, title: a} unless a.is_a? Hash
         return true if match_sub(a[:class_name], class_name) || match_sub(a[:title], title)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rkremap
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - TOMITA Masahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2023-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tmtms_timer
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: key remapper