xinput_wrapper 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a65e18160d628995917a2edbe88191d9af2463d392e323d73be0c9d18125bb1e
-  data.tar.gz: a64ca44e47e455dc7e164ad3a07a0d45b9f0287ef5edc3d8ea718110af589755
+  metadata.gz: bd5d3382f535c9b0cc5fd6def2b5b7bad34237f9eb2e602fef6c9ed21d59e107
+  data.tar.gz: fe866a13173f38b75027676b7583470c6d350527f1d1fd0eccd978d135fb8e93
 SHA512:
-  metadata.gz: e5dbaa2fbe33f068c910f5e3b81585541487b0cca4dd8fd84599705754010727c10024e8be94de12694a576e1c794ebd9350336782c404e2f9b9694753ac81ff
-  data.tar.gz: 3a438de9f271059e494d7d39ffb1d9ed6d51247e7795033be4534aa9596da1f79719c7f92d30a3b4d9fda0bfe38cbd6a0140689b48fdf9828bcd7ddd27496abb
+  metadata.gz: 4cfc590d0eab22723afe694344a339cf24b7d08989f73c270a6106320806db47442c23607b3f8afd2b1fa63d8a7f79f48fde3c86c4fc6e32cbee60beb06dc4ff
+  data.tar.gz: 767186f2fde2a191249cea820d6eb6887d32691917b4fe48954be4f3034c56923b5a26a52fe64bb3cc79eeaf30bbeeeaa725d3b88e2bad65fbe57d290633ab22

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-��rʡ�r�N~����`Rߊ�n.M�K�&�ce��R���G:��C����zd�����ê�
� I�%�ɝf����A�����#�4Y��3��&[3�-u髯'�Y�9oۏEЕWdQ{mĉ
-��Zw�FA���p<w�n�ln�@Ŏ��:�tԉ��]�4��ge'?�J�N�Zŕ~����w;N�E�f{d��@���n�k�d����"���A�gZ �[�w0_�ŋ�?2ߟ��MeC�;x�s�|E&͚�����=�l������A�P�o�y�^@��>?�~z���_��iLG���F�Hk!҃�
-1�S��_f�����#Ź�.sr��)e����̀V��ۛe�؃ϑ�sV{K����'Ǘ���G
+ZR�ҘeT�jZE�(��k�y�&�&0K�j3�տ"��9��.ü�%��3u��m�ޘ0����{ҿ,#�ZC>R#�z!�I�5.�	isL=ad�k����L��.N�6^�A��,���Ő�L��Y���	����t����BW��jYۨ\~Mr�a/���?�����T��	n

data/lib/xinput_wrapper.rb

@@ -98,7 +98,11 @@ class XInputWrapper
       # type = 13 means a key has been pressed
       if type == 13 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,26 +117,55 @@ 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
             
-            keystring = ((key.length > 1 or key == ' ') ? "{%s}" % key : key)
-            on_key_press keystring, 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
     
 
 
+      # a key has been released
       elsif type == 14
     
+        # 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
 
@@ -173,6 +206,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.1
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   rryowfoo6nLmegcIZjm+zz/gkT/0udwMMVm2gwo0bIRQuQOLmd7IUNzYQKZQOGMA
   g4ETbI8IEC3VCaoECdunsS3t
   -----END CERTIFICATE-----
-date: 2019-04-07 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32