xinput_wrapper 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f4e856f73b9e7dd55af1a5b49118539aa67816d22efedb6e0a413628d7eef55
-  data.tar.gz: d38a486aca20bfe0a41f20236f0ec998d7216c4dc78c00fda115f03a85247029
+  metadata.gz: 9e4522c710fedfbd87d06378e9e3833ac5c1ed33ea8f39b2f7626b028c81e787
+  data.tar.gz: a5cabb6c182af563bb98dc1dce22b56ddda54c22552ac0a20b2e0b9e83b90f3e
 SHA512:
-  metadata.gz: 4df624c748de48612aebc920ad2e9788159570ba294f70113dfe6fcc528db7716cdbafa11230e4e087bde2e4cee1d71e68ae426f48c1b486c1ba7cf491e03742
-  data.tar.gz: 5edec0ee6f3df041053db4a1289ea032b8094da8541b997c1758dcb81cc14d1973521c7f2d1c67b77e8ee72ed6927b96f5c740932cf7d6cedec499ba23c7b791
+  metadata.gz: d824a72ef9e9752631513d260204c81e397036e5e1c99822c2ea95a02375f059191cc89021e9999ef52db4d969b2a65ff85f5fbc6fa0344cf4a0d48cf26314a7
+  data.tar.gz: 6d9528dd576ba565fec74bcf2d305304a882785b336d8e85b2b44df657b697a0cd3ee45c4fb914e1b0a4d2587b3075b5d3bc2d37edb0267995bf4df65edd76e6

data/lib/xinput_wrapper.rb

@@ -5,6 +5,11 @@
 require 'c32'
 
 
+MOTION = 6
+RAWKEY_PRESS = 13
+RAWKEY_RELEASE = 14
+
+
 class XInputWrapper
   using ColouredText
 
@@ -83,20 +88,73 @@ class XInputWrapper
 
     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]
+      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 = 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 = raw_type.to_i unless raw_type.nil?
-      next unless type == 13 or type == 14
+            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
+    
+      else
+        next
+      end
     
-      keycode = x[/detail: (\d+)/,1].to_i
-      next if keycode == 0
+      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
     
         if @modifiers.include? raw_keys.last or @modifiers.include? keycode then
           raw_keys << keycode
@@ -145,7 +203,7 @@ class XInputWrapper
 
 
       # a key has been released
-      elsif type == 14
+      elsif type == RAWKEY_RELEASE
     
         # here we are only looking to detect a 
         # single modifier key press and release
@@ -187,6 +245,14 @@ class XInputWrapper
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xinput_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,28 @@ cert_chain:
   rryowfoo6nLmegcIZjm+zz/gkT/0udwMMVm2gwo0bIRQuQOLmd7IUNzYQKZQOGMA
   g4ETbI8IEC3VCaoECdunsS3t
   -----END CERTIFICATE-----
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-05-08 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: []