xinput_wrapperplus 0.2.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91c9092b58275c23427c5cd5bfac4e81e54a1ec47bb8c64a1cabe6a8ecf5d804
-  data.tar.gz: 708883cdf9983f0be1d7c39ba253a17460d593b475ec2f253234a884a4c32647
+  metadata.gz: ec734043c5d8c8572b0d5da6a555637b5c486c8526e69b80bef1591b4b77fe9b
+  data.tar.gz: 49366c4e05296bfe79deb135eaac2e49544e03dcbbab386252c48cd59d057572
 SHA512:
-  metadata.gz: 2e8cdc3d622d876fff697f4333cd8e2528913273d378bafdb66642e43153299db17eb8b589c1aa61661670ca12b283ef964118a54df6379790f43f6014929f4b
-  data.tar.gz: be802787718245967459f5e854540317788479bbf1118872bdb8a5471c7424094e6f4364367049311494ace1844daffc591d758a4ae3eb554a005d99ba604457
+  metadata.gz: 138bacf2e34aa013c374afe6932d554b88e57d45c7fe1b6268727435a82950fda96232165952fbaeccf5a507848942c2d880602afdb4dd123f88e8b0683aff6c
+  data.tar.gz: 901bf06e728f93af941487a998f7aa28ba3696063b240ecc5e0a13fec63ea712b0b1eba89a80b6294caa982a89ebbbcdecf46445d238e52fbc370685b8808c31

data/lib/xinput_wrapperplus.rb

@@ -10,45 +10,98 @@ require 'xinput_wrapper'
 class XInputWrapperPlus < XInputWrapper
 
   def initialize(device: '3', host: 'sps', port: '59000', 
-                 topic: 'input/keyboard', verbose: true, lookup: {}, 
-                 debug: false, capture_all: false)
+                 topic: 'input', verbose: true, lookup: {}, 
+                 debug: false, capture_all: false, keys: [], 
+                 keypress_detection: true)
 
     super(device: device, verbose: verbose, lookup: lookup, 
-          debug: debug)
+          debug: debug, keys: keys)
+    
     @topic, @capture_all = topic, capture_all
+    @keypress_detection = keypress_detection
+    
     @sps = SPSPub.new host: host, port: port
     @sk = SecretKnock.new short_delay: 0.25, long_delay: 0.5, 
                               external: self, verbose: verbose, debug: debug
     @sk.detect timeout: 0.7
 
-  end
+    @a = [] # Used to store mouse gestures
+    @timer, @t2 = nil , Time.now - 30
 
+  end
 
   def knock()
     puts 'knock' if @verbose
   end
-
-  def message(msg)
+  
+  def message(msg, subtopic=:keyboard)
     
     puts ':: ' + msg.inspect if @verbose        
     
     return if msg.strip.empty?
     
-    @sps.notice "%s: %s" % [@topic, msg]
+    topic = [@topic, subtopic].compact.join('/')
     
-  end  
+    @sps.notice "%s: %s" % [topic, msg]
+    
+  end    
   
-  protected
+  private  
+  
+  def anykey_press()
+    
+    if @keypress_detection and (Time.now > @t2 + 30) then
+      message 'keypress detected', nil
+      @t2 = Time.now
+    end
+    
+  end
   
   def on_control_key()
     puts 'inside on_control_key' if @debug
     @sk.knock
   end
   
-  def on_key_press(key, keycode)
+  def on_gesture(a)
+    
+    puts 'inside on_gesture' if @debug    
+    points = @a.map {|coords| coords.map {|x| x}.join(',') }.join(' ')
+    message points, 'motion'
+    
+  end
+  
+  def on_key_press(key, keycode, modifier=[])
+    
     puts 'inside on_key_press' if @debug
-    message key.to_s if @capture_all
+    
+    message format_key(key, modifier) if @capture_all
+    
     @sk.reset if @lookup[keycode] != :control
