xinput_wrapper 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 290701cfce88a11462cb860805bf014f6a6d0d366c7efaa4f2516423f1da87e1
-  data.tar.gz: e82be2d004f3cfa0e358b162741c63058f9db8717e20d23e86c40e5e0ed5c179
+  metadata.gz: 7685727622dac6285e86dcf8095525fde1d6d129b7f210aed3ad2512138efdaa
+  data.tar.gz: f404c6286c440432f6b9ad26db6f8b6d36fc6e3ea0d6141baa439bf74c572e16
 SHA512:
-  metadata.gz: 429ce14f3defe07737301513180730f9c406fb163cde5d9d0a064170f5b184ce64776c798b151fa049c33fb9a8d0d7eab2e72d92a48e7d248e3a792643be308f
-  data.tar.gz: e67b773e97c10adfeb940e7e000f480c782ef975151526efaf6dfd6cce93f6f51008a40aa3b4d147501c64e2ce5f1122d42b503805336d6e722f19711287abbe
+  metadata.gz: 9ce3aaf5e903c982201b1ac8802b109f8388083b0e9f0de02454811e4300069a043b84a6bdf66db2604c70dec57c3a0564747d908beadf2b0216d49e4b9b0dd2
+  data.tar.gz: 9c2ae2545e99ba3d1a13789f5d7c24c11b15011f7a623169b1a7bfee9883a88091fcf9d182ead686df0564e9bdd384b0f8918f40f9a0374aca2f08c8a5533c1d

data.tar.gz.sig

