xinput_wrapper 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2487ccda5f3bb7af5fa098b2e521edf98c7d1e4
-  data.tar.gz: d8c547a5da867932cc4cf8611bb2efb0e1d59dbe
+  metadata.gz: b6e1b5f2e6105f33b76431173f63596ae7e96461
+  data.tar.gz: 19ff16d496d5f940ae43fe37d839ae84b6dfbe50
 SHA512:
-  metadata.gz: 37f5a0d2175879a3797bfc7b4bccf4070982b08cb01c99d73da62ea1b7ca1ee93a597ff1a43fe5a463d09110a0db6b210a36903030f0cda9ad3f54f07052b711
-  data.tar.gz: 9a3efa111712126a516d19220d31254e259536079ecf474ffea5a160161de59c2cc616de83eb376f5345d4055712c6f3359b42ab65fa391cb47a0e931042e187
+  metadata.gz: bf611312a0c7b010621c6b3505afce6816370798f92f069e3d76eb60635610e38e9a1ce9b3753d112fe9816f9096a8603325f4cfb66b0701532dc70e3b83fc1b
+  data.tar.gz: 9af14598e6af1c75d4c22d610c7a6c950480eb27e81e4513da42a5e4020e50e81cbf6c3f181ad0a475b57f39eec46451bf2d8fa51e4519e40316102be0badc7a

data/lib/xinput_wrapper.rb

@@ -3,49 +3,40 @@
 # file: xinput_wrapper.rb
 
 
-require 'sps-pub'
-require 'secret_knock'
-
 
 class XInputWrapper
 
-  def initialize(device: '3', host: 'sps', port: '59000', 
-                 topic: 'input/keyboard', verbose: true, lookup: {}, 
-                 interval: nil, debug: false)
+  def initialize(device: '3', verbose: true, lookup: {}, debug: false )
 
     @lookup = {
-      37 => :control,
-      50 => :lshift,
-      133 => :super
+      37 => :control,      
+      50 => :shift,
+      62 => :shift,
+      67 => :f1,
+      68 => :f2,
+      69 => :f3,
+      70 => :f4,
+      71 => :f5,
+      72 => :f6,
+      73 => :f7,
+      74 => :f8,
+      75 => :f9,
+      76 => :f10,
+      95 => :f11,
+      96 => :f12,            
+      105 => :control,
+      133 => :super,
+      134 => :super
     }.merge(lookup)
-
-    @device, @topic, @verbose, @debug = device, topic, verbose, debug
-    @sps = SPSPub.new host: host, port: port
-    @sk = SecretKnock.new short_delay: 0.25, long_delay: 0.5, 
-                              external: self, verbose: verbose, debug: debug
-    @interval = interval
-    @time = Time.now if interval
-    
-  end
-
-  def knock()
-    puts 'knock' if @verbose
-  end
-
-  def message(msg)
     
-    puts ':: ' + msg.inspect if @verbose        
+    @device, @verbose, @debug = device, verbose, debug
     
-    return if msg.strip.empty?
-    
-    @sps.notice "%s: %s" % [@topic, msg]
   end
 
   def listen()
 
     command = "xinput test-xi2 --root #{@device}"
-    @sk.detect timeout: 0.7
-    sk = @sk
+
     type = 0
 
     IO.popen(command).each_line do |x|
@@ -64,28 +55,39 @@ class XInputWrapper
         puts 'keycode: ' + keycode.to_s if keycode > 0 and @verbose
         puts '>keycode: ' + keycode.to_s  if @debug
         
-        if @interval then
-          
-          if Time.now > @time + @interval then
-            @sps.notice "%s: key pressed" % [@topic] 
-            @time = Time.now
-          end
-        end
-
-        case @lookup[keycode]
-        when :lshift
-          puts 'left shift' if @verbose
-        when :control
-          puts 'control' if @verbose
-          sk.knock
-        when :super
-          puts 'super key pressed'  if @verbose
-          message 'super key pressed' 
-        end
-        
-        sk.reset if @lookup[keycode] != :control
+        on_key_press(keycode)
+
+        key = @lookup[keycode]
+        puts 'key: ' + key.inspect if @debug
+
+        if key then
+          puts key.to_s + ' key presssed' if @verbose
+          method("on_#{key}_key".to_sym).call
+        end        
 
       end
     end
   end
+  
+  protected
+  
+  def on_control_key()       end  
+  def on_key_press(keycode)  end
+  
+  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    
+    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xinput_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -32,47 +32,7 @@ cert_chain:
   5bdH23akkNF4CA==
   -----END CERTIFICATE-----
 date: 2018-08-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: sps-pub
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.5
-- !ruby/object:Gem::Dependency
-  name: secret_knock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+dependencies: []
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -103,7 +63,5 @@ rubyforge_project:
 rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: A wrapper for the Linux utility xinput. Publishes an SPS message whenever
-  the super key is pressed as well as publishing a deciphered message when the control
-  key is pressed more than once
+summary: A wrapper for the Linux utility xinput.
 test_files: []