+    
+  end
+  
+  def on_mousemove(x,y)
+    
+    if @debug then
+      puts "on_mousemove() x: %s y: %s" % [x, y]
+    end
+    
+    @timer.exit if @timer
+
+    @a << [x,y]
+
+
+    @timer = Thread.new do 
+      
+      sleep 0.25
+      puts 'inside timer' if @debug
+      
+      on_gesture(@a) if @a.length > 6 and @a.length < 36
+      @a = []
+
+    end
+    
+    
   end
   
   def on_super_key()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xinput_wrapperplus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.2
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwODA1MTQyNTE1WhcN
-  MTkwODA1MTQyNTE1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRaOsM
-  SPx7uw3NaAkRf7RbFf6TeFvRsuZIH+I3mb3hGgLFNPeFS4uXdnQSnbg0RT2fZMuB
-  J/eL88+4KAh8jaLsM+KlRCUoJi6e6kvYYHANlefmtLHUJfF862XoqHbT2C0PxU8b
-  zj+Jsoi8Mchiu5yH2cAXh3pzD8xrkI+OOhTiS+oJjVvTJOiIEelgfRw1XrmhTNtz
-  /k/G1RPPXnrbJ6RJFThRgXhUCen6vc5ZO3vYRmvMWwW+Lu5YI1U+J5pEY4CYuYR3
-  yIKEETbi2Xk+lktKr2UVp1AHlb8kXvCV8SBAM2RMWnM9AWzPldrOX+nPb6E8u3fj
-  EDdS0kfwSh2T04NVAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFIi6Dzmms9ESGJPV0s5nAz1x6Gd6MCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAHiYmg7O+Kjbmg/gFetT
-  hraHXAUwue0Cfr3FHT9R1AOwEt7SYoVojaeMzf2r9goU/e42Pe4b4BP6EqAf5xod
-  VqBCJX5cOGDAyiViCbsjfV9S3GIwCldzSexqyB8c72vvkZJQrQSMlwKI6A1irvim
-  7yg7yx3Hxk4KbFzuIERk932EwcjjDqYw654DztKPpnEyFZlTZT+mZOYaFghFcJVS
-  wUvyr4SCo2/eIt0l3NBHnjsEbYCYQ22pUgEtcBsh9bm9A+jto5Qs7ws/jGlxX9Sm
-  SK2jOkRNlfF9rY8O76O35JOdWJTBmi/UxMmyH0ISaWkk7/5E8Q1ZElsb7WR/Nlpk
-  DHs=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwODI1MTI0NjA1WhcN
+  MjEwODI1MTI0NjA1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDUcQ9Q
+  hWoREpFe1iiNNIh72yJEQOy7wlCjQN7hf57/0yqU1Lb37mfRdSQXEhAWJakWxPn/
+  VhTr9lhh7XgIIrDDMIIM0+qe0Ean+ctTQSl0kVTD0gz2yJ1Gn4S96vf69YeoLOr/
+  rnidQqQgMJ2yh6fmwbsXNLpBMhd2ZU0ly1ly6b6jkH4gkJLSSPakZ4cc2tbTcqsu
+  goh5h16uc/Mwmk/f/UCsSfuvyRM5gFTthfkXloGTBsvznN8xtnZlwmU+8Jwjp4HQ
+  HUfYvDtIwyCW44osWP+Av9IVNCv2OjJJgTc8EG58HW/rTLc+Nk7i7BqHAbRV9SJs
+  eVBLz/CUmi1yYy93vQtCwjwhOYpx+b12k2bISlNcHETzkHMdue0w1qXqdgD3kxkF
+  k/aLXRYaHAGK73hiJMtYjOQ6+WmzApeE+PfoZpL7HjAb0Emh+OdyjNMtPjl3sZbI
+  s/C5Cm+p7kDw8J3BmPFsboc4nQ51qni1z4G0xP0s3Ka4HvUrRvXsMYc08CMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUi8p2+J9R
+  y5R2KBWLSfNYrFOHyfQwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAJpNOwQqItRT8dE38iQ9/J7x8fsSb9mBqKMwrqc9/
+  5H8bKu49A+UDOlaS1ESvRAVKLL3mSlhxE56OUdfZsFHaoRyZkKp285l4HVgcmxJD
+  CrTqNIFDAMEnaG4FFwE3xcTHSCnSdxpVfgztz/KjLkwlWTumi7U3AQhlx3Yy8u4F
+  5GnJ8Xnx94luWBMUlLPvIZo0gCHqomPAtd0OgGqmjsoAiZ90eYBieClDXUkHcQ9U
+  OZnar7W/SgfG8LGk+QYsffaVIZqzXT4vGyNBv3Yzt2Wrt7u/ZLNXgpaGS44kOBOU
+  C8PaoyXBQBUZNZQEYY0rKHqH/8yjKHHgueW1J2tULyk8FQEY2HVWXK/mSwE31S8n
+  8rGJOGPSxtF8oNfS74KVO99PqLk4bp3vHjZp/jt07cQr2QiHyHq3hRBrA/U8WU6j
+  MAr0EaAbP4GPbdRnYZObrq03xJQOARWVRbH726l6usXEpiepoBKFXfqGNXX6DDt/
+  2f3lRa47HGk7I26OxNboAPZQ
   -----END CERTIFICATE-----
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sps-pub
@@ -76,22 +81,22 @@ dependencies:
   name: xinput_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -118,7 +123,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. Publishes an SPS message whenever