xinput_wrapperplus 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17f7c9962bda5c450ccf2255914fcc3d578f4bfd1881c4297b728764afcaeb0d
-  data.tar.gz: f9e67bdc4325d252e5dacb74b75c2c0ebae60252d52c2900e577c2d0cadc0e23
+  metadata.gz: e7895cc28fe6d61322a6ec002f8dcded48d448c5dea63b4264181d9cd4a06a6f
+  data.tar.gz: 6368b33575a4e730fc58e42cdd4b4f50ed9ce728061bbb073f9ad30a28c65822
 SHA512:
-  metadata.gz: 5352fc684255d867db2432619244b302e6a34a98acc536402a4da073b3ee660667caf33c307fdfffc860dd886f2cca6f6168c4d78978d541c5689e427f4b37e4
-  data.tar.gz: 170ed7c1a421a4f0a0c1ac1b86d7b2cec01ff72169d48725eb8e2051e3dbb5aa80e353e33ec6965e82b81a203dce4f6b83f80b56627b2c8c0780dbbdd77e8d19
+  metadata.gz: 85d621312320338465c881475f038054a758f43666469295bf4f572dadb23a299d64a673ce66ce8aab1777d85aefe896711c9df8f2f9a242d40d2e6f2912e6cd
+  data.tar.gz: 5932216f417c697613ede7355ed9b30e42e50479e21f5e679f6913a52aa4137b522ace656aedb8e3935509408d3abd1fe842d7c57896f8dec910967d890dca3c

data/lib/xinput_wrapperplus.rb

@@ -3,6 +3,7 @@
 # file: xinput_wrapperplus.rb
 
 
+require 'wmctrl'
 require 'sps-pub'
 require 'secret_knock'
 require 'xinput_wrapper'
