xinput_wrapper 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac27a60670da5820cc957691a85474ba963d345611df35c10348244272dae29e
-  data.tar.gz: 368fef34875b6cc10d7d4b3bf8579b2aa5d63893be67a7070769eb43d64b9038
+  metadata.gz: 290701cfce88a11462cb860805bf014f6a6d0d366c7efaa4f2516423f1da87e1
+  data.tar.gz: e82be2d004f3cfa0e358b162741c63058f9db8717e20d23e86c40e5e0ed5c179
 SHA512:
-  metadata.gz: '0182e899d596be18ca79f281895bff6969449ecc041a3c74d82c98f0e3a2739675d56e0139357c9ca934bcba580e3a2b4cc46fcc238df821ad62d1dc46bf0a10'
-  data.tar.gz: 0c8e5df53df45004ed59aef917cf9357f88c4589134b2f963a846504dc8c71eabda6b6812dbd471c6361346ef8348cf8acc07a452504cf8fd985cc9b0320cb21
+  metadata.gz: 429ce14f3defe07737301513180730f9c406fb163cde5d9d0a064170f5b184ce64776c798b151fa049c33fb9a8d0d7eab2e72d92a48e7d248e3a792643be308f
+  data.tar.gz: e67b773e97c10adfeb940e7e000f480c782ef975151526efaf6dfd6cce93f6f51008a40aa3b4d147501c64e2ce5f1122d42b503805336d6e722f19711287abbe

data.tar.gz.sig

