revdev 0.1.2 → 0.1.3

data/ext/revdev/revdev.c

@@ -132,10 +132,14 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "EVIOCSREP", LONG2FIX(EVIOCSREP));
   /* get keycode */
   rb_define_const(module_revdev, "EVIOCGKEYCODE", LONG2FIX(EVIOCGKEYCODE));
+#ifdef EVIOCGKEYCODE_V2
   rb_define_const(module_revdev, "EVIOCGKEYCODE_V2", LONG2FIX(EVIOCGKEYCODE_V2));
+#endif
   /* set keycode */
   rb_define_const(module_revdev, "EVIOCSKEYCODE", LONG2FIX(EVIOCSKEYCODE));
+#ifdef EVIOCSKEYCODE_V2
   rb_define_const(module_revdev, "EVIOCSKEYCODE_V2", LONG2FIX(EVIOCSKEYCODE_V2));
+#endif
 
   /* get device name */
   rb_define_const(module_revdev, "EVIOCGNAME", LONG2FIX(EVIOCGNAME(BUFF_SIZE)));
@@ -143,8 +147,10 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "EVIOCGPHYS", LONG2FIX(EVIOCGPHYS(BUFF_SIZE)));
   /* get unique identifier */
   rb_define_const(module_revdev, "EVIOCGUNIQ", LONG2FIX(EVIOCGUNIQ(BUFF_SIZE)));
+#ifdef EVIOCGPROP
   /* get device properties */
   rb_define_const(module_revdev, "EVIOCGPROP", LONG2FIX(EVIOCGPROP(BUFF_SIZE)));
+#endif
   /* get global key state */
   rb_define_const(module_revdev, "EVIOCGKEY", LONG2FIX(EVIOCGKEY(BUFF_SIZE)));
   /* get all LEDs */
@@ -174,13 +180,24 @@ void Init_revdev(void)
    * Device properties and quirks
    */
 
+#ifdef INPUT_PROP_POINTER
   rb_define_const(module_revdev, "INPUT_PROP_POINTER", INT2NUM(INPUT_PROP_POINTER));/* needs a pointer */
+#endif
+#ifdef INPUT_PROP_DIRECT
   rb_define_const(module_revdev, "INPUT_PROP_DIRECT", INT2NUM(INPUT_PROP_DIRECT));/* direct input devices */
+#endif
+#ifdef INPUT_PROP_BUTTONPAD
   rb_define_const(module_revdev, "INPUT_PROP_BUTTONPAD", INT2NUM(INPUT_PROP_BUTTONPAD));/* has button(s) under pad */
+#endif
+#ifdef INPUT_PROP_SEMI_MT
   rb_define_const(module_revdev, "INPUT_PROP_SEMI_MT", INT2NUM(INPUT_PROP_SEMI_MT));/* touch rectangle only */
-
+#endif
+#ifdef INPUT_PROP_MAX
   rb_define_const(module_revdev, "INPUT_PROP_MAX", INT2NUM(INPUT_PROP_MAX));
+#endif
+#ifdef INPUT_PROP_CNT
   rb_define_const(module_revdev, "INPUT_PROP_CNT", INT2NUM(INPUT_PROP_CNT));
+#endif
 
   /*
    * Event types
@@ -208,7 +225,9 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "SYN_REPORT", INT2NUM(SYN_REPORT));
   rb_define_const(module_revdev, "SYN_CONFIG", INT2NUM(SYN_CONFIG));
   rb_define_const(module_revdev, "SYN_MT_REPORT", INT2NUM(SYN_MT_REPORT));
+#ifdef SYN_DROPPED
   rb_define_const(module_revdev, "SYN_DROPPED", INT2NUM(SYN_DROPPED));
+#endif
 
   /*
    * Keys and buttons
@@ -477,7 +496,9 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "KEY_DISPLAY_OFF", INT2NUM(KEY_DISPLAY_OFF));/* display device to off state */
 
   rb_define_const(module_revdev, "KEY_WIMAX", INT2NUM(KEY_WIMAX));
+#ifdef KEY_RFKILL
   rb_define_const(module_revdev, "KEY_RFKILL", INT2NUM(KEY_RFKILL));/* Key that controls all radios */
+#endif
 
   /* Code 255 is reserved for special needs of AT keyboard driver */
 
@@ -645,9 +666,15 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "KEY_FRAMEFORWARD", INT2NUM(KEY_FRAMEFORWARD));
   rb_define_const(module_revdev, "KEY_CONTEXT_MENU", INT2NUM(KEY_CONTEXT_MENU));/* GenDesc - system context menu */
   rb_define_const(module_revdev, "KEY_MEDIA_REPEAT", INT2NUM(KEY_MEDIA_REPEAT));/* Consumer - transport control */
+#ifdef KEY_10CHANNELSUP
   rb_define_const(module_revdev, "KEY_10CHANNELSUP", INT2NUM(KEY_10CHANNELSUP));/* 10 channels up (10+) */
+#endif
+#ifdef KEY_10CHANNELSDOWN
   rb_define_const(module_revdev, "KEY_10CHANNELSDOWN", INT2NUM(KEY_10CHANNELSDOWN));/* 10 channels down (10-) */