@@ -1,2 +1,2 @@
-��
�l�z�1����SĖ����8�n�tT�D�,*t�������ښ��8�,��=��{�>"6F�X�&����v�8b��I����t
�6��8���1jL[l�t�kl�`���ivR�A"
-��%��uO*d#9�־�c����v�vpS͟a�.��OG� յ�?�IJ�	^��T������1�����H������A��be?��%<V���8���"����;��0�1�0?�Y�	*h	���C�ŋe�WYѻ��������0��U�/���"�����&����,a$Aa�T]��m<n=X��T@�/��)ur,��b׹Z�}�m{���3��p�n�o�������������G'�'~
���3b���"<W�
+�r�&��� �(�B&C��S�����Y���e�J�{����)�s����c�=]y`r?�JG�h&�t&�X���gBQ;�:�^/�u.m:����?�Bzy�$/�	?�زms�&M��g1XC'y@�DUk:V� �)T�5�K���L��i�d��6]"�}���ɭ��p[����U�\�����$Yp�h�U�c��Q���qQâA�}��	K�ҡA��7z�����'��0N�K�k-
+>:��&ŏ1�Y@H��#Z�U���U��~�@� ܠg��X���Hn��x0q�Z�G�

data/lib/xinput_wrapper.rb

@@ -2,13 +2,31 @@
 
 # file: xinput_wrapper.rb
 
+# Captures keyboard or mouse events using program xinput.
+
+
+# note: To display a list of xinput devices, run the 
+#       xinput program without any options.
+
 require 'c32'
 
 
+MOTION = 6
+RAWKEY_PRESS = 13
+RAWKEY_RELEASE = 14
+
+
 class XInputWrapper
   using ColouredText
 
-  def initialize(device: '3', verbose: true, lookup: {}, debug: false )
+  # device list:
+  #       3 = Virtual core keyboard
+  #       4 = Virtual core XTEST pointer (active when using VNC)
+  #       5 = Virtual core XTEST keyboard (active when using VNC)
+  #       10 = USB Optical Mouse (locally attached)
+  #       11 = Microsoft Wired Keyboard 600 (locally attached)
+  #
+  def initialize(device: nil, verbose: true, lookup: {}, debug: false )
 
     # defaults to QWERTY keyboard layout
     @modifiers = {
@@ -28,8 +46,8 @@ class XInputWrapper
       31=>:i, 32=>:o, 33=>:p, 34=>:"[", 35=>:"]", 36=>:enter, 38=>:a, 39=>:s, 
       40=>:d, 41=>:f, 42=>:g, 43=>:h, 44=>:j, 45=>:k, 46=>:l, 47=>:";", 
       48=>:"'", 49=>nil, 52=>:z, 53=>:x, 54=>:c, 55=>:v, 56=>:b, 57=>:n, 
-      58=>:m, 59=>:",", 60=>:".", 61=>:/,  65=>:" ",
-      9 => :escape,
+      58=>:m, 59=>:",", 60=>:".", 61=>:/,  65=>:space,
+      9 => :esc,
       66 => :capslock,
       67 => :f1,
       68 => :f2,
@@ -42,18 +60,18 @@ class XInputWrapper
       75 => :f9,
       76 => :f10,
       77 => :numlock,
-      78 => :scroll_lock,
+      78 => :scrolllock,
       95 => :f11,
       96 => :f12,
-      107 => :print_screen,
+      107 => :sysrq, # print_screen
       110 => :home,
-      111 => :up_arrow,
-      112 => :pgup,
-      113 => :left_arrow,
-      114 => :right_arrow,
-      115 => :end,
-      116 => :down_arrow,
-      117 => :pgdown,
+      111 => :up, # arrow keys
+      112 => :pageup,
+      113 => :left, # arrow keys
+      114 => :right, # arrow keys
+      115 => :end, 
+      116 => :down, # arrow keys
+      117 => :pagedown,
       121 => :mute,
       122 => :vol_down,
       123 => :vol_up,
@@ -78,27 +96,84 @@ class XInputWrapper
   end
 
   def listen()
-
+    
     command = "xinput test-xi2 --root #{@device}"
 
     type = 0
     raw_keys = []
+    t1 = Time.now
+    lines = []
 
     IO.popen(command).each_line do |x|
  
-      #print "GOT ", x
-      raw_type = x[/EVENT type (\d+)/,1]
+      print "GOT ", x
+      if x[/EVENT type \d \(Motion\)/] and (Time.now > (t1 + 0.06125)) then 
+
+        type = x[/EVENT type (\d+)/,1].to_i
+    
+        r = lines.join[/^\s+root: (\d+\.\d{2}\/\d+\.\d{2})/,1]
+
+        if r then
+      
+          x1, y1 = r.split('/').map(&:to_f) 
+          puts "x1: %s y1: %s" % [x1, y1] if @debug
+          on_mousemove(x1, y1)
+          t1 = Time.now  
+    
+        end        
+
+        lines = [x]                                                                
+
+      elsif x[/EVENT type \d+ \(RawKey(?:Release|Press)\)/]
 
-      type = raw_type.to_i unless raw_type.nil?
-      next unless type == 13 or type == 14
+        type = x[/EVENT type (\d+)/,1].to_i
+
+        lines = [x]
+
+      elsif type == MOTION or type == RAWKEY_PRESS or type == RAWKEY_RELEASE
+
+        lines << x
+    
+        if x == "\n" then
+          case lines.first[/(?<=EVENT type )\d+/].to_i
+          when RAWKEY_PRESS
+      
+            r = lines.join[/detail: (\d+)/,1]
+
+            keycode = r.to_i if r
+
+            type = lines.join[/EVENT type (\d+)/,1] .to_i
+      
+          when RAWKEY_RELEASE
+      
+            r = lines.join[/detail: (\d+)/,1]
+
+            keycode = r.to_i if r
+
+            type = lines.join[/EVENT type (\d+)/,1] .to_i          
+      
+          end    
+
+    
+        else
+            next
+        end
     
-      keycode = x[/detail: (\d+)/,1].to_i
-      next if keycode == 0
+      else
+        next
+      end
+    
+      next unless keycode
+      puts 'keycode: ' + keycode.inspect if @debug
           
       # type = 13 means a key has been pressed
-      if type == 13 then
+      if type == RAWKEY_PRESS then
     
-        raw_keys << keycode
+        if @modifiers.include? raw_keys.last or @modifiers.include? keycode then
+          raw_keys << keycode
+        end
+    
+        next if @modifiers.include? keycode
 
         puts 'raw_keys: ' + raw_keys.inspect if @debug
 
@@ -113,23 +188,54 @@ class XInputWrapper
           puts ('key: ' + key.inspect).debug if @debug
 
           if key then
+    
             puts key.to_s + ' key presssed' if @verbose
             name = "on_#{key}_key".to_sym
             method(name).call if self.protected_methods.include? name
-            on_key_press key, keycode
+            
+            keystring = ((key.length > 1 or key == ' ') ? "{%s}" % key : key)    
+            block_given? ? yield(keystring) : on_key_press(keystring, keycode)
+
           end        
     
         else
 
           keys = raw_keys.map {|kc| @lookup[kc] }
           puts ('keys: ' + keys.inspect) if @debug
-          on_key_press(keys.last, keycode, keys[0..-2])    
+    
+          if block_given? then
+            yield(format_key(keys.last, keys[0..-2]))
+          else
+            on_key_press(keys.last, keycode, keys[0..-2])    
+          end
+    
+          raw_keys = []
 
         end
     
 
 
-      elsif type == 14
+      # a key has been released
+      elsif type == RAWKEY_RELEASE
+    
+        # here we are only looking to detect a 
+        # single modifier key press and release
+    
+        key = @lookup[keycode]
+    
+        unless raw_keys.empty? then
+          puts key.to_s + ' key presssed' 
+    
+          if block_given? then
+    
+            yield(format_key(key.to_s))
+    
+          else
+            name = "on_#{key}_key".to_sym
+            method(name).call if self.protected_methods.include? name
+            on_key_press(key, keycode)
+          end
+        end
     
         index = raw_keys.rindex(keycode)
         raw_keys.delete_at index if index
@@ -145,13 +251,21 @@ class XInputWrapper
     puts 'ctrl key pressed'
   end  
     
-  def on_key_press(key, keycode, modifier)
+  def on_key_press(key, keycode, modifier=nil)
     
     if @debug then
       puts ('key: ' + key.inspect).debug
     end
     
   end
+    
+  def on_mousemove(x,y)
+    
+    if @debug then
+      puts "on_mousemove() x: %s y: %s" % [x, y]
+    end
+    
+  end
   
   def on_shift_key()  end
   def on_super_key()  end
@@ -171,6 +285,13 @@ class XInputWrapper
   
   private
     
+  def format_key(key, modifier=[])
+    
+    modifier.any? ? "{%s}" % (modifier + [key.to_s]).join('+') \
+          : key.to_s
+    
+  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.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,52 +11,52 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMjEwMTU1NTM1WhcN
-  MjAwMjEwMTU1NTM1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQD2pELS
-  hfHN+He5s77qpnUO4j6GDr1B9PDIKqJDBz+kJCUGXsLzyHnKK8iIblXtETyIJn9F
-  euzS6ohPh64xfBcKrnF7bSUAXsdC/PZIsNgvSp4Vuguxpe6wDHfaqBhV2KcOjGrP
-  tnZRvJJHWBczBzMw+BAj0d5Zp5QZaVXDx3mN13t2j6tUncwLF3NYIlaFA7lN4uuV
-  hiFyqlkk+ELO8eptDF5Wkel5ZjtALo9jOq04KAlImZ7cnFLD1zbAXWiKPyEvSAeL
-  fGONgtYGEBwIKKeisGTucndYa1iwQOnFLjCixclGH+6+YInlbHUzl/JrFHSEXIYb
-  0jU2pHEu+xQlB2xdKiJF6Z/JWWabJ+hyMifxnyPYLW53QGV5fu2uAHDVUCplwhBW
-  hOBeqmV8SCjX7aYytN7TiqO4Th2kP2tPLQqynFQ3ceNiTcjk1fkliXlv+lc8IFiS
-  25oy9Th0M3O7+rs11i1eeaAlvrZ0TWv5qFpJUrMB53UpndLxeroiPw/AzocCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUQLWJJ/fU
-  p6suCssS39/w2O9MQhUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwODAzMjEwMTE2WhcN
+  MjEwODAzMjEwMTE2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDdnN5k
+  jxSdi5vMTqhRRJ8yFAV3MYUs/W6NU+rMUk1uqTC/J+fFox8tg7t4VzQoQq539Onk
+  5iPFJhwo3jAYKIyc+LX4e3CtQMdrheyY/XkaTSu1yPR+c4lT8nhKUf4gI28hNXcx
+  lNekrvzzXBVZMGs5F+gKzOYUFS+i0jGPaVaison+iaGVLcjc2/t3AGIQeOHo7QYv
+  6Sswkj9Er4jkwJKHGAvLvh+KTcm/aImIfV4v5FUm6xJMi42lsDWbaRyACtAtNgKF
+  cl/pMlb3d5Si3vIcbKlktHR2K5KLtBuFqu/vWdlKygYzpnr3rWjAls8wr2fv6WiS
+  BqX3XVtZB4Fh/xriLY3Fj3Qo9RWuGf9S3BIGGxcnsr53bsO1zKXvbNr5UzP9d0+8
+  dF5lJ4bu8rw524nYypy39Is9PlHI7L6nxQjy82AmzloxEc31nYM7FF2pjkStv5H5
+  zfb4PVsCblnUstufNJWKrg32E2wbzXhzq8+E/U7Y7FM4zABWcyeHtt4Mv0MCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU+hzRpZTx
+  g/xK+Tn1+5WHz7CK1y8wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAAuFxNNh+nIt4Ba3bWUilYAVhEYROr32uTWFmyL8w
-  T4bMAe8OC9PzuIAg3C4jzks008Fbfi7Hcm4Pqc548kbavWtLquzdNwNqasywcweb
-  FIIGeYpRy2BmHeP8+RK66T+HfdAGGmy60L/q5kTJtV1g9wDTg5glxv7OvlShgKTM
-  ZgaJi9JerKv6dsB6r1OnnVy73BfQ0eiN2/vwDHCB9Op2E5JKFqUlklGaKvbEsMoV
-  Ou4ilgqq7OROhrul809YLlc0VHRfAiaOqeO5l1Ccfq9Q2LUZwGhtw+EIKSrgWQZA
-  1aSaQX/s+LpAVRGJlWrVa+uQ21aUdItSdkKaRNK4MxQHPu8s/9sgeZRMEO5wJc7i
-  bvgBqmvgsZwFmSRWE1K/PusL86uaYCw5pTWA+BquQ7taMwhGKqdDlHLp+SQ1Wd82
-  rryowfoo6nLmegcIZjm+zz/gkT/0udwMMVm2gwo0bIRQuQOLmd7IUNzYQKZQOGMA
-  g4ETbI8IEC3VCaoECdunsS3t
+  BgkqhkiG9w0BAQsFAAOCAYEAXg+9mfaTHPcbez7P0XnwGL0C4zdPwHtBUXioPwjP
+  okklRkFzMQnxArm8U9557g8cXY//vKp/cFBdCExE8lLxAOB9gHswJju0g99Yx7gY
+  iEV3TWv5qkLQ+n8zdTd8TxEyjWB6ZXOJcE+/cTq9Ly1j4bhf9QTdul02TBukEp6d
+  opP5/Yvt1GX0ED98olew/pm+KoKKNkcJzSgEH44O+pCfTi4h2STOFRvXVYaB3AH8
+  hpuUFcbxzPhBxOChGPAGZLaf7zurw8B2Q1vP75RV9gJ1M6NKU6Hlb6vMJQ3jz8qv
+  GIVFoKMCcJH2EImrG47doRVhQPIlxfz7d3f+FdYgnp7wtuFi/byklu1D2G8ZE8Ax
+  1s9Njv/guBMNkw+RV6IlpMtT0yeVvHeYTt0tPKeyrtBrSfsexA3393T7To6Ms+1s
+  B//EUqLB2VKtMmcrYMc2FfbLwllNLY4TRq+/lgVLoDb7oLHsiggYSLZS6lPBIQj/
+  YnYsDKwN5siDA79sB0fqq2ml
   -----END CERTIFICATE-----
-date: 2019-04-07 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A wrapper for the Linux utility xinput.