xkeyrap 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2fe8eb39aa1e50cf8d7ad39e3823ff4b45f1eea0be50a2b5c7f755d54c5162
-  data.tar.gz: 36c2677e59b9044b89f7531cebeea83a9fbaf3af8c10cd29a70f1c5549d06eca
+  metadata.gz: 42dd7731a5793052a73353b312fc26967590df30eddc805859eac4ec6e1e4553
+  data.tar.gz: 884417d5725d2fb0b8b6335dbdcefebf24b3b7e2235f28a8050042daa7636652
 SHA512:
-  metadata.gz: '086a216bb4c9b12225cf5168b86b83726655e4abab7b6cba8a4e05a07c65b5c406da959708cf3730f20a6e66fe481d4e209d22dd3df543d57d57fa4fd1535dcc'
-  data.tar.gz: 2c4666c41b40c1ff0aa427c9f9b249eeeeb00d7b6b8ac014235ecf2cbfd399cf964d9197ddd7ff6f37acf4daa9f39c42b0c44144a0f506a1da1c0274ef488f5e
+  metadata.gz: 7e87fbfa4dd4934c72d501e05948b1a6bf4825a73edc37908757d693a507e04d3ea5bccc272ac3072034d01cda3dfe00eab1147395463f1ba5040ea312b7c882
+  data.tar.gz: 73f4d87697fac3316c30871b45f6b0550010d0a9f1984c217a12a47bb1b0d9b15127ccb8d9e020a1b68a3db7ddc5824a920fefe2a09b3fd18485c958c0cc74d4

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    xkeyrap (0.0.1)
-      evdev
-      libevdev
-      uinput-device
-      xlib-objects
+    xkeyrap (0.0.4)
+      evdev (~> 1.0)
+      libevdev (~> 1.0)
+      uinput-device (~> 0.4)
+      xlib-objects (~> 0.7)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,27 +1,3 @@
 # Xkeyrap
 
 Xkeyrap 是一个受 [https://github.com/mooz/xkeysnail](xkeysnail) 启发的项目。
-
-如果你和我有一样的 [https://www.songofcode.com/posts/linux-shortcuts-for-macos/](改键需求), 可以使用下面的配置文件：
-
-``` json
-{
-  "Firefox": {
-    "KEY_LEFTALT": "KEY_LEFTCTRL",
-    "KEY_CAPSLOCK": "KEY_LEFTALT"
-  },
-  "Google-chrome": {
-    "KEY_LEFTALT": "KEY_LEFTCTRL",
-    "KEY_CAPSLOCK": "KEY_LEFTALT"
-  }
-}
-```
-
-## Usage
-
-``` shell
-sudo gem install xkeyrap # need sudo
-
-xhost +SI:localuser:root
-sudo xkeyrap config.json
-```

data/bin/xkeyrap

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'xkeyrap'
-
-input_device = ARGV[1] # '/dev/input/event4'
-config_file  = ARGV[2]  # 'config.json'
-
-Xkeyrap::Cli.run(input_device, config_file)
+device = ARGV[1]
+puts "grab device: #{device}"
+Xkeyrap::Cli.run(device)

data/lib/xkeyrap/command.rb

@@ -1,38 +1,43 @@
 require "evdev"
 require 'libevdev'
 require 'uinput/device'
-require 'json'
 
 module Xkeyrap
   class Command
+    attr_accessor :keys
+    attr_accessor :modifier_keys
     attr_accessor :output_device
     attr_accessor :config
 
-    def initialize(device, config_file)
-      self.config = default_config.merge(JSON.parse(config_file)) rescue default_config
+    def initialize(device, config)
+      self.keys = Set.new
+      self.modifier_keys = Set.new
       self.output_device = device
+      unless config
+        self.config = {
+          global: {
+            KEY_CAPSLOCK: :KEY_LEFTCTRL,
+            KEY_LEFTCTRL: :KEY_CAPSLOCK,
+            KEY_LEFTALT:  :KEY_LEFTMETA,
+            KEY_LEFTMETA: :KEY_LEFTALT
+          },
+          "Firefox": {
+            KEY_LEFTALT: :KEY_LEFTCTRL,
+            KEY_CAPSLOCK: :KEY_LEFTMETA,
+            KEY_LEFTMETA: :KEY_LEFTALT  
+          }
+        }
+      end
     end
 
     def receive(state, key, wm_class_name = "global")
-      key = key.to_sym
-      puts "input: #{state} ... #{key}"
+      puts "origin: #{wm_class_name} | #{state} | #{key}"
       sub_json = self.config[wm_class_name.to_sym] || self.config[:global]
       mapped_key = sub_json[key] || self.config[:global][key] || key
-      puts "output: #{state} ... #{mapped_key}"
-      self.output_device.send_event(:EV_KEY, mapped_key.to_sym, state)
+      puts "mapped: #{wm_class_name} | #{state} | #{mapped_key}"
+      self.output_device.send_event(:EV_KEY, mapped_key, state)
       self.output_device.send_event(:EV_SYN, :SYN_REPORT)
     end
 
-    def default_config
-      {
-        global: {
-          KEY_CAPSLOCK: :KEY_LEFTCTRL,
-          KEY_LEFTCTRL: :KEY_CAPSLOCK,
-          KEY_LEFTALT:  :KEY_LEFTMETA,
-          KEY_LEFTMETA: :KEY_LEFTALT
-        }
-      }
-    end
-
   end
 end

data/lib/xkeyrap/key.rb

@@ -98,6 +98,9 @@ module Xkeyrap
       :KEY_F10,
       :KEY_F11,
       :KEY_F12,
+      :MUTE,
+      :VOLUMEDOWN,
+      :VOLUMEUP
     ]
 
     ALL_KEYS = NUMBER_KEYS + MISC_KEYS + LETTER_KEYS + MODIFIER_KEYS + FUNCTION_KEYS

data/lib/xkeyrap/version.rb

@@ -1,3 +1,3 @@
 module Xkeyrap
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/xkeyrap.rb

@@ -10,7 +10,7 @@ require 'uinput/device'
 module Xkeyrap
   class Cli
 
-    def self.run(input_device, config_file)
+    def self.run(device)
       display = XlibObj::Display.new(':0')
       device = Uinput::Device.new do
         self.name = "Xkeyrap virtual device"
@@ -24,10 +24,14 @@ module Xkeyrap
         self.add_event(:EV_SYN)
       end
 
-      keyboard = Evdev.new(input_device)
+      keyboard = Evdev.new(device)
+
+
+      #puts keyboard.supports_event? :KEY_ENTER
+      #puts keyboard.supports_event? :KEY_KPENTER
       keyboard.grab
 
-      command = Command.new(device, config_file)
+      command = Command.new(device, nil)
 
       key_handler = keyboard.on(*Xkeyrap::Key::ALL_KEYS) do |state, key|
         root_window = display.screens.first.root_window
@@ -57,10 +61,14 @@ module Xkeyrap
       parent   = FFI::MemoryPointer.new :Window
       number   = FFI::MemoryPointer.new :uint
       children = FFI::MemoryPointer.new :pointer
-      q = Xlib.XQueryTree(display.to_native, focused_window.to_native, root, parent, children, number)
-      parent_window_id = parent.read(:int)
-      parent_window = top_level_windows.select {|tlw| tlw.id == parent_window_id }.first
-      parent_window.property("WM_CLASS")[1]
+      begin
+        q = Xlib.XQueryTree(display.to_native, focused_window.to_native, root, parent, children, number)
+        parent_window_id = parent.read(:int)
+        parent_window = top_level_windows.select {|tlw| tlw.id == parent_window_id }.first
+        parent_window.property("WM_CLASS")[1]
+      rescue
+        "global"
+      end
     end
   end
 end

data/xkeyrap.gemspec

@@ -1,3 +1,4 @@
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "xkeyrap/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xkeyrap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - teddy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler