rkremap 0.3.0 → 0.3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a75325e18cfa14e1eeb93462af309c6d692083c5ef4a2609e6dfd53747a6c8
-  data.tar.gz: 1f86fc05c3098eed25b0d09bbebfc75fdad37122898ee9762376ce5241f21c60
+  metadata.gz: 55d8872f73bd984afd69fdf3c17e53f39de16a4f8feef40bc851b6527e57aa17
+  data.tar.gz: 99c6a99b3fdd44e206d416eab361ca1ab4c9e4defc0d96bfa2fc0e563a5a1e4c
 SHA512:
-  metadata.gz: 3874c3c1a1c9b78a82faf4c3ceb40f28e1d9d5f1380a8ac3f604ffc904f2dcb4099db5b84f2f9542ae4d104ac8f242f4edd8060c8da0aa4f65e8ddc472a4cab2
-  data.tar.gz: f9700cd0991fb27fa03de2a402dd1bfebe0f23cc35d128b5b35ca9115608988ce2f1aeea55cd8525a3c645e1b4a465b0aa0995703e4cb0b58f73bdb7e2efda3f
+  metadata.gz: c9ad9908d2a602e2740748924e5cd83c1f6526eda164c389cde0b22d1b4462d74c7f5eba3809f2c353396500efe5a5447cb22302a0c8db9aaf4fbfa739f1c6a9
+  data.tar.gz: 936cef85543d1089d81323ddd4f11a7b4da2afb44d6f7d7c9921132182e300e963a73ad8e51f8e80a6cf879251caad0c5235cddc0cc73a51dc315f2b5a487744

data/example/henkan-super.rb

@@ -0,0 +1,57 @@
+# 変換/無変換キーを0.5秒以上押してるとALTキーとして扱う。
+# 0.5秒以内でも変換/無変換キーを押しながら他のキーを押すとALTキーとして扱う。
+
+require 'rkremap'
+require 'tmtms_timer'  # gem install tmtms_timer
+
+include Rkremap::KeyCode
+
+rk = Rkremap.new
+rk.grab = true
+
+timer = Tmtms::Timer.new
+jobs = {
+  KEY_HENKAN => nil,
+  KEY_MUHENKAN => nil,
+}
+
+henkan_map = {
+  KEY_HENKAN => KEY_RIGHTMETA,
+  KEY_MUHENKAN => KEY_RIGHTMETA,   # LEFTMETA だとデスクトップ環境のメニューが開いたりするため
+}
+
+rk.match(code: [KEY_HENKAN, KEY_MUHENKAN]) do |event|
+  if event.type == :press
+    job = timer.set(0.5) do
+      rk.synchronize do
+        rk.event(code: henkan_map[event.code], type: :press)
+      end
+    end
+    jobs[event.code] = job
+  elsif event.type == :release
+    if jobs[event.code]&.cancel
+      rk.key(event.code)
+    else
+      rk.event(code: henkan_map[event.code], type: :release)
+    end
+  end
+  event.skip
+end
+
+rk.match(type: :press) do
+  [KEY_HENKAN, KEY_MUHENKAN].each do |code|
+    if jobs[code]&.cancel
+      rk.event(code: henkan_map[code], type: :press)
+    end
+  end
+end
+
+def code2key(code)
+  Rkremap::CODE_KEY[code].to_s.sub(/\AKEY_/, '')
+end
+
+rk.start do |code, mod|
+  key = (mod.select{|_, v| v}.keys + [code]).map{|c| code2key(c)}.join('-')
+  puts key
+  rk.key(code, mod)
+end

data/example/mac-shortcut.rb

@@ -43,14 +43,20 @@ rk.start do |code, mod, app|
     next
   end
 
-  # ALT+[A-Z]/Enter を Ctrl+[A-Z]/Enter に変換
-  if (mod[KEY_LEFTALT] || mod[KEY_RIGHTALT]) && (Rkremap::CODE_KEY[code] =~ /\AKEY_[A-Z]\z/ || code == KEY_ENTER)
-    mod.merge!(mod_disable_alt, {KEY_LEFTCTRL => true})
+  # 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)
+    mod.merge!(mod_disable_meta, {KEY_LEFTCTRL => true})
     mod[KEY_LEFTCTRL] = true
     rk.key(code, mod)
     next
   end
 
