rkremap 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93f0a2d7d2c705b779d942618d4da708ef395386bc9529d06cc4c4f644243bac
-  data.tar.gz: bddb932d29c287b3e00105adac03fc420506253c5f00c309dee22da46678502f
+  metadata.gz: 590e1e170524210ac70556095262d1cda5a7a94330d2aaa2927a644a96a431d0
+  data.tar.gz: 97f670607504cac0b34b8e128711eabf8f8a7000edf122350deaf7409d481315
 SHA512:
-  metadata.gz: 41fff4f8444a6c585403ac5a3655eb5b4e1d631332594c95e4d3149a973dced926b4a726cf912522e7ac3c0dcbb4ba0e3ea6461dfe6853e04c1a9086162307e2
-  data.tar.gz: 88b6bdb97c04ed2629d1eac337e89f9854f954daf392b4e0a395e6df94699ff1c7e7e66be78ea3adeb3221fff8a6a88d2d8a38699f503575c5376bbdfcf96556
+  metadata.gz: b9932e445cb887e0a4ee4e7b48c9b29767bee3a44936d99e5eb34e6f873a7c0ce24a1edbdea10da5985744ac29c6871d284896c2497ff0ce82407bb8e16eacdf
+  data.tar.gz: 8f88809a29fa4d7a407807ddd11c8e570258fcb8f760cf4b285c2e35314e61cd18de0c43516d143a63cfc3f71d778fa5e07e97c5eb204ba5687338572f186545

data/README.md

@@ -66,9 +66,10 @@ rkremap.exclude = /touchpad/i
 
 正規表現を設定するとデバイス名がマッチした場合にデバイスを grab する。
 
-### Rkremap#x11
+### Rkremap#window_system
 
-`true` に設定すると X のアプリ名等を取得できる。X 環境下でないなら `false` を設定する。
+`"x11"` に設定すると X のアプリ名等を取得できる。Wayland 環境では動かない。
+`"kde"`, `"kwin"` に設定すると KDE/Kubuntu 環境でアプリメオ等を取得できる。Wayland 環境でも動作する。
 
 ### Rkremap#modifers
 

data/example/hoge.rb

@@ -0,0 +1,11 @@
+require 'rkremap'
+
+include Rkremap::KeyCode
+
+rk = Rkremap.new(*ARGV, mouse: false, exclude: /\AELAN0676/i)
+rk.grab = true
+
+rk.remap(KEY_CAPSLOCK => KEY_LEFTCTRL, KEY_MUHENKAN => KEY_LEFTMETA, KEY_HENKAN => KEY_RIGHTMETA)
+rk.remap(KEY_LEFTMETA => [KEY_LEFTSHIFT, KEY_LEFTCTRL])
+rk.match{|ev| rk.event(code: ev.code, type: ev.value); ev.skip }
+rk.start

data/example/tmtms.rb

@@ -4,13 +4,9 @@ require 'rkremap'
 
 include Rkremap::KeyCode
 
-rk = Rkremap.new(*ARGV, mouse: true, exclude: /\AELAN0676/i)
+rk = Rkremap.new(*ARGV, mouse: true, exclude: /\AELAN0676|\ALenovo TrackPoint Keyboard II/i)
 rk.grab = true