+#endif
+#ifdef KEY_IMAGES
   rb_define_const(module_revdev, "KEY_IMAGES", INT2NUM(KEY_IMAGES));/* AL Image Browser */
+#endif
 
   rb_define_const(module_revdev, "KEY_DEL_EOL", INT2NUM(KEY_DEL_EOL));
   rb_define_const(module_revdev, "KEY_DEL_EOS", INT2NUM(KEY_DEL_EOS));
@@ -700,20 +727,29 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "KEY_NUMERIC_STAR", INT2NUM(KEY_NUMERIC_STAR));
   rb_define_const(module_revdev, "KEY_NUMERIC_POUND", INT2NUM(KEY_NUMERIC_POUND));
 
+#ifdef KEY_CAMERA_FOCUS
   rb_define_const(module_revdev, "KEY_CAMERA_FOCUS", INT2NUM(KEY_CAMERA_FOCUS));
+#endif
+#ifdef KEY_WPS_BUTTON
   rb_define_const(module_revdev, "KEY_WPS_BUTTON", INT2NUM(KEY_WPS_BUTTON));/* WiFi Protected Setup key */
+#endif
 
+#ifdef KEY_TOUCHPAD_TOGGLE
   rb_define_const(module_revdev, "KEY_TOUCHPAD_TOGGLE", INT2NUM(KEY_TOUCHPAD_TOGGLE));/* Request switch touchpad on or off */
   rb_define_const(module_revdev, "KEY_TOUCHPAD_ON", INT2NUM(KEY_TOUCHPAD_ON));
   rb_define_const(module_revdev, "KEY_TOUCHPAD_OFF", INT2NUM(KEY_TOUCHPAD_OFF));
+#endif
 
+#ifdef KEY_CAMERA_ZOOMIN
   rb_define_const(module_revdev, "KEY_CAMERA_ZOOMIN", INT2NUM(KEY_CAMERA_ZOOMIN));
   rb_define_const(module_revdev, "KEY_CAMERA_ZOOMOUT", INT2NUM(KEY_CAMERA_ZOOMOUT));
   rb_define_const(module_revdev, "KEY_CAMERA_UP", INT2NUM(KEY_CAMERA_UP));
   rb_define_const(module_revdev, "KEY_CAMERA_DOWN", INT2NUM(KEY_CAMERA_DOWN));
   rb_define_const(module_revdev, "KEY_CAMERA_LEFT", INT2NUM(KEY_CAMERA_LEFT));
   rb_define_const(module_revdev, "KEY_CAMERA_RIGHT", INT2NUM(KEY_CAMERA_RIGHT));
+#endif
 
+#ifdef BTN_TRIGGER_HAPPY
   rb_define_const(module_revdev, "BTN_TRIGGER_HAPPY", INT2NUM(BTN_TRIGGER_HAPPY));
   rb_define_const(module_revdev, "BTN_TRIGGER_HAPPY1", INT2NUM(BTN_TRIGGER_HAPPY1));
   rb_define_const(module_revdev, "BTN_TRIGGER_HAPPY2", INT2NUM(BTN_TRIGGER_HAPPY2));
@@ -755,6 +791,7 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "BTN_TRIGGER_HAPPY38", INT2NUM(BTN_TRIGGER_HAPPY38));
   rb_define_const(module_revdev, "BTN_TRIGGER_HAPPY39", INT2NUM(BTN_TRIGGER_HAPPY39));
   rb_define_const(module_revdev, "BTN_TRIGGER_HAPPY40", INT2NUM(BTN_TRIGGER_HAPPY40));
+#endif
 
   /* We avoid low common keys in module aliases so they don't get huge. */
   rb_define_const(module_revdev, "KEY_MIN_INTERESTING", INT2NUM(KEY_MIN_INTERESTING));
@@ -811,7 +848,9 @@ void Init_revdev(void)
 
   rb_define_const(module_revdev, "ABS_MISC", INT2NUM(ABS_MISC));
 
+#ifdef ABS_MT_SLOT
   rb_define_const(module_revdev, "ABS_MT_SLOT", INT2NUM(ABS_MT_SLOT));/* MT slot being modified */
+#endif
   rb_define_const(module_revdev, "ABS_MT_TOUCH_MAJOR", INT2NUM(ABS_MT_TOUCH_MAJOR));/* Major axis of touching ellipse */
   rb_define_const(module_revdev, "ABS_MT_TOUCH_MINOR", INT2NUM(ABS_MT_TOUCH_MINOR));/* Minor axis (omit if circular) */
   rb_define_const(module_revdev, "ABS_MT_WIDTH_MAJOR", INT2NUM(ABS_MT_WIDTH_MAJOR));/* Major axis of approaching ellipse */
@@ -822,8 +861,12 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "ABS_MT_TOOL_TYPE", INT2NUM(ABS_MT_TOOL_TYPE));/* Type of touching device */
   rb_define_const(module_revdev, "ABS_MT_BLOB_ID", INT2NUM(ABS_MT_BLOB_ID));/* Group a set of packets as a blob */
   rb_define_const(module_revdev, "ABS_MT_TRACKING_ID", INT2NUM(ABS_MT_TRACKING_ID));/* Unique ID of initiated contact */