+  # Alt + F, B は Ctrl + →, ← に変換
+  if (mod[KEY_LEFTALT] || mod[KEY_RIGHTALT]) && (code == KEY_F || code == KEY_B)
+    rk.key(code == KEY_F ? KEY_RIGHT : KEY_LEFT, mod.merge(mod_disable_alt, {KEY_LEFTCTRL => true}))
+    next
+  end
+
   # Ctrl は他のキーに変換
   if mod[KEY_LEFTCTRL] || mod[KEY_RIGHTCTRL]
     # Ctrl+K は行末まで削除

data/example/tmtms.rb

@@ -1,86 +1,46 @@
 # tmtms 用
 
 require 'rkremap'
-include Rkremap::KeyCode
-
-class State
-  attr_accessor :converted
-
-  def initialize
-    @press = nil
-    @converted = false
-    @thread = nil
-  end
-
-  def press(thread)
-    @press = true
-    @converted = false
-    @thread = thread
-  end
+require 'tmtms_timer'  # gem install tmtms_timer
 
-  def release
-    @press = false
-    @converted = false
-    @thread.kill
-    @thread = nil
-  end
-
-  def pressed?
-    @press
-  end
-end
+include Rkremap::KeyCode
 
 rk = Rkremap.new
 rk.grab = true
 rk.x11 = true
 
