xinput_wrapper 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af1558bd803a67895343a73b2001a42194b5402bc8998d410d9c388b4836a593
-  data.tar.gz: 63e171df3280f2385b404f82673037a2a69e47e758be649253dc6701bc61a089
+  metadata.gz: 8bff9abfb50413d2ef185c472020cd348c53da5512b1f12d92ffbce10b491d2c
+  data.tar.gz: 4066ac4f9896ee680bff3a583bc1caf855c5bb17a43e40ff80aeaa4a9c01f263
 SHA512:
-  metadata.gz: 1874c64eed6da4e726bc9e2e8ae755e0e7e3162cce593db5109aa344210b10f414c4917daecd8e188a28287c4a1d13188b23912e42680354adcc114714476e6b
-  data.tar.gz: 9af8809d460ff318ff88fc6f49e310bff9ad612f8c800a9aceae0efe55d4a8f70f32cac93e704de837f6683cb09ef8a366b029d78283587bd1af6450b7246b33
+  metadata.gz: b8cd2b9b6c92418ed1d517d5f201b7e34e8ac7146ba8857d17b94638f4dd05eb626d8c75b1bd7afcc31ca475e7935302db2cb4015a75049a02fc843f3f278a9f
+  data.tar.gz: ce4b85f5cab6c0f613d0530c630ce227e15df0432e018b1aae15071484e7c72ef79708a21a771db7f5d50d2770aff051b4778f1d9ea9f4edfabdc4b927431459

data/lib/xinput_wrapper.rb

@@ -31,10 +31,14 @@ class XInputWrapper
   #       10 = USB Optical Mouse (locally attached)
   #       11 = Microsoft Wired Keyboard 600 (locally attached)
   #
+  
+  # keys - add the keys you want to be captured. If empty then 
+  #        all keys are captured.
+  
   def initialize(device: nil, verbose: true, lookup: {}, debug: false, 
-                 callback: nil )
+                 callback: nil, keys: [] )
 
-    @callback = callback
+    @callback, @keys = callback, keys
     
     # defaults to QWERTY keyboard layout
     @modifiers = {
@@ -100,6 +104,7 @@ class XInputWrapper
     }.merge(@modifiers).merge(lookup)
     
     @device, @verbose, @debug = device, verbose, debug
+    @mouse_pos = [0, 0]
     
   end
 
@@ -202,7 +207,8 @@ class XInputWrapper
       # type = 13 means a key has been pressed
       if type == RAWKEY_PRESS then
     
-        if @modifiers.include? raw_keys.last or @modifiers.include? keycode then
+        if @modifiers.include? raw_keys.last or \
+            @modifiers.include? keycode then
           raw_keys << keycode
         end
     
@@ -224,10 +230,28 @@ class XInputWrapper
     
             puts key.to_s + ' key presssed' if @verbose
             name = "on_#{key}_key".to_sym
-            method(name).call if self.protected_methods.include? name
+            puts 'name: ' + name.inspect if @debug
+    
+            if private_methods.include? name and (@keys.empty? or \
+                                              @keys.include? key.to_sym) then
+              puts 'before method' if @debug
+              method(name).call 
+            end
             
             keystring = ((key.length > 1 or key == ' ') ? "{%s}" % key : key)    
-            block_given? ? yield(keystring) : on_key_press(keystring, keycode)
+    
+            if block_given? then
+    
+              yield(keystring)
+    
+            else
+
+              if @keys.empty? or @keys.include? key.to_sym then
+                on_key_press(keystring, keycode)
+              end    
+    
+            end
+    
             @callback.on_keypress(keystring, keycode) if @callback
 
           end        
@@ -240,9 +264,13 @@ class XInputWrapper
           if block_given? then
             yield(format_key(keys.last, keys[0..-2]))
           else
-            on_key_press(keys.last, keycode, keys[0..-2])    
-            @callback.on_keypress(keys.last, keycode, keys[0..-2])  if @callback
+    
+            if @keys.empty? or (!@keys.empty? and \
+                                @keys.include? keys.last) then
+              on_key_press(keys.last, keycode, keys[0..-2])                
+            end
           end
+          @callback.on_keypress(keys.last, keycode, keys[0..-2])  if @callback
     
           raw_keys = []
 
@@ -266,8 +294,14 @@ class XInputWrapper
             yield(format_key(key.to_s))
     
           else
-            name = "on_#{key}_key".to_sym
-            method(name).call if self.protected_methods.include? name
+            name = "on_#{key.to_s}_key".to_sym
+            puts 'calling method' if @debug
+    
+            if private_methods.include? name and (@keys.empty? or \
+                                              @keys.include? key.to_sym) then
+              method(name).call #if self.methods.include? name
+            end
+    
             on_key_press(key, keycode)
             @callback.on_keypress(key, keycode) if @callback
           end
@@ -302,10 +336,14 @@ class XInputWrapper
     end
   end
   
-  protected
+  private
+    
+  def message(s)
+    puts 'msg: ' + s
+  end
   
-  def on_control_key()
-    puts 'ctrl key pressed'
+  def on_ctrl_key()
+    message 'ctrl key pressed'
   end  
     
   def on_key_press(key, keycode, modifier=nil)
@@ -360,20 +398,18 @@ class XInputWrapper
   def on_shift_key()  end
   def on_super_key()  end
   
-  def on_f1_key()   end
-  def on_f2_key()   end
-  def on_f3_key()   end
-  def on_f4_key()   end
-  def on_f5_key()   end
-  def on_f6_key()   end    
-  def on_f7_key()   end
-  def on_f8_key()   end
-  def on_f9_key()   end
-  def on_f10_key()  end
-  def on_f11_key()  end
-  def on_f12_key()  end    
-  
-  private
+  def on_f1_key()  message 'f1'  end    
+  def on_f2_key()  message 'f2'  end
+  def on_f3_key()  message 'f3'  end
+  def on_f4_key()  message 'f4'  end
+  def on_f5_key()  message 'f5'  end
+  def on_f6_key()  message 'f6'  end    
+  def on_f7_key()  message 'f7'  end
+  def on_f8_key()  message 'f8'  end
+  def on_f9_key()  message 'f9'  end
+  def on_f10_key() message 'f10' end
+  def on_f11_key() message 'f11' end
+  def on_f12_key() message 'f12' end        
     
   def format_key(key, modifier=[])
     
@@ -382,6 +418,7 @@ class XInputWrapper
     
   end
     
+  def on_alt_key()  message 'alt'  end  
   def on_leftcontrol_key()  on_control_key()  end
   def on_rightcontrol_key() on_control_key()  end     
   def on_left_alt_key()     on_alt_key()      end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xinput_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   B//EUqLB2VKtMmcrYMc2FfbLwllNLY4TRq+/lgVLoDb7oLHsiggYSLZS6lPBIQj/
   YnYsDKwN5siDA79sB0fqq2ml
   -----END CERTIFICATE-----
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32