xkeyrap 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15516786f57425708b4d610b99c2ea14b7fcdc4153c42697cf0f604df919cbe
-  data.tar.gz: b23372edd1e9e521bf7c3a957e49b3ada9e5df948dea5da29d1f257ef03d40cf
+  metadata.gz: 53d65df084224617a2b2e9e7c785c26169a699129b04a6304e3d8dbd692609b0
+  data.tar.gz: 273876407024ab07ae36d093783e7fb509dbd15dabb2c7ca65b0d0f33f928419
 SHA512:
-  metadata.gz: 7ca445bb0c5f0c664a4c0c4e9d4c33643e5e6f85423e56a4f2b32121300ac3f94ef1a86a4a2c5aa0dcd2e8af112effbca3e5b21548c7566e44c6eece4be26870
-  data.tar.gz: 271f0fd8eff5b24be135423917285c45140f8f421796f773f166081ee6682eaf30e4e56d2173b64bc8c0450a352f8a7731631508b65eba4052eecd3e9544d7bf
+  metadata.gz: 76e0757655a469cae1a96329117aa128d05c9a74fdd3b0f89ce733082a8b1de1f61f1018bea08c067f8cafc7dbd500cc1b6c5034637f6805704e6be4ba03f5b5
+  data.tar.gz: 0c73fa4e02107bb8c7543b61dc0d83f4649a2c986436e8843d70b1dede44fb12c873d20fe7769d06d4b2e5b53382ff7c4c7e4f8e11562e7b988513f81f1e58c0

data/bin/xkeyrap

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'xkeyrap'
-device = ARGV[1]
-puts "grab device: #{device}"
-Xkeyrap::Cli.run(device)
+keyboard_device = ARGV[1]
+puts "#########################################"
+puts "grab device: #{keyboard_device}"
+puts "#########################################"
+Xkeyrap::Cli.run(keyboard_device)

data/lib/xkeyrap/command.rb

@@ -1,6 +1,5 @@
 require "evdev"
 require 'libevdev'
-
 require 'uinput/device'
 
 module Xkeyrap

data/lib/xkeyrap/key.rb

@@ -98,6 +98,9 @@ module Xkeyrap
       :KEY_F10,
       :KEY_F11,
       :KEY_F12,
+      :KEY_MUTE,
+      :KEY_VOLUMEDOWN,
+      :KEY_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.6"
+  VERSION = "0.0.8"
 end

data/lib/xkeyrap.rb

@@ -9,10 +9,9 @@ require 'uinput/device'
 
 module Xkeyrap
   class Cli
-
-    def self.run(device)
+    def self.run(keyboard_device)
       display = XlibObj::Display.new(':0')
-      device = Uinput::Device.new do
+      virtual_device = Uinput::Device.new do
         self.name = "Xkeyrap virtual device"
         self.type = LinuxInput::BUS_VIRTUAL
 
@@ -24,12 +23,12 @@ module Xkeyrap
         self.add_event(:EV_SYN)
       end
 
-      keyboard = Evdev.new(device)
+      keyboard = Evdev.new(keyboard_device)
       keyboard.grab
 
-      command = Command.new(device, nil)
+      command = Command.new(virtual_device, nil)
 
-      key_handler = keyboard.on(*Xkeyrap::Key::ALL_KEYS) do |state, key|
+      keyboard.on(*Xkeyrap::Key::ALL_KEYS) do |state, key|
         root_window = display.screens.first.root_window
         top_level_windows = root_window.property(:_NET_CLIENT_LIST_STACKING)
         focused_window = display.focused_window
@@ -57,10 +56,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xkeyrap
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - teddy