-# 変換/無変換キーを0.5秒以上押してるとALTキーとして扱う。
-# 0.5秒以内でも変換/無変換キーを押しながら他のキーを押すとALTキーとして扱う。
-
-state = {
-  KEY_HENKAN => State.new,
-  KEY_MUHENKAN => State.new,
+timer = Tmtms::Timer.new
+jobs = {
+  KEY_HENKAN => nil,
+  KEY_MUHENKAN => nil,
 }
-
 henkan_map = {
-  KEY_HENKAN => KEY_RIGHTALT,
-  KEY_MUHENKAN => KEY_LEFTALT,
+  KEY_HENKAN => KEY_RIGHTMETA,
+  KEY_MUHENKAN => KEY_RIGHTMETA,   # LEFTMETA だとデスクトップ環境のメニューが開いたりするため
 }
 
-rk.match(code: [KEY_HENKAN, KEY_MUHENKAN], type: :press) do |event|
-  thr = Thread.new(event.code) do |code|
-    sleep 0.5
-    rk.synchronize do
-      if state[code].pressed?
-        rk.event(code: henkan_map[code], type: :press)
-        state[code].converted = true
+rk.match(code: [KEY_HENKAN, KEY_MUHENKAN]) do |event|
+  if event.type == :press
+    job = timer.set(0.5) do
+      rk.synchronize do
+        rk.event(code: henkan_map[event.code], type: :press)
       end
     end
+    jobs[event.code] = job
+  elsif event.type == :release
+    if jobs[event.code]&.cancel
+      rk.key(event.code)
+    else
+      rk.event(code: henkan_map[event.code], type: :release)
+    end
   end
-  state[event.code].press(thr)
-  event.skip
-end
-
-rk.match(code: [KEY_HENKAN, KEY_MUHENKAN], type: :release) do |event|
-  if state[event.code].converted
-    rk.event(code: henkan_map[event.code], type: :release)
-    event.skip
-  else
-    rk.event(code: event.code, type: :press)
-    rk.event(code: event.code, type: :release)
-  end
-  state[event.code].release
-end
-
-rk.match(code: [KEY_HENKAN, KEY_MUHENKAN], type: :repeat) do |event|
   event.skip
 end
 
 rk.match(type: :press) do
   [KEY_HENKAN, KEY_MUHENKAN].each do |code|
-    if state[code].pressed?
+    if jobs[code]&.cancel
       rk.event(code: henkan_map[code], type: :press)
-      state[code].converted = true
     end
   end
 end
@@ -139,18 +99,24 @@ rk.start do |code, mod, app|
     next
   end
 
-  # ALT+[A-Z]/Enter を Ctrl+[A-Z]/Enter に変換
-  if (mod[KEY_LEFTALT] || mod[KEY_RIGHTALT]) && (Rkremap::CODE_KEY[code] =~ /\AKEY_[A-Z]\z/ || code == KEY_ENTER)
-    mod.merge!(mod_disable_alt, {KEY_LEFTCTRL => true})
+  # 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)
+    mod.merge!(mod_disable_meta, {KEY_LEFTCTRL => true})
     mod[KEY_LEFTCTRL] = true
     rk.key(code, mod)
     next
   end
 
+  # Alt + F, B は Ctrl + →, ← に変換
+  if (mod[KEY_LEFTALT] || mod[KEY_RIGHTALT]) && (code == KEY_F || code == KEY_B)
+    rk.key(code == KEY_F ? KEY_RIGHT : KEY_LEFT, mod.merge(mod_disable_alt, {KEY_LEFTCTRL => true}))
+    next
+  end
+
   # Ctrl は他のキーに変換
   if mod[KEY_LEFTCTRL] || mod[KEY_RIGHTCTRL]
     # Ctrl+I/O はそのまま
-    if code == KEY_I || code ==KEY_O
+    if code == KEY_I || code == KEY_O
       rk.key(code, mod)
       next
     end

data/lib/rkremap/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rkremap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.0.1
 platform: ruby
 authors:
 - TOMITA Masahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies: []
 description: key remapper
 email:
@@ -18,7 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- example/henkan-alt.rb
+- example/henkan-super.rb
 - example/keylogger.rb
 - example/mac-shortcut.rb
 - example/tmtms.rb
@@ -27,12 +27,12 @@ files:
 - lib/rkremap/keycode.rb
 - lib/rkremap/version.rb
 - lib/rkremap/winattr.rb
-homepage: https://github.com/tmtm/rkremap
+homepage: https://gitlab.com/tmtms/rkremap
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/tmtm/rkremap
-  source_code_uri: https://github.com/tmtm/rkremap
+  homepage_uri: https://gitlab.com/tmtms/rkremap
+  source_code_uri: https://gitlab.com/tmtms/rkremap
   documentation_uri: https://www.rubydoc.info/gems/rkremap
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: key remapper

data/example/henkan-alt.rb

@@ -1,93 +0,0 @@
-# 変換/無変換キーを0.5秒以上押してるとALTキーとして扱う。
-# 0.5秒以内でも変換/無変換キーを押しながら他のキーを押すとALTキーとして扱う。
-
-require 'rkremap'
-include Rkremap::KeyCode
-
-rk = Rkremap.new
-rk.grab = true
-
-class State
-  attr_accessor :converted
-
-  def initialize
-    @press = nil
-    @converted = false
-    @thread = nil
-  end
-
-  def press(thread)
-    @press = true
-    @converted = false
-    @thread = thread
-  end
-
-  def release
-    @press = false
-    @converted = false
-    @thread.kill
-    @thread = nil
-  end
-
-  def pressed?
-    @press
-  end
-end
-
-state = {
-  KEY_HENKAN => State.new,
-  KEY_MUHENKAN => State.new,
-}
-
-MAP = {
-  KEY_HENKAN => KEY_RIGHTALT,
-  KEY_MUHENKAN => KEY_LEFTALT,
-}
-
-rk.match(code: [KEY_HENKAN, KEY_MUHENKAN], type: :press) do |event|
-  thr = Thread.new(event.code) do |code|
-    sleep 0.5
-    rk.synchronize do
-      if state[code].pressed?
-        rk.event(code: MAP[code], type: :press)
-        state[code].converted = true
-      end
-    end
-  end
-  state[event.code].press(thr)
-  event.skip
-end
-
-rk.match(code: [KEY_HENKAN, KEY_MUHENKAN], type: :release) do |event|
-  if state[event.code].converted
-    rk.event(code: MAP[event.code], type: :release)
-    event.skip
-  else
-    rk.event(code: event.code, type: :press)
-    rk.event(code: event.code, type: :release)
-  end
-  state[event.code].release
-end
-
-rk.match(code: [KEY_HENKAN, KEY_MUHENKAN], type: :repeat) do |event|
-  event.skip
-end
-
-rk.match(type: :press) do
-  [KEY_HENKAN, KEY_MUHENKAN].each do |code|
-    if state[code].pressed?
-      rk.event(code: MAP[code], type: :press)
-      state[code].converted = true
-    end
-  end
-end
-
-def code2key(code)
-  Rkremap::CODE_KEY[code].to_s.sub(/\AKEY_/, '')
-end
-
-rk.start do |code, mod|
-  key = (mod.select{|_, v| v}.keys + [code]).map{|c| code2key(c)}.join('-')
-  puts key
-  rk.key(code, mod)
-end