+#ifdef ABS_MT_PRESSURE
   rb_define_const(module_revdev, "ABS_MT_PRESSURE", INT2NUM(ABS_MT_PRESSURE));/* Pressure on contact area */
+#endif
+#ifdef ABS_MT_DISTANCE
   rb_define_const(module_revdev, "ABS_MT_DISTANCE", INT2NUM(ABS_MT_DISTANCE));/* Contact hover distance */
+#endif
 
 
   rb_define_const(module_revdev, "ABS_MAX", INT2NUM(ABS_MAX));
@@ -844,10 +887,18 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "SW_LINEOUT_INSERT", INT2NUM(SW_LINEOUT_INSERT));/* set = inserted */
   rb_define_const(module_revdev, "SW_JACK_PHYSICAL_INSERT", INT2NUM(SW_JACK_PHYSICAL_INSERT));/* set = mechanical switch set */
   rb_define_const(module_revdev, "SW_VIDEOOUT_INSERT", INT2NUM(SW_VIDEOOUT_INSERT));/* set = inserted */
+#ifdef SW_CAMERA_LENS_COVER
   rb_define_const(module_revdev, "SW_CAMERA_LENS_COVER", INT2NUM(SW_CAMERA_LENS_COVER));/* set = lens covered */
+#endif
+#ifdef SW_KEYPAD_SLIDE
   rb_define_const(module_revdev, "SW_KEYPAD_SLIDE", INT2NUM(SW_KEYPAD_SLIDE));/* set = keypad slide out */
+#endif
+#ifdef SW_FRONT_PROXIMITY
   rb_define_const(module_revdev, "SW_FRONT_PROXIMITY", INT2NUM(SW_FRONT_PROXIMITY));/* set = front proximity sensor active */
+#endif
+#ifdef SW_ROTATE_LOCK
   rb_define_const(module_revdev, "SW_ROTATE_LOCK", INT2NUM(SW_ROTATE_LOCK));/* set = rotate locked/disabled */
+#endif
   rb_define_const(module_revdev, "SW_MAX", INT2NUM(SW_MAX));
   rb_define_const(module_revdev, "SW_CNT", INT2NUM(SW_CNT));
 
@@ -888,7 +939,9 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "REP_DELAY", INT2NUM(REP_DELAY));
   rb_define_const(module_revdev, "REP_PERIOD", INT2NUM(REP_PERIOD));
   rb_define_const(module_revdev, "REP_MAX", INT2NUM(REP_MAX));
+#ifdef REP_CNT
   rb_define_const(module_revdev, "REP_CNT", INT2NUM(REP_CNT));
+#endif
 
   /*
    * Sounds
@@ -928,14 +981,18 @@ void Init_revdev(void)
   rb_define_const(module_revdev, "BUS_HOST", INT2NUM(BUS_HOST));
   rb_define_const(module_revdev, "BUS_GSC", INT2NUM(BUS_GSC));
   rb_define_const(module_revdev, "BUS_ATARI", INT2NUM(BUS_ATARI));
+#ifdef BUS_SPI
   rb_define_const(module_revdev, "BUS_SPI", INT2NUM(BUS_SPI));
+#endif
 
   /*
    * MT_TOOL types
    */
   rb_define_const(module_revdev, "MT_TOOL_FINGER", INT2NUM(MT_TOOL_FINGER));
   rb_define_const(module_revdev, "MT_TOOL_PEN", INT2NUM(MT_TOOL_PEN));
+#ifdef MT_TOOL
   rb_define_const(module_revdev, "MT_TOOL_MAX", INT2NUM(MT_TOOL_MAX));
+#endif
 
   /*
    * Values describing the status of a force-feedback effect

data/lib/revdev/event_device.rb

@@ -46,8 +46,10 @@ module Revdev
       read_ioctl_as_string_with EVIOCGUNIQ
     end
 
-    def device_prop
-      read_ioctl_as_string_with EVIOCGPROP
+    if const_defined? :EVIOCGPROP
+      def device_prop
+        read_ioctl_as_string_with EVIOCGPROP
+      end
     end
 
     def global_key_state

data/lib/revdev/version.rb

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

data/test/test_event_device.rb

@@ -52,13 +52,14 @@ class EventDeviceTest < Test::Unit::TestCase
       end
     end
 
-    [:device_name, :physical_location, :uniq_id, :device_prop, :global_key_state,
-    :all_leds_status, :all_sounds_status, :all_switch_status].each do |m|
+    [:device_name, :physical_location, :uniq_id, :global_key_state].each do |m|
       evdev = EventDevice.new file
       assert_equal expected_data, evdev.method(m).call
     end
   end
 
+  # TODO test all_*_status
+
   def test_read_input_event
     file = File.new @@target
     ie = InputEvent.new nil, 1, 2, 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: revdev
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Keiichiro Ui
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-19 00:00:00 Z
+date: 2012-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake