revdev 0.1.1 → 0.1.2

data/lib/revdev.rb

@@ -15,30 +15,33 @@ module Revdev
   class InputEvent; end
   class InputId; end
 
+  def Revdev.extract_prefix const_name
+    return nil if not const_name
+    m = const_name.to_s.match(/^(FF_STATUS|[A-Z]{2,4})_/)
+    m && m[1] && m[1].to_sym
+  end
+
+  def Revdev.extract_suffix const_name
+    return nil if not const_name
+    m = const_name.to_s.match(/^(?:FF_STATUS|[A-Z]{2,4})_(.+)$/)
+    m && m[1] && m[1].to_sym
+  end
+
   PREFIX_CONVERTER = {
-    'BTN'	=> 'KEY',
-    'MT'	=> nil, # TODO how to use MT prefix values
-    'ID'	=> nil, # TODO how to use ID prefix values
-    'BUS'	=> nil  # TODO how to use BUS prefix values
+    :BTN	=> :KEY,
+    :MT		=> nil, # TODO how to use 'MT_' prefix values
+    :ID		=> nil, # TODO how to use 'ID_' prefix values
+    #:BUS	=> nil  # TODO how to use 'BUS_' prefix values
   }
 
   REVERSE_MAPS = Hash.new
   constants.each do |const|
-    m = const.to_s.match(/^(FF_STATUS|[A-Z]{2,4})_/)
-    next if m.nil?
-
-    prefix = m[1]
-    if prefix == 'EV'
-      REVERSE_MAPS[:EV] ||= Hash.new
-      REVERSE_MAPS[:EV][const_get const] = const.to_sym
-      next
-    end
+    prefix = Revdev.extract_prefix const
     prefix = PREFIX_CONVERTER[prefix] if PREFIX_CONVERTER.has_key? prefix
     next if prefix.nil?
 
-    ev = "EV_#{prefix}".to_sym
-    REVERSE_MAPS[ev] ||= Hash.new
-    REVERSE_MAPS[ev][const_get const] = const.to_sym
+    REVERSE_MAPS[prefix] ||= Hash.new
+    REVERSE_MAPS[prefix][const_get const] = const.to_sym
   end
 
 end

data/lib/revdev/event_device.rb

@@ -4,6 +4,8 @@ module Revdev
   class EventDevice
     attr_reader :file
 
+    ONE_CHAR_CODE = '1'[0]
+
     def initialize arg
       if arg.kind_of? File
         @file = arg
@@ -20,7 +22,11 @@ module Revdev
 
     def driver_version
       r = read_ioctl_with EVIOCGVERSION
-      r.unpack('i').first
+      r.unpack('C3')
+    end
+
+    def device_id
+      InputId.new read_ioctl_with EVIOCGID
     end
 
     def read_ioctl_as_string_with command
@@ -49,15 +55,36 @@ module Revdev
     end
 
     def all_leds_status
-      read_ioctl_as_string_with EVIOCGLED
+      r = read_ioctl_with EVIOCGLED
+      r = r.unpack("b#{LED_MAX}")[0]
+      m = {}
+      LED_MAX.times do |i|
+        break if REVERSE_MAPS[:LED][i].nil?
+        m[REVERSE_MAPS[:LED][i]] = (r[i] == ONE_CHAR_CODE)
+      end
+      m
     end
 
     def all_sounds_status
-      read_ioctl_as_string_with EVIOCGSND
+      r = read_ioctl_with EVIOCGSND
+      r = r.unpack("b#{LED_MAX}")[0]
+      m = {}
+      SND_MAX.times do |i|
+        break if REVERSE_MAPS[:SND][i].nil?
+        m[REVERSE_MAPS[:SND][i]] = (r[i] == ONE_CHAR_CODE)
+      end
+      m
     end
 
     def all_switch_status
-      read_ioctl_as_string_with EVIOCGSW
+      r = read_ioctl_with EVIOCGSW
+      r = r.unpack("b#{LED_MAX}")[0]
+      m = {}
+      SW_MAX.times do |i|
+        break if REVERSE_MAPS[:SW][i].nil?
+        m[REVERSE_MAPS[:SW][i]] = (r[i] == ONE_CHAR_CODE)
+      end
+      m
     end
 
     # grab all input events of the event device

data/lib/revdev/input_event.rb

@@ -33,8 +33,9 @@ module Revdev
     # human readable @code of input event
     def hr_code
       ht = hr_type
-      return nil if ht.nil?
-      map = REVERSE_MAPS[ht]
+      suffix = Revdev.extract_suffix ht
+      return nil if suffix.nil?
+      map = REVERSE_MAPS[suffix]
       map && map[@code]
     end
 

data/lib/revdev/input_id.rb

@@ -24,6 +24,21 @@ module Revdev
       end
     end
 
+    def hr_bustype
+      REVERSE_MAPS[:BUS][@bustype]
+    end
+
+    def hr_version
+      v = @version
+      v_arr = []
+      v_arr << (v & 0xff)
+      2.times do
+        v = (v >> 8)
+        v_arr << (v & 0xff)
+      end
+      v_arr.reverse.join '.'
+    end
+
   end
 
 end

data/lib/revdev/version.rb

@@ -1,3 +1,3 @@
 module Revdev
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/sample/device_info

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+# -*- coding:utf-8; mode:ruby; -*-
+
+require "revdev"
+require "optparse"
+
+USAGE=<<__EOF
+usage:
+    #{$0} event_device [ event_device [ ... ] ]
+
+  display device informatioin for event_device(s)
+
+example:
+    #{$0} /dev/input/event*
+__EOF
+
+def main
+  include Revdev
+
+  if ARGV.length == 0
+    puts USAGE
+    exit false
+  end
+
+  STDOUT.sync = true
+  puts "path	name	version	bustype	vendor	product	id.version"
+  ARGV.each do |devname|
+    begin
+      evdev = EventDevice.new devname
+      params = []
+      params << evdev.file.path
+      params << evdev.device_name
+      params << evdev.driver_version.join('.')
+      id = evdev.device_id
+      params << "#{id.hr_bustype}(#{id.bustype})"
+      params << id.vendor
+      params << id.product
+      params << id.hr_version || id.version
+      puts params.join '	'
+    rescue => e
+      p e
+    end
+  end
+
+end
+
+main

data/{bin → sample}/device_name

@@ -35,4 +35,4 @@ def main
 
 end
 
-main if ($0 == __FILE__)
+main

data/sample/keyboard_leds

@@ -0,0 +1,42 @@
+#!/usr/bin env ruby
+# -*- coding:utf-8-unix; mode:ruby; -*-
+
+require 'revdev'
+
+USAGE = <<__USAGE
+usage: #{$0} <device> <command> <on/off>
+	light <on/off> <command> to <device>
+
+example: #{$0} /dev/input/event2 LED_CAPSL ON
+
+command list:
+	#{
+Revdev.constants.delete_if do |c|
+  not c.match(/^LED_/)
+end.delete_if do |c|
+  c.match(/^LED_(?:CNT|MAX)$/)
+end.join("\n	")}
+__USAGE
+
+def main
+  include Revdev
+
+  if not (ARGV.length == 3 and ARGV[1].match(/^LED_/) and ARGV[2].match(/^ON|OFF$/i))
+    puts USAGE
+    exit false
+  end
+
+  dev = ARGV.shift
+  cmd = ARGV.shift
+  st = ARGV.shift.upcase == 'ON' ? 1 : 0
+
+  ed = EventDevice.new dev
+  ie = InputEvent.new nil, EV_LED, self.class.const_get(cmd), st
+  ed.write_input_event ie
+  puts "# send <#{cmd}> <#{st}> to #{dev}"
+  ed.all_leds_status.each do |k,v|
+    puts "#{k}	#{(v ? 'on' : 'off')}"
+  end
+end
+
+main

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: revdev
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Keiichiro Ui
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-17 00:00:00 +09:00
-default_executable: 
+date: 2012-04-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -49,9 +48,8 @@ dependencies:
 description: revdev is a ruby binding to handling event devices.
 email: 
 - keiichiro.ui@gmail.com
-executables: 
-- device_name
-- key_dump
+executables: []
+
 extensions: 
 - ext/revdev/extconf.rb
 extra_rdoc_files: []
@@ -62,8 +60,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/device_name
-- bin/key_dump
 - ext/revdev/extconf.rb
 - ext/revdev/revdev.c
 - lib/revdev.rb
@@ -73,11 +69,14 @@ files:
 - lib/revdev/input_id.rb
 - lib/revdev/version.rb
 - revdev.gemspec
+- sample/device_info
+- sample/device_name
+- sample/key_dump
+- sample/keyboard_leds
 - test/test_event_device.rb
 - test/test_input_event.rb
 - test/test_input_id.rb
 - test/test_revdev.rb
-has_rdoc: true
 homepage: https://rubygems.org/gems/revdev
 licenses: []
 
@@ -107,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: ruby binding to handling event devices.