@@ -1,2 +1,2 @@
-����e���z�L>��g�n�9#�i��T�o�]y��i%@z��|�\B�aɡ�C;��G�'?�����n�شA�g�0���?�8�<ܸ�3�a�C�œ�����0�������ن��v�Ӓ��N�v���ֽ�����R�o��Գ��޳A�.]��h&�ׅ��a��������Ԩ����)$@H}�CZI�����l�e�co��a���P�s���wj�^W��*�_�G�Ƿs��������3��;!v@��r�z��#��O�i���O��~
-��(�뻪�4*kخP����SnȾ�"	���y�dt	�#���ϧr?����;9O�y�����}���rZ���V�
+��
�l�z�1����SĖ����8�n�tT�D�,*t�������ښ��8�,��=��{�>"6F�X�&����v�8b��I����t
�6��8���1jL[l�t�kl�`���ivR�A"
+��%��uO*d#9�־�c����v�vpS͟a�.��OG� յ�?�IJ�	^��T������1�����H������A��be?��%<V���8���"����;��0�1�0?�Y�	*h	���C�ŋe�WYѻ��������0��U�/���"�����&����,a$Aa�T]��m<n=X��T@�/��)ur,��b׹Z�}�m{���3��p�n�o�������������G'�'~
���3b���"<W�

data/lib/xinput_wrapper.rb

@@ -11,19 +11,25 @@ class XInputWrapper
   def initialize(device: '3', verbose: true, lookup: {}, debug: false )
 
     # defaults to QWERTY keyboard layout
-    
+    @modifiers = {
+      62 => :shift,     # right control
+      37 => :ctrl,   # left control 
+      50 => :shift,     # left shift
+      64 => :alt,       # alt shift
+      92 => :alt,       # right alt  
+      105 => :ctrl,  # right control     
+      133 => :super,    # left super (windows key)
+      134 => :super     # right super (windows key)
+    }
     @lookup = {
       10=>:"1", 11=>:"2", 12=>:"3", 13=>:"4", 14=>:"5", 15=>:"6", 16=>:"7", 
       17=>:"8", 18=>:"9", 19=>:"0", 20=>:-, 21=>:"=", 22=>:backspace, 
       23=>:tab, 24=>:q, 25=>:w, 26=>:e, 27=>:r, 28=>:t, 29=>:y, 30=>:u, 
-      31=>:i, 32=>:o, 33=>:p, 34=>:"[", 35=>:"]", 36=>nil, 38=>:a, 39=>:s, 
+      31=>:i, 32=>:o, 33=>:p, 34=>:"[", 35=>:"]", 36=>:enter, 38=>:a, 39=>:s, 
       40=>:d, 41=>:f, 42=>:g, 43=>:h, 44=>:j, 45=>:k, 46=>:l, 47=>:";", 
       48=>:"'", 49=>nil, 52=>:z, 53=>:x, 54=>:c, 55=>:v, 56=>:b, 57=>:n, 
-      58=>:m, 59=>:",", 60=>:".", 61=>:/, 62=>:right_shift, 65=>:" ",
+      58=>:m, 59=>:",", 60=>:".", 61=>:/,  65=>:" ",
       9 => :escape,
-      37 => :control,
-      50 => :left_shift,
-      64 => :left_alt,
       66 => :capslock,
       67 => :f1,
       68 => :f2,
@@ -37,10 +43,8 @@ class XInputWrapper
       76 => :f10,
       77 => :numlock,
       78 => :scroll_lock,
-      92 => :right_alt,
       95 => :f11,
       96 => :f12,
-      105 => :control,
       107 => :print_screen,
       110 => :home,
       111 => :up_arrow,
@@ -54,8 +58,6 @@ class XInputWrapper
       122 => :vol_down,
       123 => :vol_up,
       127 => :pause_break,
-      133 => :super,
-      134 => :super,
       135 => :submenu,
       148 => :calc,
       150 => :sleep,
@@ -69,7 +71,7 @@ class XInputWrapper
       174 => :stop,
       179 => :music,
       180 => :browser
-    }.merge(lookup)
+    }.merge(@modifiers).merge(lookup)
     
     @device, @verbose, @debug = device, verbose, debug
     
@@ -80,6 +82,7 @@ class XInputWrapper
     command = "xinput test-xi2 --root #{@device}"
 
     type = 0
+    raw_keys = []
 
     IO.popen(command).each_line do |x|
  
@@ -87,29 +90,52 @@ class XInputWrapper
       raw_type = x[/EVENT type (\d+)/,1]
 
       type = raw_type.to_i unless raw_type.nil?
-      
+      next unless type == 13 or type == 14
+    
+      keycode = x[/detail: (\d+)/,1].to_i
+      next if keycode == 0
+          
       # type = 13 means a key has been pressed
       if type == 13 then
+    
+        raw_keys << keycode
 
-        keycode = x[/detail: (\d+)/,1].to_i
-        next if keycode == 0
+        puts 'raw_keys: ' + raw_keys.inspect if @debug
 
-        puts 'keycode: ' + keycode.to_s if keycode > 0 and @verbose
-        puts ('>keycode: ' + keycode.to_s).debug  if @debug
+        if raw_keys.length <= 1 then
+          puts 'keycode: ' + keycode.to_s if keycode > 0 and @verbose
+          puts ('>keycode: ' + keycode.to_s).debug  if @debug
+      
+          key = @lookup[keycode]
+          
 
-        key = @lookup[keycode]
-        on_key_press(key, keycode)
 
+          puts ('key: ' + key.inspect).debug if @debug
 
-        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
+            on_key_press key, 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])    
+
+        end
+    
 
-        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
-        end        
 
-      end
+      elsif type == 14
+    
+        index = raw_keys.rindex(keycode)
+        raw_keys.delete_at index if index
+
+      end    
+    
     end
   end
   
@@ -118,7 +144,14 @@ class XInputWrapper
   def on_control_key()
     puts 'ctrl key pressed'
   end  
-  def on_key_press(key, keycode)  end
+    
+  def on_key_press(key, keycode, modifier)
+    
+    if @debug then
+      puts ('key: ' + key.inspect).debug
+    end
+    
+  end
   
   def on_shift_key()  end
   def on_super_key()  end
@@ -147,3 +180,4 @@ class XInputWrapper
     
 end
 
+# puts  h.sort.map {|x| "%s => :%s" % x}.join(",\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xinput_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   rryowfoo6nLmegcIZjm+zz/gkT/0udwMMVm2gwo0bIRQuQOLmd7IUNzYQKZQOGMA
   g4ETbI8IEC3VCaoECdunsS3t
   -----END CERTIFICATE-----
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32