-rk.x11 = true
-
-# rkremap がシステムに認識されたら中ボタンスクロールを有効にする
-sleep 0.1 until system "xinput | grep -q rkremap"
-system "xinput set-prop pointer:rkremap 'libinput Scroll Method Enabled' 0 0 1"
+rk.window_system = 'kde'
 
 # HENKAN, MUHENKAN を 0.5秒以上押したら SUPER とする
 rk.remap(hold: 0.5, map: {

data/lib/rkremap/evdev.rb

@@ -16,6 +16,7 @@ class Rkremap
       @capa = nil
       @uinput = nil
       @grab = false
+      io
     end
 
     def inspect
@@ -35,7 +36,7 @@ class Rkremap
     # @return [String]
     def name
       return @name if @name
-      buf = ''
+      buf = +''
       io.ioctl(EVIOCGNAME, buf)
       @name = buf.sub(/\0+$/, '')
     end
@@ -61,7 +62,7 @@ class Rkremap
       @is_keyboard = false
       return false if name =~ /\Arkremap\0*\z/
 
-      buf = ''
+      buf = +''
       io.ioctl(EVIOCGBIT_ANY, buf)
       return false if buf.unpack1('C')[EV_KEY] == 0
       @is_keyboard = capable?(KeyCode::KEY_0) && capable?(KeyCode::KEY_9) &&
@@ -74,7 +75,7 @@ class Rkremap
       @is_mouse = false
       return false if name =~ /\Arkremap\0*\z/
 
-      buf = ''
+      buf = +''
       io.ioctl(EVIOCGBIT_ANY, buf)
       return false if buf.unpack1('C')[EV_KEY] == 0
       @is_mouse = capable?(KeyCode::BTN_MOUSE)

data/lib/rkremap/evdev_list.rb

@@ -56,6 +56,8 @@ class Rkremap
           stat = 'ignored'
         end
         puts "detect: #{ev.name} (#{ev.path}) #{stat}" if $VERBOSE
+      rescue => e
+        warn "#{e}: #{path}"
       end
     end
 

data/lib/rkremap/remap.rb

@@ -1,5 +1,9 @@
 class Rkremap
   class Remap
+    def self.timer
+      @timer ||= Tmtms::Timer.new
+    end
+
     # @param map [Hash] from => to
     # @param hold [Numeric] seconds
     def initialize(rk, map:, hold:)
@@ -43,13 +47,12 @@ class Rkremap
     # @param hold [Numeric] seconds
     def setup_holding_event(map, hold)
       keycodes = map.keys.flatten
-      timer = Tmtms::Timer.new
       jobs = map.transform_values{nil}
 
       @rk.match(code: keycodes, type: :press) do |event|
         map.each do |from, to|
           if from == event.code
-            jobs[event.code] = timer.set(hold) do
+            jobs[event.code] = Remap.timer.set(hold) do
               @rk.synchronize{ make_press_event(to) }
             end
             event.skip

data/lib/rkremap/version.rb

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

data/lib/rkremap/winattr.rb

@@ -1,83 +1,19 @@
 require 'fiddle/import'
+require_relative 'winattr_x11'
+require_relative 'winattr_kde'
 
 class Rkremap
   # アプリの name, class, title を取得する
   class WinAttr
-    def initialize
-      @app_win = {}
-      @display = X11.XOpenDisplay(nil) or raise "Cannot open display: #{ENV['DISPLAY']}"
-      @buf = ' '*8
-    end
-
-    # @return [Integer] Window
-    def focus_win
-      win = X11::Window.malloc(Fiddle::RUBY_FREE)
-      X11.XGetInputFocus(@display, win, @buf)
-      win.window
-    end
-
-    # @return [Array<window, name, class>]
-    def app_win(window)
-      return @app_win[window] if @app_win[window]
-      class_hint = X11::XClassHint.malloc(Fiddle::RUBY_FREE)
-      parent = X11::Window.malloc(Fiddle::RUBY_FREE)
-      children = X11::Pointer.malloc(Fiddle::RUBY_FREE)
-      win = window
-      while win > 0
-        class_hint.name = nil
-        class_hint.class_name = nil
-        X11.XGetClassHint(@display, win, class_hint)
-        X11.XQueryTree(@display, win, @buf, parent, children, @buf)
-        X11.XFree(children.ptr)
-        break unless class_hint.name.null? && class_hint.class_name.null?
-        win = parent.window
-      end
-      unless class_hint.name.null?
-        win_name = class_hint.name.to_s
-        X11.XFree(class_hint.name)
-      end
-      unless class_hint.class_name.null?
-        win_class = class_hint.class_name.to_s
-        X11.XFree(class_hint.class_name)
+    def self.for(win_system)
+      case win_system.to_s
+      when 'x11'
+        WinAttrX11.new
+      when 'kde', 'kwin', 'kubuntu'
+        WinAttrKDE.new
+      else
+        raise "unknown system: #{win_system}"
       end
-      @app_win[window] = [win, win_name, win_class]
     end
-
-    # @return [String]
-    def app_title(window)
-      win = app_win(window)[0]
-      return '' if win == 0
-      prop = X11::XTextProperty.malloc(Fiddle::RUBY_FREE)
-      text_list = X11::Pointer.malloc(Fiddle::RUBY_FREE)
-      X11.XGetWMName(@display, win, prop)
-      X11.Xutf8TextPropertyToTextList(@display, prop, text_list, @buf)
-      ptr = text_list.ptr
-      return '' if ptr.null?
-      title = ptr.ptr.to_s.force_encoding('utf-8')
-      X11.XFreeStringList(text_list.ptr)
-      title
-    end
-  end
-
-  module X11
-    extend Fiddle::Importer
-    dlload 'libX11.so.6'
-    typealias 'XID', 'unsigned long'
-    typealias 'Window', 'XID'
-    typealias 'Status', 'int'
-    typealias 'Atom', 'unsigned long'
-    Window = struct ['Window window']
-    Pointer = struct ['void *ptr']
-    XClassHint = struct ['char *name', 'char *class_name']
-    XTextProperty = struct ['unsigned char *value', 'Atom encoding', 'int format', 'unsigned long nitems']
-
-    extern 'Display* XOpenDisplay(char*)'
-    extern 'int XGetInputFocus(Display*, Window*, int*)'
-    extern 'int XGetClassHint(Display*, Window, XClassHint*)'
-    extern 'Status XQueryTree(Display*, Window, Window*, Window*, Window**, unsigned int*)'
-    extern 'Status XGetWMName(Display*, Window, XTextProperty*)'
-    extern 'int Xutf8TextPropertyToTextList(Display*, XTextProperty*, char***, int*)'
-    extern 'int XFree(void*)'
-    extern 'void XFreeStringList(char**)'
   end
 end

data/lib/rkremap/winattr_kde.rb

@@ -0,0 +1,67 @@
+require 'dbus'
+
+class Rkremap
+  class WinAttrKDE
+    attr_reader :focus_win
+
+    def initialize
+      @app_win = {}
+
+      bus = DBus.session_bus
+      kwin_service = bus.service('org.kde.KWin')
+      kwin_scripting = kwin_service.object('/Scripting')
+      kwin_scripting.introspect
+      full_path = File.expand_path('./kwin_script.js', __dir__)
+      if kwin_scripting.isScriptLoaded(full_path)[0]
+        kwin_scripting.unloadScript(full_path)
+      end
+      kwin_scripting.loadScript(full_path)
+      kwin_scripting.start
+
+      create_service
+    end
+
+    def class_name(window)
+      @app_win[window][:resource_class]
+    end
+
+    def app_title(win_id)
+      @app_win[win_id][:caption]
+    end
+
+    def set(id, caption, resource_name, resource_class)
+      @app_win[id] = {caption: caption, resource_name: resource_name, resource_class: resource_class}
+      @focus_win = id
+    end
+
+    def remove(id)
+      @app_win.delete id
+    end
+
+    def create_service
+      winattr = self
+
+      bus = DBus.session_bus
+      service = bus.request_service('net.tmtms.Rkremap')
+      klass = Class.new(DBus::Object) do
+        dbus_interface 'net.tmtms.RkremapInterface' do
+          dbus_method :windowActivated, 'in id:s, in caption:s, in resourceName:s, in resourceClass:s' do |id, caption, resource_name, resource_class|
+            winattr.set(id, caption, resource_name, resource_class)
+          end
+          dbus_method :windowRemoved, 'in id:s' do |id|
+            winattr.remove(id)
+          end
+        end
+      end
+      obj = klass.new('/net/tmtms/Rkremap')
+      service.export(obj)
+
+      Thread.new do
+        loop = DBus::Main.new
+        loop << bus
+        loop.run
+      end
+      sleep 0.1
+    end
+  end
+end

data/lib/rkremap/winattr_x11.rb

@@ -0,0 +1,89 @@
+require 'fiddle/import'
+
+class Rkremap
+  # アプリの name, class, title を取得する
+  class WinAttrX11
+    def initialize
+      @app_win = {}
+      @display = X11.XOpenDisplay(nil) or raise "Cannot open display: #{ENV['DISPLAY']}"
+      @buf = ' '*8
+    end
+
+    # @return [Integer] Window
+    def focus_win
+      win = X11::Window.malloc(Fiddle::RUBY_FREE)
+      X11.XGetInputFocus(@display, win, @buf)
+      win.window
+    end
+
+    # @return [Array<window, name, class>]
+    def app_win(window)
+      return @app_win[window] if @app_win[window]
+      class_hint = X11::XClassHint.malloc(Fiddle::RUBY_FREE)
+      parent = X11::Window.malloc(Fiddle::RUBY_FREE)
+      children = X11::Pointer.malloc(Fiddle::RUBY_FREE)
+      win = window
+      while win > 0
+        class_hint.name = nil
+        class_hint.class_name = nil
+        X11.XGetClassHint(@display, win, class_hint)
+        X11.XQueryTree(@display, win, @buf, parent, children, @buf)
+        X11.XFree(children.ptr)
+        break unless class_hint.name.null? && class_hint.class_name.null?
+        win = parent.window
+      end
+      unless class_hint.name.null?
+        win_name = class_hint.name.to_s
+        X11.XFree(class_hint.name)
+      end
+      unless class_hint.class_name.null?
+        win_class = class_hint.class_name.to_s
+        X11.XFree(class_hint.class_name)
+      end
+      @app_win[window] = [win, win_name, win_class]
+    end
+
+    # @return [String]
+    def class_name(window)
+      app_win(window)[2]
+    end
+
+    # @return [String]
+    def app_title(window)
+      win = app_win(window)[0]
+      return '' if win == 0
+      prop = X11::XTextProperty.malloc(Fiddle::RUBY_FREE)
+      text_list = X11::Pointer.malloc(Fiddle::RUBY_FREE)
+      X11.XGetWMName(@display, win, prop)
+      X11.Xutf8TextPropertyToTextList(@display, prop, text_list, @buf)
+      ptr = text_list.ptr
+      return '' if ptr.null?
+      title = ptr.ptr.to_s.force_encoding('utf-8')
+      X11.XFreeStringList(text_list.ptr)
+      title
+    end
+  end
+
+  module X11
+    extend Fiddle::Importer
+
+    dlload 'libX11.so.6'
+    typealias 'XID', 'unsigned long'
+    typealias 'Window', 'XID'
+    typealias 'Status', 'int'
+    typealias 'Atom', 'unsigned long'
+    Window = struct ['Window window']
+    Pointer = struct ['void *ptr']
+    XClassHint = struct ['char *name', 'char *class_name']
+    XTextProperty = struct ['unsigned char *value', 'Atom encoding', 'int format', 'unsigned long nitems']
+
+    extern 'Display* XOpenDisplay(char*)'
+    extern 'int XGetInputFocus(Display*, Window*, int*)'
+    extern 'int XGetClassHint(Display*, Window, XClassHint*)'
+    extern 'Status XQueryTree(Display*, Window, Window*, Window*, Window**, unsigned int*)'
+    extern 'Status XGetWMName(Display*, Window, XTextProperty*)'
+    extern 'int Xutf8TextPropertyToTextList(Display*, XTextProperty*, char***, int*)'
+    extern 'int XFree(void*)'
+    extern 'void XFreeStringList(char**)'
+  end
+end

data/lib/rkremap.rb

@@ -29,6 +29,7 @@ class Rkremap
   attr_accessor :grab
   attr_accessor :modifiers
   attr_accessor :x11
+  attr_accessor :window_system
   attr_accessor :auto_detect
   attr_accessor :exclude
   attr_accessor :mouse
@@ -48,6 +49,7 @@ class Rkremap
     @uinput = Uinput.new
     @grab = false
     @x11 = false
+    @window_system = @x11 ? 'x11' : nil  # 'x11' or 'kde'
     @modifiers = [
       KEY_LEFTCTRL,  KEY_RIGHTCTRL,
       KEY_LEFTSHIFT, KEY_RIGHTSHIFT,
@@ -82,7 +84,8 @@ class Rkremap
     @evdev_list.grab = @grab
     @evdev_list.detect_loop
     @mod_state = @modifiers.map.to_h{|m| [m, false]}
-    winattr = WinAttr.new if @x11
+    @window_system = 'x11' if @x11
+    winattr = WinAttr.for(@window_system) if @window_system
     @events = []
     while true
       @keys = []
@@ -134,7 +137,7 @@ class Rkremap
       write_event(mcode, state ? 1 : 0)
     end
     block.call
-    mod_diff(mod).each do |mcode, _|
+    mod_diff(mod).each_key do |mcode|
       write_event(mcode, @mod_state[mcode] ? 1 : 0)
     end
   end
@@ -186,7 +189,7 @@ class Rkremap
 
     # @return [String, nil]
     def class_name
-      @winattr.app_win(@win)[2] if @winattr && @win
+      @winattr.class_name(@win) if @winattr && @win
     end
 
     # @return [String, nil]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rkremap
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - TOMITA Masahiro
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tmtms_timer
@@ -33,6 +32,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - example/henkan-super.rb
+- example/hoge.rb
 - example/keylogger.rb
 - example/mac-shortcut.rb
 - example/tmtms.rb
@@ -45,6 +45,8 @@ files:
 - lib/rkremap/uinput.rb
 - lib/rkremap/version.rb
 - lib/rkremap/winattr.rb
+- lib/rkremap/winattr_kde.rb
+- lib/rkremap/winattr_x11.rb
 homepage: https://gitlab.com/tmtms/rkremap
 licenses:
 - MIT
@@ -53,7 +55,6 @@ metadata:
   source_code_uri: https://gitlab.com/tmtms/rkremap
   documentation_uri: https://www.rubydoc.info/gems/rkremap
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,8 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.7.0.dev
 specification_version: 4
 summary: key remapper
 test_files: []