@@ -12,7 +13,8 @@ class XInputWrapperPlus < XInputWrapper
   def initialize(host: 'sps', port: '59000', 
                  topic: 'input', verbose: true, lookup: {}, 
                  debug: false, capture_all: false, keys: [], 
-                 keypress_detection: true, motion_detection: true)
+                 keypress_detection: true, motion_detection: true, 
+                 window_context: false)
 
     puts 'before super'
     super(verbose: verbose, lookup: lookup, 
@@ -22,15 +24,17 @@ class XInputWrapperPlus < XInputWrapper
     @topic, @capture_all = topic, capture_all
     @keypress_detection = keypress_detection
     @motion_detection = motion_detection
+    @window_context = window_context
 
     @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
+    @interval = 120
 
     @a = [] # Used to store mouse gestures
-    @timer, @t2 = nil , Time.now - 30
+    @timer, @t2 = nil , Time.now - @interval
 
   end
 
@@ -46,7 +50,18 @@ class XInputWrapperPlus < XInputWrapper
     
     topic = [@topic, subtopic].compact.join('/')
     
-    @sps.notice "%s: %s" % [topic, msg]
+    if @window_context then      
+
+      wm = WMCtrl.display
+      win = wm.windows.find {|x| x.active}
+      
+      @sps.notice "%s: %s in %s" % [topic, msg, win.title]
+      
+    else
+      
+      @sps.notice "%s: %s" % [topic, msg]
+      
+    end
     
   end    
   
@@ -54,7 +69,7 @@ class XInputWrapperPlus < XInputWrapper
   
   def anykey_press()
     
-    if @keypress_detection and (Time.now > @t2 + 30) then
+    if @keypress_detection and (Time.now > @t2 + @interval) then
       message 'keypress detected', nil
       @t2 = Time.now
     end
@@ -90,7 +105,7 @@ class XInputWrapperPlus < XInputWrapper
       puts "on_mousemove() x: %s y: %s" % [x, y]
     end
     
-    if @motion_detection and (Time.now > @t2 + 30) then
+    if @motion_detection and (Time.now > @t2 + @interval) then
       message 'motion detected', nil
       @t2 = Time.now
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xinput_wrapperplus
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,32 +11,52 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   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
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMDIwMjE0NTAxWhcN
+  MjIxMDIwMjE0NTAxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDToY1O
+  pXBMvrOeQQ+WsEh1bdzbNsZ6H00RGjnrRd5sH4w7B6NtrtWL5lqvVh82H54kUrLC
+  THtj0dKXeMeau/0SrWnAkmCoYvo9fkhU/HolRuQj3y4IlTQt7yVMV3Gs2T9PZBd1
+  4qkjk6AMxpl32J2feUTHxEULQYbpUU+4uxzVfvc5LUmGuCuirqFSTxp/tHgLBAtJ
+  SH56z9Lb8pUO+YDFTocPuhAtlHVs+RkgRhcu2xubwveuJkBFPwSu40LqWOdm0Wrr
+  QC2RlVPTgQbi/8VLjDmtPn+Xxd/fY/yWbBvLdZ1Es2ube0SHBUKlL4zFkrZgXF7F
+  qHhCBavPfKRTr7FQtaYebYNe9qDI/TTGJTRMBSAGFNcJe5gCCppvz5WZdnwAtSPl
+  ywfKrNQP2mkgfRKj2Potx64HzwrAPPCXjhx8OPP39C8uYf3Dm8tUQhQVBGH/lS/s
+  nSVQEx9AIdFuyi8c7gvA9gfKcAj6LwIp3fwfze7B6fBgDWG6Ht3iW5G2KBUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUo1hUdvyD
+  BLC0iRk0YjLl7MQBhTkwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAJpNOwQqItRT8dE38iQ9/J7x8fsSb9mBqKMwrqc9/
-  5H8bKu49A+UDOlaS1ESvRAVKLL3mSlhxE56OUdfZsFHaoRyZkKp285l4HVgcmxJD
-  CrTqNIFDAMEnaG4FFwE3xcTHSCnSdxpVfgztz/KjLkwlWTumi7U3AQhlx3Yy8u4F
-  5GnJ8Xnx94luWBMUlLPvIZo0gCHqomPAtd0OgGqmjsoAiZ90eYBieClDXUkHcQ9U
-  OZnar7W/SgfG8LGk+QYsffaVIZqzXT4vGyNBv3Yzt2Wrt7u/ZLNXgpaGS44kOBOU
-  C8PaoyXBQBUZNZQEYY0rKHqH/8yjKHHgueW1J2tULyk8FQEY2HVWXK/mSwE31S8n
-  8rGJOGPSxtF8oNfS74KVO99PqLk4bp3vHjZp/jt07cQr2QiHyHq3hRBrA/U8WU6j
-  MAr0EaAbP4GPbdRnYZObrq03xJQOARWVRbH726l6usXEpiepoBKFXfqGNXX6DDt/
-  2f3lRa47HGk7I26OxNboAPZQ
+  BgkqhkiG9w0BAQsFAAOCAYEArMhKCPkUIxpPt+qIys3kaK6KwThCvLvOE6I8ZRNR
+  OOsmvfVxGueXwsy1v8m5IAO9RD7M+n0ZnbL3prELC61WUGAfcg+uq1QeyNubFGp1
+  tNAq4aYRNFISXbbls8ltN4Rc02FiD+qQWKusnJZNV9KKPPTUK80z7krnJ92IG/1X
+  7dD8X2mTlYn/GaEcUdErzFdfUY6W1NhJtpduExV/zQn1cVLyawnqtYXZVNNHs0yn
+  fF4zMYg8zwyC3NoiBsw4ttOafbSKBIsPxdQlte4dGy6dr8PeFEj17BoezHtA4Wy4
+  TyZy0Mz4faHE1ZX8pePjcEfytF8tA4mY5ZSzA9at4AdItmqsXMEs+2Vq1ldHbe4i
+  BSsNM6FTzF8Cs7g66gOjumXRnWXhpndrJ0xgg9eDd+GT4VZd9hrp8c8XhV/G79MQ
+  u085o8gsCVOJC4P40gYteNm1nfOXtueJsOiLWvvwVUPNWEclrXGotC6M9oQ05tIw
+  WRJtwtBTRvaGT4z1I+tAttJt
   -----END CERTIFICATE-----
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-wmctrl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: sps-pub
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +118,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -123,7 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: A wrapper for the Linux utility xinput. Publishes an SPS message whenever